Changeset 244 for trunk

Timestamp:

07/16/07 11:38:44 (5 years ago)

Author:

marc

Message:

Minor improvement to HTTP Authentication. Don't clean status labels on server restart.

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -4 +4 @@
  * Added RPM packages
  * Simplified and improved Makefile
- * Cleaning of the code to try to be at least more compatible with PEP-8.
+ * 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/server.py

@@ -290 +290 @@
         return self.authenticated
 
-
     def return_object_data(self):
         """
@@ -304 +303 @@
             self.request.setHeader('Content-Length', self.size)
             self.request.setHeader('Connection', 'close')
-            # Deauthenticate if it's the screenshot
+            # Deauthenticate if it's the screenshot (last object request)
             if self.session_end:
                 self.authenticated = False
@@ -383 +382 @@
         @param gui_instance: An instance of our L{Gui} class
 
-        @type gui_instance: AuthenticatedResource
-        @param gui_instance: An instance of our L{AuthenticatedResource} class
+        @type auth_instance: AuthenticatedResource
+        @param auth_instance: An instance of our L{AuthenticatedResource} class
         """
 
@@ -396 +395 @@
         self.counter = 0
 
-
-    def take_shot(self):
+    def get_screenshot(self):
         """
         Takes a screenshot and notify the GUI.
@@ -428 +426 @@
         @type request: instance
         @param request: twisted.web.server.Request instance
-
-        @rtype: str
-        @return: Screenshot image
-        """
-
+        """
+
+        # Get up to date configuration values everytime there is a request
+        self.configuration = self.gui.configuration
         self.request = request
-        if (self.request.uri == "/screenshot"):
-
-            # Get up to date configuration values everytime there is a request
-            self.configuration = self.gui.configuration
-
-            self.ip = self.request.getClientIP()
-            self.time = datetime.datetime.now()
-            self.type = "image/" + self.configuration['screenshot']['format']
-
-            if self.configuration['server']['authentication']:
-                if self.auth.authenticated:
-                    try:
-                        self.take_shot()
-                    except error.ItakaScreenshotError:
-                        return
-                    self.auth.set_request_data(self.data, self.size, self.type, True)
-                else:
-                    if self.auth.authenticate(self.request):
-                        try:
-                            self.take_shot()
-                        except error.ItakaScreenshotError:
-                            return
-                        self.auth.set_request_data(self.data, self.size, self.type, True)
-                return self.auth.return_object_data()
-            else:
+        self.ip = self.request.getClientIP()
+        self.time = datetime.datetime.now()
+        self.type = "image/" + self.configuration['screenshot']['format']
+
+        if self.configuration['server']['authentication']:
+            if self.auth.authenticated or self.auth.authenticate(self.request):
                 try:
-                    self.take_shot()
+                    self.get_screenshot()
                 except error.ItakaScreenshotError:
                     return
-                self.request.setHeader('Content-Type', self.type)
-                self.request.setHeader('Content-Length', self.size)
-                self.request.setHeader('Connection', 'close')
-                return self.data
+                self.auth.set_request_data(self.data, self.size, self.type, True)
+            return self.auth.return_object_data()
+        else:
+            try:
+                self.get_screenshot()
+            except error.ItakaScreenshotError:
+                return
+            self.request.setHeader('Content-Type', self.type)
+            self.request.setHeader('Content-Length', self.size)
+            self.request.setHeader('Connection', 'close')
+            return self.data

trunk/uigtk.py

@@ -1184 +1184 @@
 
             # Change GUI elements
-            if (foreign):
+            if foreign:
                 self.button_start_stop.set_active(False)
 
@@ -1191 +1191 @@
             self.button_start_stop.set_image(self.start_stop_image)
             self.button_start_stop.set_label(_('Start'))
-            self.label_last_ip.set_text('')
-            self.label_time.set_text('')
-            self.label_served.set_text('')
+            if not foreign:
+                self.label_last_ip.set_text('')
+                self.label_time.set_text('')
+                self.label_served.set_text('')
             self.menu_item_start.set_sensitive(True)
             self.menu_item_stop.set_sensitive(False)