Changeset 6df04e43 in sasview

Timestamp:

Nov 18, 2011 12:43:13 PM (12 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3dc977c

Parents:

930f559

Message:

put back the code for version_checking, replace subprocess with process

Location:

sansguiframe/src/sans/guiframe

Files:

• dummyapp.py (modified) (1 diff)
• gui_manager.py (modified) (9 diffs)
• version.py (modified) (5 diffs)

sansguiframe/src/sans/guiframe/dummyapp.py

@@ -122 +122 @@
 
 if __name__ == "__main__": 
+    from multiprocessing import freeze_support
+    freeze_support()
     sansview = SansView()
-    

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -288 +288 @@
         self.add_icon()
         # Check for update
-        #self._check_update(None)
+        self._check_update(None)
         # Register the close event so it calls our own method
         wx.EVT_CLOSE(self, self.Close)
@@ -657 +657 @@
         self._setup_extra_custom()
         #self.Show(True)
-        #self._check_update(None)
+        self._check_update(None)
     
     def _setup_extra_custom(self):  
@@ -698 +698 @@
         """
         number = self.sb.get_msg_position()
-        wx.Frame.SetStatusText(number=number, *args, **kwds)
+        wx.Frame.SetStatusText(self, number=number, *args, **kwds)
         
     def PopStatusText(self, *args, **kwds):
@@ -704 +704 @@
         """
         field = self.sb.get_msg_position()
-        wx.Frame.PopStatusText(field=field)
+        wx.Frame.PopStatusText(self, field=field)
         
     def PushStatusText(self, *args, **kwds):
@@ -1233 +1233 @@
         #self._help_menu.Append(id,'&Check for update', 
         #'Check for the latest version of %s' % config.__appname__)
-        #wx.EVT_MENU(self, id, self._check_update)
+        wx.EVT_MENU(self, id, self._check_update)
         self._menubar.Append(self._help_menu, '&Help')
             
@@ -2085 +2085 @@
         a call-back method when the current version number has been obtained.
         """
+        
         if hasattr(config, "__update_URL__"):
             import version
-            checker = version.VersionThread(config.__update_URL__,
+            checker = version.VersionThread2(config.__update_URL__,
                                             self._process_version,
                                             baggage=event==None)
@@ -2106 +2107 @@
         try:
             if cmp(version, config.__version__) > 0:
-                msg = "Version %s is available! See the Help "
-                msg += "menu to download it." % version
+                msg = "Version %s is available! See the Help " % str(version)
+                msg += "menu to download it." 
                 self.SetStatusText(msg)
                 if not standalone:
@@ -2115 +2116 @@
                 if not standalone:
                     msg = "You have the latest version"
-                    msg += " of %s" % config.__appname__
+                    msg += " of %s" % str(config.__appname__)
                     self.SetStatusText(msg)
         except:
@@ -3206 +3207 @@
         self.frame.Show(True)
         event.Skip()
-      
+
 if __name__ == "__main__": 
     app = ViewApp(0)

sansguiframe/src/sans/guiframe/version.py

@@ -14 +14 @@
 import time
 import subprocess
+import urllib
+import re
 import os
 import getopt
@@ -22 +24 @@
 ## Local storage file name
 VERSION_FILE  = '.current_version'
+
+DEFAULT_VERSION = '0.0.0'
 
 class VersionChecker(object):
@@ -71 +75 @@
             return f.read()
         except:
-            return '0.0.0'
+            return DEFAULT_VERSION
 
 class VersionThread(Thread):
@@ -96 +100 @@
             time.sleep(1)
         self._call_back(checker.get_version(), self._baggage)
+        
+  
+def get_version(url, q=None):
+    """
+    """
+    h = urllib.urlopen(url)
+    for line in h.readlines():
+        version = line.strip()
+        if len(re.findall('\d+\.\d+\.\d+$', version)) > 0:
+            if q is not None:
+                q.put(version)
+            return version
+    if q is not None:
+        q.put(DEFAULT_VERSION)
+    return DEFAULT_VERSION
+      
+class VersionThread2(Thread):
+    """
+    Thread used to start the process of reading the current version of an
+    application from the deployment server. 
+   
+    The VersionChecker is user in a Thread to allow the main application
+    to continue dealing with UI requests from the user. The main application
+    provides a call-back method for when the version number is obtained. 
+    """
+    def __init__ (self, url, call_back=None, baggage=None):
+        Thread.__init__(self)
+        self._url = url
+        self._call_back = call_back
+        self._baggage = baggage
+        self._t_0 = time.time()
+      
+    def run(self):
+        """
+        Execute the process of reading the current application version number.
+        """
+        def is_complete(p):
+            """
+            """
+            if(time.time() - self._t_0 < MAX_WAIT_TIME):
+                if p.is_alive():
+                    return True
+                return False
+            else:
+                return False
+            
+        from multiprocessing import Process, Queue
+        q = Queue()
+        p = Process(target=get_version, args=(self._url, q,))
+        p.start()
+        while(not is_complete(p)):
+            time.sleep(1)
+        version = q.get()
+        p.join()
+        p.terminate()
+        self._call_back(version, self._baggage)
+    
             
 def write_version(version, filename=VERSION_FILE):
@@ -114 +175 @@
     
     """
-    import urllib
-    import re
     try: 
-        h = urllib.urlopen(url)
-        for line in h.readlines():
-            version = line.strip()
-            if len(re.findall('\d+\.\d+\.\d+$', version)) > 0:
-                write_version(version)
-                return       
-        write_version('0.0.0')
+        version = _get_version(url)
+        write_version(version)
     except:
-        write_version('0.0.0')
+        write_version(DEFAULT_VERSION)
+        
+        
         
 if __name__ == "__main__":