Changeset e8c61f6 in sasview

Timestamp:

Mar 27, 2012 9:28:56 AM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

204548c

Parents:

27edb0d

Message:

Fix 'check for update'

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (6 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -18 +18 @@
 import time
 import py_compile
-# Try to find a local config
 import imp
 import warnings
+import re
 warnings.simplefilter("ignore")
 import logging
-
+import urllib2
 
 from sans.guiframe.events import EVT_STATUS
@@ -307 +307 @@
         self.on_batch_selection(event=None)
         self.add_icon()
-        # Check for update
-        #self._check_update(None)
         # Register the close event so it calls our own method
         wx.EVT_CLOSE(self, self.WindowClose)
@@ -676 +674 @@
         # Set up extra custom tool menu
         self._setup_extra_custom()
-        #self.Show(True)
-        #self._check_update(None)
+        self._check_update(None)
     
     def _setup_extra_custom(self):  
@@ -1246 +1243 @@
             wx.EVT_MENU(self, id, self._onAbout)
         
-        # Checking for updates needs major refactoring to work with py2exe
-        # We need to make sure it doesn't hang the application if the server
-        # is not up. We also need to make sure there's a proper executable to
-        # run if we spawn a new background process.
-        #id = wx.NewId()
-        #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)
+        # Checking for updates
+        id = wx.NewId()
+        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)
         self._menubar.Append(self._help_menu, '&Help')
             
@@ -2111 +2105 @@
         a call-back method when the current version number has been obtained.
         """
-        
-        if hasattr(config, "__update_URL__"):
-            import version
-            checker = version.VersionThread2(config.__update_URL__,
-                                            self._process_version,
-                                            baggage=event==None)
-            checker.start()  
+        try:
+            f=urllib2.urlopen(config.__update_URL__, 
+                              timeout=1.0)
+            content=f.read()
+        except:
+            content = "0.0.0"
+       
+        version = content.strip()
+        if len(re.findall('\d+\.\d+\.\d+$', version)) < 0:
+            content = "0.0.0"
+        self._process_version(content, standalone=event==None)
     
     def _process_version(self, version, standalone=True):
@@ -2132 +2130 @@
         """
         try:
-            if cmp(version, config.__version__) > 0:
-                msg = "Version %s is available! See the Help " % str(version)
-                msg += "menu to download it." 
+            if version == "0.0.0":
+                msg = "Could not connect to the application server."
+                msg += " Please try again later."
                 self.SetStatusText(msg)
+            elif cmp(version, config.__version__) > 0:
+                msg = "Version %s is available! " % str(version)
                 if not standalone:
                     import webbrowser
                     webbrowser.open(config.__download_page__)
+                else:
+                    msg +=  "See the help menu to download it." 
+                self.SetStatusText(msg)
             else:
                 if not standalone: