openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/version-check into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)


More intelligent version checking.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/version-check/+merge/25989
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2010-05-17 18:39:28 +0000
+++ openlp/core/ui/mainwindow.py	2010-05-25 18:57:30 +0000
@@ -25,6 +25,7 @@
 
 import logging
 import time
+import re
 
 from PyQt4 import QtCore, QtGui
 
@@ -60,6 +61,7 @@
         QtCore.QThread.__init__(self, parent)
         self.parent = parent
         self.app_version = app_version
+        self.version_splitter = re.compile(r'([0-9]+).([0-9]+).([0-9]+)(?:-bzr([0-9]+))')
 
     def run(self):
         """
@@ -68,8 +70,29 @@
         time.sleep(1)
         Receiver.send_message(u'maindisplay_blank_check')
         version = check_latest_version(self.app_version)
-        #new version has arrived
-        if version != self.app_version[u'full']:
+        remote_version = {}
+        local_version = {}
+        match = self.version_splitter.match(version)
+        if match:
+            remote_version[u'major'] = int(match.group(1))
+            remote_version[u'minor'] = int(match.group(2))
+            remote_version[u'release'] = int(match.group(3))
+            if len(match.groups()) > 3:
+                remote_version[u'revision'] = int(match.group(4))
+        match = self.version_splitter.match(self.app_version[u'full'])
+        if match:
+            local_version[u'major'] = int(match.group(1))
+            local_version[u'minor'] = int(match.group(2))
+            local_version[u'release'] = int(match.group(3))
+            if len(match.groups()) > 3:
+                local_version[u'revision'] = int(match.group(4))
+        if remote_version[u'major'] > local_version[u'major'] or \
+            remote_version[u'minor'] > local_version[u'minor'] or \
+            remote_version[u'release'] > local_version[u'release']:
+            Receiver.send_message(u'openlp_version_check', u'%s' % version)
+        elif remote_version.get(u'revision') and \
+            local_version.get(u'revision') and \
+            remote_version[u'revision'] > local_version[u'revision']:
             Receiver.send_message(u'openlp_version_check', u'%s' % version)
 
 class Ui_MainWindow(object):