Changeset 146

Timestamp:

06/07/06 23:59:26 (18 years ago)

Author:

jerome

Message:

Implemented a caching mechanism for input forms.

Location:

pykoticon/trunk

Files:

• bin/pykoticon (modified) (5 diffs)
• NEWS (modified) (1 diff)
• TODO (modified) (1 diff)

pykoticon/trunk/bin/pykoticon

@@ -99 +99 @@
         self.frame = frame
         self.debug = options.debug
+        self.cacheduration = options.cache
+        self.cache = {}
         self.printServers = [ socket.gethostbyname(arg) for arg in arguments ]
         if "127.0.0.1" not in self.printServers :
@@ -110 +112 @@
             sys.stderr.write("%s\n" % message)
             
+    def getAnswerFromCache(self, key) :
+        """Tries to extract a value from the cache and returns it if still valid."""
+        cacheentry = self.cache.get(key)
+        if cacheentry is not None :
+            (birth, value) = cacheentry 
+            if (time.time() - birth) < self.cacheduration :
+                self.logDebug("Cache hit for %s ---> %s" % (str(key), value))
+                return value # NB : we don't extend the life of this entry
+            else :    
+                self.logDebug("Cache expired for %s" % str(key))
+        else :        
+            self.logDebug("Cache miss for %s" % str(key))
+        return None
+        
+    def storeAnswerInCache(self, key, value) :    
+        """Stores an entry in the cache."""
+        self.cache[key] = (time.time(), value)
+        self.logDebug("Cache store for %s ---> %s" % (str(key), value))
+        
+    def export_askDatas(self, labels, varnames, varvalues) :
+        """Asks some textual datas defined by a list of labels, a list of variables' names and a list of variables values in a mapping."""
+        values = {}
+        for (key, value) in varvalues.items() :
+            values[key] = self.frame.UTF8ToUserCharset(value.data)
+        cachekey = tuple(values.items())  
+        retcode = self.getAnswerFromCache(cachekey)
+        if retcode is None :
+            wx.CallAfter(self.frame.askDatas, [ self.frame.UTF8ToUserCharset(label.data) for label in labels ], \
+                                              varnames, \
+                                              values)
+            # ugly, isn't it ?
+            while self.frame.dialogAnswer is None :
+                time.sleep(0.1)
+            retcode = self.frame.dialogAnswer    
+            for (key, value) in retcode.items() :
+                if key != "isValid" :
+                    retcode[key] = xmlrpclib.Binary(self.frame.userCharsetToUTF8(value))
+            self.frame.dialogAnswer = None # prepare for next call, just in case
+            self.storeAnswerInCache(cachekey, retcode)
+        return retcode
+        
     def export_quitApplication(self) :    
         """Makes the application quit."""
@@ -115 +158 @@
         wx.CallAfter(self.frame.OnClose, None)
         return True
-        
-    def export_askDatas(self, labels, varnames, varvalues) :
-        """Asks some textual datas defined by a list of labels, a list of variables' names and a list of variables values in a mapping."""
-        values = {}
-        for (key, value) in varvalues.items() :
-            values[key] = self.frame.UTF8ToUserCharset(value.data)
-        wx.CallAfter(self.frame.askDatas, [ self.frame.UTF8ToUserCharset(label.data) for label in labels ], \
-                                          varnames, \
-                                          values)
-        # ugly, isn't it ?
-        while self.frame.dialogAnswer is None :
-            time.sleep(0.1)
-        retcode = self.frame.dialogAnswer    
-        for (key, value) in retcode.items() :
-            if key != "isValid" :
-                retcode[key] = xmlrpclib.Binary(self.frame.userCharsetToUTF8(value))
-        self.frame.dialogAnswer = None # prepare for next call, just in case
-        return retcode
         
     def export_showDialog(self, message, yesno) :
@@ -252 +277 @@
         wx.EVT_ICONIZE(self, self.OnIconify)
         wx.EVT_CLOSE(self, self.OnClose)
-        self.Show(True)
+        self.Show(False)
         
     def getCurrentUserName(self) :
@@ -448 +473 @@
                             action="store_true", 
                             dest="version",
-                            help=_("show PyKotIcon's version number and exit"))
+                            help=_("show PyKotIcon's version number and exit."))
+    parser.add_option("-c", "--cache", 
+                            type="int", 
+                            default=0, 
+                            dest="cache",
+                            help=_("the duration of the cache in seconds to keep input forms' datas in memory. Defaults to 0 second, meaning no cache."))
     parser.add_option("-d", "--debug", 
                             action="store_true", 
                             dest="debug",
-                            help=_("activate debug mode"))
+                            help=_("activate debug mode."))
     parser.add_option("-p", "--port", 
                             type="int", 
                             default=7654, 
                             dest="port",
-                            help=_("the TCP port PyKotIcon will listen to, default is 7654"))
+                            help=_("the TCP port PyKotIcon will listen to, default is 7654."))
     parser.add_option("-q", "--allowquit", 
                             action="store_true", 
                             dest="allowquit",
-                            help=_("allow the end user to close the application"))
+                            help=_("allow the end user to close the application."))
     (options, arguments) = parser.parse_args()
     if options.version :
         print "PyKotIcon v%(__version__)s" % globals()
     else :
-        app = PyKotIconApp()
-        app.postInit(charset, options, arguments)
-        app.MainLoop()
+        if not (1024 <= options.port <= 65535) :
+            sys.stderr.write(_("The TCP port number specified for --port must be between 1024 and 65535.\n"))
+        elif not (0 <= options.cache <= 86400) :    
+            sys.stderr.write(_("The duration specified for --cache must be between 0 and 86400 seconds.\n"))
+        else :    
+            app = PyKotIconApp()
+            app.postInit(charset, options, arguments)
+            app.MainLoop()
     
     

pykoticon/trunk/NEWS

@@ -22 +22 @@
 PyKotIcon NEWS :
 
-  - 1.02 (2006-06-06) :
+  - 1.02 (2006-06-07) :
     
+    - Added the --cache command line option to specify the time in
+      seconds during which input forms' content will be cached.
+      This allows people to avoid retyping their username and
+      password for each print job, for example.
+      
     - Now displays an error message when the end user wants to quit
       and it is forbidden.

pykoticon/trunk/TODO

@@ -22 +22 @@
 TODO, in no particular order :
 
-  - Configurable cache for user credentials when username and
-    password are asked. The cache's duration will only be
-    settable from pknotify to avoid some security issues with
-    "smart" students :-)
-
+    - Find something to do :)
+    
 ============================================================