jdahlin - in flumotion/trunk: . flumotion/admin flumotion/admin/text

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Fri Dec 21 12:38:15 2007
New Revision: 6026

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/connections.py
   flumotion/trunk/flumotion/admin/text/connection.py
   flumotion/trunk/flumotion/admin/text/greeter.py
Log:
2007-12-21  Johan Dahlin  <johan at gnome.org>

	* flumotion/admin/connections.py (RecentConnection.__init__): 
	set the name attribute which is used by the text client

	* flumotion/admin/text/greeter.py (AdminTextGreeter.connectionLost): 
	Implement a stub here, it might be called if an error happens very early on

	* flumotion/admin/text/connection.py (connected): 
	Add some tracebacks helper, to print clean tracebacks instead of curses mangled ones	



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Fri Dec 21 12:38:15 2007
@@ -1,3 +1,14 @@
+2007-12-21  Johan Dahlin  <johan at gnome.org>
+
+	* flumotion/admin/connections.py (RecentConnection.__init__): 
+	set the name attribute which is used by the text client
+
+	* flumotion/admin/text/greeter.py (AdminTextGreeter.connectionLost): 
+	Implement a stub here, it might be called if an error happens very early on
+
+	* flumotion/admin/text/connection.py (connected): 
+	Add some tracebacks helper, to print clean tracebacks instead of curses mangled ones	
+
 2007-12-20  Johan Dahlin  <johan at gnome.org>
 
 	* flumotion/component/effects/volume/admin_gtk.py (VolumeAdminGtkNode.volumeSet): 

Modified: flumotion/trunk/flumotion/admin/connections.py
==============================================================================
--- flumotion/trunk/flumotion/admin/connections.py	(original)
+++ flumotion/trunk/flumotion/admin/connections.py	Fri Dec 21 12:38:15 2007
@@ -33,6 +33,7 @@
 
 class RecentConnection(object):
     def __init__(self, host, filename, info):
+        self.name = str(info)
         self.host = host
         self.filename = filename
         self.info = info

Modified: flumotion/trunk/flumotion/admin/text/connection.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/connection.py	(original)
+++ flumotion/trunk/flumotion/admin/text/connection.py	Fri Dec 21 12:38:15 2007
@@ -21,6 +21,8 @@
 
 __version__ = "$Rev$"
 
+import curses
+
 from flumotion.admin.admin import AdminModel
 from flumotion.admin.text.view import AdminTextView
 from flumotion.twisted import flavors, reflect, pb as fpb
@@ -45,9 +47,19 @@
         stdscr.clrtobot()
         stdscr.refresh()
 
-        view = AdminTextView(model, stdscr)
-        reactor.addReader(view)
-        view.show()
+        try:
+            view = AdminTextView(model, stdscr)
+            reactor.addReader(view)
+            view.show()
+        except Exception, e:
+            # Set everything back to normal
+            stdscr.keypad(0)
+            curses.echo()
+            curses.nocbreak()
+            curses.endwin()
+            # And print the the traceback
+            import traceback
+            traceback.print_exc()
 
     def refused(failure):
         failure.trap(errors.ConnectionRefusedError)

Modified: flumotion/trunk/flumotion/admin/text/greeter.py
==============================================================================
--- flumotion/trunk/flumotion/admin/text/greeter.py	(original)
+++ flumotion/trunk/flumotion/admin/text/greeter.py	Fri Dec 21 12:38:15 2007
@@ -84,6 +84,9 @@
         self.stdscr.clrtobot()
         self.stdscr.refresh()
 
+    def connectionLost(self, failure):
+        pass
+
     def doRead(self):
         c= self.stdscr.getch()
         if self.state == 0: