Changeset 274

Timestamp:

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

Author:

marc

Message:

Better port bind fail error, better console print functions, better error names

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• console.py (modified) (2 diffs)
• error.py (modified) (4 diffs)
• screenshot.py (modified) (3 diffs)
• server.py (modified) (1 diff)
• uigtk.py (modified) (1 diff)

trunk/ChangeLog

@@ -6 +6 @@
  * Added RPM packages
  * Switch to GPLv3
- * Better console help
+ * Better error reporting on the main log
+ * Better console help and internal functions
  * Don't clean out status labels when restarting server
  * Don't check for system compatibility of Libnotify

trunk/console.py

@@ -36 +36 @@
     print '[*] %s' % (str(string))
 
-def print_warning(string):
+def print_warning(*strings):
     """
-    Print wrapper.
+    Print warning wrapper.
 
-    @type str: str
-    @param str: Message
+    @type *strings: anything
+    @param *strings: Anything
     """
 
-    print_m('WARNING: %s' % (string))
+    print_m('WARNING: %s' % (" - ".join(str(item) for item in strings)))
 
-def print_error(string):
+def print_error(*strings):
     """
-    Print wrapper.
+    Print error wrapper.
 
-    @type str: str
-    @param str: Message
+    @type *strings: anything
+    @param *strings: Anything
     """
 
-    print_m('ERROR: %s' % (string))
+    print_m('ERROR: %s' % (" - ".join(str(item) for item in strings)))
 
-def print_debug(string):
+def print_debug(*strings):
     """
-    Print wrapper.
+    Print debug wrapper.
 
-    @type str: str
-    @param str: Message
+    @type *strings: anything
+    @param *strings: Anything
     """
 
-    print_m('DEBUG: %s' % (string))
+    print_m('DEBUG: %s' % (" - ".join(str(item) for item in strings)))
 
 # Register them for global use
@@ -70 +70 @@
 __builtin__.print_error = print_error
 __builtin__.print_warning = print_warning
+__builtin__.print_debug = print_debug
 
 class BaseMessage:

trunk/error.py

@@ -56 +56 @@
 
 
-class ItakaServerErrorCannotListen(ItakaServerError):
+class ItakaServerCannotListenError(ItakaServerError):
     """
     Exception raised by server methods
@@ -70 +70 @@
 
 
-class ItakaScreenshotErrorWmHints(ItakaScreenshotError):
+class ItakaScreenshotWmHintsError(ItakaScreenshotError):
     """
     Exception raised by screenshooting methods
@@ -77 +77 @@
 
 
-class ItakaScreenshotErrorActiveDesktop(ItakaScreenshotError):
+class ItakaScreenshotActiveDesktopError(ItakaScreenshotError):
     """
     Exception raised by screenshooting methods
@@ -84 +84 @@
     
 
-class ItakaSaveScreenshotError(ItakaScreenshotError):
+class ItakaScreenshotSaveError(ItakaScreenshotError):
     """
     Exception raised by screenshooting methods

trunk/screenshot.py

@@ -87 +87 @@
         else:
             self.current_window_failed = True
-            raise error.ItakaScreenshotErrorWmHints, _('Window Manager does not support _NET_WM hints')
+            raise error.ItakaScreenshotWmHintsError, _('Window Manager does not support _NET_WM hints')
     
         # We do not want to grab the desktop window
         if self.active_window.property_get("_NET_WM_WINDOW_TYPE")[-1][0] == '_NET_WM_WINDOW_TYPE_DESKTOP':
             self.current_window_failed = True
-            raise error.ItakaScreenshotErrorActiveDesktop, _('Active window is desktop')
+            raise error.ItakaScreenshotActiveDesktopError, _('Active window is desktop')
 
         return (self.window_width, self.window_height, self.window_positionx, self.window_positiony)
@@ -111 +111 @@
             try:
                 self.current_window = self.find_current_active_window()
-            except error.ItakaScreenshotErrorWmHints:
+            except error.ItakaScreenshotWmHintsError:
                 self.gui.log.failure(('Screenshot', 'take_screenshot'), (_('Can not grab the current window'), _('Can not grab the current window because your window manager does not support NET_WM_* hints')), 'WARNING')
-            except error.ItakaScreenshotErrorActiveDesktop:
+            except error.ItakaScreenshotActiveDesktopError:
                 self.gui.log.failure(('Screenshot', 'take_screenshot'), (_('Not grabing the desktop as the current window'), _('Your focus was on the destop when a client requested a screenshot, Itaka instead took a screenshot of the whole screen')), 'WARNING')
 
@@ -162 +162 @@
         except:
             self.gui.log.failure(('Screenshot','take_screenshot'), (_('Could not save screenshot'), _('Could not save screenshot %s') % (traceback.format_exc())), 'ERROR')
-            raise error.ItakaSaveScreenshotError, _('Could not save screenshot')
+            raise error.ItakaScreenshotSaveError, _('Could not save screenshot')
 
         # Important workaround to avoid a memory leak

trunk/server.py

@@ -118 +118 @@
             self.server = reactor.listenTCP(port, self.site)
         except twisted.internet.error.CannotListenError, e:
-            raise error.ItakaServerErrorCannotListen, e
+            raise error.ItakaServerCannotListenError, e
 
         self.server_listening = True

trunk/uigtk.py

@@ -1149 +1149 @@
         try:
             self.server.start_server(self.configuration['server']['port'])
-        except error.ItakaServerErrorCannotListen, e:
-            self.log.failure(('Gui', 'start_server'), (_('Failed to start server: %s' % e.value), _('Failed to start server: %s') % e.value), 'ERROR')
+        except error.ItakaServerCannotListenError, e:
+            self.log.failure(('Gui', 'start_server'), (_('Failed to start server: port %s already in use' % e.value.port), _('Failed to start server: %s') % e.value), 'ERROR')
             self.button_start_stop.set_active(False)
             return