Changeset 277

Timestamp:

07/28/09 05:01:31 (3 years ago)

Author:

marc

Message:

Enhanced console logging functions to support multiple arguments and better concatenation of them. Changed names for quicker testing. Don't import the reactor twice, better handling of a single reactor, a bug fix. Build shot file path for screenshots on request, this fixes a bug where the screenshot file name locally wasn't changed while the app was running. Better clean up of stale screenshot files. Added handling of SIGINT (ctrl-c) which shuts down the server and cleans up stale screenshot files.

Location:

trunk

Files:

• console.py (modified) (5 diffs)
• screenshot.py (modified) (2 diffs)
• server.py (modified) (4 diffs)
• uigtk.py (modified) (12 diffs)

trunk/console.py

@@ -26 +26 @@
 
 # Global output functions
-def print_m(string):
+def print_message(string):
     """
     Print wrapper.
@@ -44 +44 @@
     """
 
-    print_m('WARNING: %s' % (" - ".join(str(item) for item in strings)))
+    print_message('WARNING: %s' % (" - ".join(str(item) for item in strings)))
 
 def print_error(*strings):
@@ -54 +54 @@
     """
 
-    print_m('ERROR: %s' % (" - ".join(str(item) for item in strings)))
+    print_message('ERROR: %s' % (" - ".join(str(item) for item in strings)))
 
 def print_debug(*strings):
@@ -64 +64 @@
     """
 
-    print_m('DEBUG: %s' % (" - ".join(str(item) for item in strings)))
+    print_message('DEBUG: %s' % (" - ".join(str(item) for item in strings)))
 
 # Register them for global use
-__builtin__.print_m = print_m
-__builtin__.print_error = print_error
-__builtin__.print_warning = print_warning
-__builtin__.print_debug = print_debug
+__builtin__.print_m = print_message
+__builtin__.print_e = print_error
+__builtin__.print_w = print_warning
+__builtin__.print_d = print_debug
 
 class BaseMessage:
@@ -86 +86 @@
 
         self.message = message
-        print_m(self.message)
+        print_message(self.message)
 
 class BaseFailureMessage(BaseMessage):

trunk/screenshot.py

@@ -56 +56 @@
         self.current_window_failed = False
 
-        #: Final absolute path to the screenshot file
-        self.shot_file = os.path.join(self.configuration['screenshot']['path'], 'itakashot.%s' % (self.configuration['screenshot']['format']))
-        
         self.root_screen = gtk.gdk.screen_get_default()
         self.root_window = gtk.gdk.get_default_root_window()
@@ -104 +101 @@
         """
 
-        # Get up to date configuration values everytime there is a request
-        
+        # Get up to date configuration values and build shot file path everytime there is a request
         self.configuration = self.gui.configuration
 
+        #: Final absolute path to the screenshot file
+        self.shot_file = os.path.join(self.configuration['screenshot']['path'], 'itakashot.%s' % (self.configuration['screenshot']['format']))
+        
         if self.configuration['screenshot']['currentwindow'] and not self.itaka_globals.system == 'nt':
             try:

trunk/server.py

@@ -32 +32 @@
     import error
 except ImportError:
-    print_error(_('Failed to import Itaka modules'))
+    print_e(_('Failed to import Itaka modules'))
     traceback.print_exc()
     sys.exit(1)
@@ -39 +39 @@
     from twisted.python import log
     from twisted.web import server, static, http, resource
-    from twisted.internet import reactor
     import twisted.internet.error
 except ImportError:
-    print_error(_('Could not import Twisted Network Framework'))
+    print_e(_('Could not import Twisted Network Framework'))
     traceback.print_exc()
     sys.exit(1)
@@ -107 +106 @@
         self.site = server.Site(resource)
 
-    def start_server(self, port):
+    def start_server(self, reactor, port):
         """
         Start the server
+
+        @type reactor: twisted.internet.gtk2reactor.Gtk2Reactor
+        @param reactor: An instance of a reactor already run()
 
         @type port: int
@@ -116 +118 @@
 
         try:
-            self.server = reactor.listenTCP(port, self.site)
+            if hasattr(self, 'server'):
+                self.server.startListening()
+            else:
+                self.server = reactor.listenTCP(port, self.site)
         except twisted.internet.error.CannotListenError, e:
             raise error.ItakaServerCannotListenError, e

trunk/uigtk.py

@@ -23 +23 @@
 """ Itaka GTK+ GUI """
 
+import copy
+import datetime
+import os
 import sys
-import os
-import datetime
+import signal
 import traceback
-import copy
 
 try:
@@ -34 +35 @@
         gtk2reactor.install()
     except Exception, e:
-        print_error(_('Could not initiate GTK modules: %s' % (e)))
+        print_e(_('Could not initiate GTK modules: %s' % (e)))
         sys.exit(1)
     from twisted.internet import reactor
 except ImportError:
-    print_error(_('Could not import Twisted Network Framework'))
+    print_e(_('Could not import Twisted Network Framework'))
     sys.exit(1)
 
@@ -45 +46 @@
     import error
 except ImportError:
-    print_error(_('Failed to import Itaka modules'))
+    print_e(_('Failed to import Itaka modules'))
     traceback.print_exc()
     sys.exit(1)
@@ -53 +54 @@
     pygtk.require("2.0")
 except ImportError:
-    print_warning(_('Pygtk module is missing'))
+    print_w(_('Pygtk module is missing'))
     pass
 try:
     import gtk, gobject, pango
 except ImportError:
-    print_error(_('GTK+ bindings are missing'))
+    print_e(_('GTK+ bindings are missing'))
     sys.exit(1)
 
 if gtk.gtk_version[1] < 10:
-    print_error(_('Itaka requires GTK+ 2.10, you have %s installed' % (".".join(str(x) for x in gtk.gtk_version))))
+    print_e(_('Itaka requires GTK+ 2.10, you have %s installed' % (".".join(str(x) for x in gtk.gtk_version))))
     sys.exit(1)
 
@@ -115 +116 @@
         @param icon: The first argument is a string of either 'stock' or 'pixbuf', and the second is a string of gtk.STOCK_ICON or a gtk.gdk.pixbuf object (without the 'gtk.' prefix)
         """
-        
+       
         self.console.message(message)
         self._write_gui_log(message, None, icon, False)
@@ -307 +308 @@
         self.icon_pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(self.itaka_globals.image_dir, 'itaka.png'))
         self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-        self.window.connect('destroy', self.destroy)
+        self.window.connect('destroy', self._destroy)
         self.window.connect('size-allocate', self._window_size_changed)
         self.window.set_title('Itaka')
@@ -352 +353 @@
         self.menu_item_separator1 = gtk.SeparatorMenuItem()
         self.menu_item_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT)
-        self.menu_item_quit.connect('activate', self.destroy)
+        self.menu_item_quit.connect('activate', self._destroy)
 
         self.status_menu.append(self.menu_item_start)
@@ -679 +680 @@
             self.format_value = 'jpeg'
             self.configuration['screenshot']['format'] = 'jpeg'
+
+        # Delete stale old screenshot
+        if (self.current_configuration['screenshot']['format'] != self.configuration['screenshot']['format']):
+            if os.path.exists(os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format']))): 
+                os.remove(os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format'])))
+                if self.itaka_globals.console_verbosity['debug']: print_m(_("Deleting stale screenshot file '%s'" % ((os.path.join(self.current_configuration['screenshot']['path'], 'itakashot.%s' % (self.current_configuration['screenshot']['format']))))))
+
 
         if self.itaka_globals.notify_available:
@@ -1071 +1079 @@
         """
 
-        # Server reactor (interacts with the Twisted reactor)   
-        self.sreact = reactor.run()
-
+        # Run the gtk.main() loop and start a reactor for our server.
+        # False can be passed for it to not register to it's SIGINT handler.
+        # Register our own handler to send to _destroy
+        signal.signal(signal.SIGINT, self._destroy)
+        reactor.run()
+        
     def _preferences_combo_changed(self, widget):
         """
@@ -1148 +1159 @@
 
         try:
-            self.server.start_server(self.configuration['server']['port'])
+            self.server.start_server(reactor, self.configuration['server']['port'])
         except error.ItakaServerCannotListenError, e:
             self.log.failure(('Gui', 'start_server'), (_('Failed to start server on port %(port)s: %(errorstring)s' % {'port': e.value.port, 'errorstring': e.value.args[-1][-1]}), _('Failed to start server: %s') % e.value), 'ERROR')
@@ -1228 +1239 @@
             self.start_server(None, True)
 
-    def destroy(self, *args):
+    def _destroy(self, *args):
         """
         Main window destroy event
@@ -1243 +1254 @@
         del self.status_icon
 
+        self.log.verbose_message(_('Itaka Shutting down'), _('Received SIGINT, shutting down'), ['stock', 'STOCK_DISCONNECT'])
+
         self.console.message(_('Itaka shutting down'))
-        gtk.main_quit()
+
+        reactor.stop()
 
     def _literal_time_difference(self, dtime):