Changeset 246 for trunk

Timestamp:

07/16/07 12:50:30 (5 years ago)

Author:

marc

Message:

Abstracted IconResource? to FileResource? to be reused. Fixed some typos from renaming in Console and removed useless destructor. Updated changelog.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• console.py (modified) (1 diff)
• server.py (modified) (5 diffs)
• uigtk.py (modified) (2 diffs)

trunk/ChangeLog

@@ -4 +4 @@
  * Added RPM packages
  * Added a favicon to the server
+ * Don't clean out status labels when restarting server
+ * Don't check for system compatibility of Libnotify
+ * Cleaning of the code to try to be at least more compatible with PEP-8
  * Simplified and improved Makefile
- * Cleaning of the code to try to be at least more compatible with PEP-8
- * Dont clean out status labels when restarting server
 
 0.2.1:

trunk/console.py

@@ -129 +129 @@
         Constructor for console output handler
         
-        @type itakaglobals: module
-        @param itakaglobals: Configuration module globals
+        @type itaka_globals: module
+        @param itaka_globals: Configuration module globals
         """
 
         self.itaka_globals = itaka_globals
         if self.itaka_globals.console_verbosity['normal']: 
-            BaseMessage(_('Itaka %s starting') % (itakaglobals.version))
+            BaseMessage(_('Itaka %s starting') % (self.itaka_globals.__version__))
             
-    def __del__(self):
-        """
-        Destructor
-        """
-        
-        if self.itaka_globals.console_verbosity['normal']: 
-            BaseMessage(_('Itaka shutting down'))
-
     def message(self, message):
         """

trunk/server.py

@@ -200 +200 @@
         self.add_child_to_resource('root', '', self.root)
         self.add_child_to_resource('root', 'screenshot', ScreenshotResource(self.gui, self.authresource))
-        self.add_child_to_resource('root', 'favicon.ico', IconResource(self.gui, self.authresource))
+        self.add_child_to_resource('root', 'favicon.ico', FileResource(self.gui, self.authresource, os.path.join(self.itaka_globals.image_dir, 'favicon.ico'), 'image/x-icon'))
+
         self.create_site(self.root)
 
@@ -454 +455 @@
             return self.data
 
-class IconResource(resource.Resource):
+class FileResource(resource.Resource):
     """ 
-    Handle server requests and call for favicon.ico
-    """
-
-    def __init__(self, gui_instance, auth_instance):
+    Generic handler for file resources
+    """
+
+    def __init__(self, gui_instance, auth_instance, path, type):
         """ 
         Constructor
@@ -468 +469 @@
         @type auth_instance: AuthenticatedResource
         @param auth_instance: An instance of our L{AuthenticatedResource} class
+
+        @type path: string
+        @param path: The path to the file to be served
+
+        @type type: str
+        @param type: The MIME-type to bepassed to Content-Type
         """
 
@@ -474 +481 @@
         self.itaka_globals = self.gui.itaka_globals
 
+        self.type = type
+        self.data = open(path, 'rb').read()
+        self.size = str(os.stat(path).st_size)
+
     def render_GET(self, request):
         """
@@ -484 +495 @@
         self.configuration = self.gui.configuration
         self.request = request
-        self.type = 'image/x-icon'
-        self.file = os.path.join(self.itaka_globals.image_dir, 'favicon.ico')
-        self.data = open(self.file, 'rb').read()
-        self.size = str(os.stat(self.file).st_size)
 
         if self.configuration['server']['authentication']:

trunk/uigtk.py

@@ -1214 +1214 @@
 
         if self.server.listening():
-            self.console.message(_('Shutting down server'))
             self.server.stop_server()
-            del self.console
-        else:
-            # Console goodbye!
-            if hasattr(self, 'console'):
-                del self.console
 
         # Remove stale screenshot and quit
@@ -1229 +1223 @@
         del self.status_icon
 
+        self.console.message(_('Itaka shutting down'))
         gtk.main_quit()