Changeset 9989a6a in sasview

Timestamp:

Jul 6, 2015 9:35:09 AM (9 years ago)

Author:

Doucet, Mathieu <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:

098f3d2

Parents:

be34c71

Message:

Move latest version file to a json format

Files:

• sasview/local_config.py (modified) (1 diff)
• src/sas/guiframe/config.py (modified) (1 diff)
• src/sas/guiframe/gui_manager.py (modified) (4 diffs)

sasview/local_config.py

@@ -13 +13 @@
 __build__ = sas.sasview.__build__
 __download_page__ = 'https://github.com/SasView/sasview/releases'
-__update_URL__ = 'http://www.sasview.org/sasview.latestversion'
+__update_URL__ = 'http://www.sasview.org/latestversion.json'
 
 

src/sas/guiframe/config.py

@@ -10 +10 @@
 __build__ = '1'
 __download_page__ = 'https://github.com/SasView/sasview/releases'
-__update_URL__ = 'http://www.sasview.org/sasview.latestversion'
+__update_URL__ = 'http://www.sasview.org/latestversion.json'
 
 

src/sas/guiframe/gui_manager.py

@@ -27 +27 @@
 import urllib
 import urllib2
-
+import json
 
 from sas.guiframe.events import EVT_CATEGORY
@@ -2054 +2054 @@
             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):
+        version_info = json.loads(content)
+        self._process_version(version_info, standalone=event == None)
+
+    def _process_version(self, version_info, standalone=True):
         """
         Call-back method for the process of checking for updates.
@@ -2071 +2069 @@
 
         """
+        version = version_info["version"]
         try:
             if version == "0.0.0":
@@ -2080 +2079 @@
                 if not standalone:
                     import webbrowser
-                    webbrowser.open(config.__download_page__)
+                    if "download_url" in version_info:
+                        webbrowser.open(version_info["download_url"])
+                    else:
+                        webbrowser.open(config.__download_page__)
                 else:
                     msg += "See the help menu to download it."