Changeset 4946 for branch/QuickScan/umit/plugin/Update.py

Timestamp:

06/29/09 18:05:30 (4 years ago)

Author:

cassiano

Message:

Merged revisions 4909,4930-4932,4934-4935 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

................

r4909 | nopper | 2009-06-22 11:55:24 -0300 (Mon, 22 Jun 2009) | 21 lines

Merged revisions 4781-4783,4908 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/UmitPlugins

........

r4781 | nopper | 2009-05-08 21:26:32 +0200 (ven, 08 mag 2009) | 1 line

Switching to new schema see UmitPlugins.xsd in PM branch. Switched also from xml.minidom to sax to speed up things.

........

r4782 | nopper | 2009-05-09 16:11:38 +0200 (sab, 09 mag 2009) | 1 line

Switched update process to new xml schema file.

........

r4783 | nopper | 2009-05-09 17:02:06 +0200 (sab, 09 mag 2009) | 1 line

Updating documentation to the new schema

........

r4908 | nopper | 2009-06-22 16:43:59 +0200 (lun, 22 giu 2009) | 1 line

Fixing a typo

........

................

r4930 | luis | 2009-06-27 11:33:59 -0300 (Sat, 27 Jun 2009) | 1 line

Fixing #334 - import error when umit is installed from package

................

r4931 | luis | 2009-06-27 22:38:54 -0300 (Sat, 27 Jun 2009) | 1 line

Fixed #331 - Permission denied writing umit config file

................

r4932 | luis | 2009-06-27 23:09:05 -0300 (Sat, 27 Jun 2009) | 1 line

Typo in Flow Analyzer plugin

................

r4934 | luis | 2009-06-27 23:30:31 -0300 (Sat, 27 Jun 2009) | 3 lines

Initialized merge tracking via "svnmerge" with revisions "1-4699" from
http://svn.umitproject.org/svnroot/umit/branch/radialnet

................

r4935 | ignotus | 2009-06-27 23:54:28 -0300 (Sat, 27 Jun 2009) | 3 lines

Fix accents problem in header.

................

Location:

branch/QuickScan

Files:

• . (modified) (1 prop)
• umit/plugin/Update.py (modified) (19 diffs)

branch/QuickScan/umit/plugin/Update.py

@@ -22 +22 @@
 try:
     from hashlib import md5
+    from hashlib import sha1 as sha
 except ImportError:
     from md5 import md5
+    from sha import sha
 
 from threading import RLock
 from tempfile import mkstemp
+from StringIO import StringIO
 from xml.dom.minidom import parseString
 
@@ -47 +50 @@
 FILE_CHECKING = 7
 
-class UpdateObject(object):
+from xml.sax import handler, make_parser
+
+class Update(object):
+    def __init__(self, version, description, url, integrity):
+        self.version, self.description, self.url, self.integrity = \
+            version, description, url, integrity
+
+class UpdateObject(handler.ContentHandler):
     def __init__(self, obj):
+        self.data = ''
+        self.parse_phase = 0
+        self.updates = []
+
+        self.version = ''
+        self.description = ''
+        self.url = []
+        self.integrity = {}
+
         self.buffer = []
-        
+
         self.status = STATUS_IDLE
-        
+
         self.label = None
         self.fract = None
-        
-        self.url = None
-        self.version = None
-        self.hash = None
-        
+
         self.object = obj
-        
+
         self.fd = None
-        
+
         self.size = None
         self.total = None
 
+        self.last_update_idx = 0
+        self.selected_update_idx = -1
+
         # Simple lock for sync
         self.lock = RLock()
 
     def parse_latest_file(self):
-        """
-        @return url, version or None, None on error
-        """
-
-        try:
-            doc = parseString("".join(self.buffer))
-            
-            if doc.documentElement.tagName != 'UmitPluginUpdate':
-                raise Exception("Not valid xml file.")
-
-            url, version, hash = None, None, None
-
-            for node in doc.documentElement.childNodes:
-                if node.nodeName == 'update-uri':
-                    url = node.firstChild.data
-                if node.nodeName == 'version':
-                    version = node.firstChild.data
-                if node.nodeName == 'md5':
-                    hash = node.firstChild.data
-
-            return url, version, hash
-        except Exception, exc:
-            log.warning("__parse_xml: %s" % exc)
-            return None, None, None
-
+        parser = make_parser()
+        parser.setContentHandler(self)
+        parser.parse(StringIO("".join(self.buffer)))
+
+    def startElement(self, name, attrs):
+        if name == 'UmitPluginUpdate' and self.parse_phase == 0:
+            self.parse_phase = 1
+        elif name == 'update' and self.parse_phase == 1:
+            self.parse_phase = 2
+        elif name in ('version', 'description', 'url') and \
+             self.parse_phase == 2:
+
+            self.parse_phase = 3
+        elif name == 'integrity' and self.parse_phase == 2 and \
+             'type' in attrs.keys() and 'value' in attrs.keys():
+
+            self.integrity[attrs.get('type')] =  attrs.get('value')
+        else:
+            self.data = ''
+
+    def characters(self, ch):
+        if self.parse_phase == 3:
+            self.data += ch
+
+    def endElement(self, name):
+        if name in ('version', 'description', 'url'):
+            val = getattr(self, name, None)
+
+            if isinstance(val, basestring):
+                setattr(self, name, self.data)
+            elif isinstance(val, list):
+                val.append(self.data)
+
+        elif name == 'update':
+            if self.version and self.url:
+                self.updates.append(Update(self.version, self.description,
+                                     self.url, self.integrity))
+
+            self.version = ''
+            self.description = ''
+            self.url = []
+            self.integrity = {}
+            self.parse_phase = 1
+            self.data = ''
+        else:
+            self.parse_phase -= 1
+            self.data = ''
 
 class UpdateEngine(object):
@@ -107 +147 @@
         self.static_lst = None
         self.updating = False
-    
+
     def stop(self):
         "Mark as stopped"
@@ -127 +167 @@
 
             self.__process_next()
-        
+
         self.updating = True
-    
+
     def start_download(self):
         """
@@ -145 +185 @@
 
             self.__process_next_download()
-            
+
         self.updating = True
-    
+
     def __process_next_download(self):
         """
@@ -155 +195 @@
         if not self.update_lst:
             return
-        
+
         obj = self.update_lst.pop(0)
-        
+
         try:
             user_dir = os.path.join(Path.config_dir)
             filename = os.path.basename(obj.object.reader.get_path())
-            
+
             obj.fd = open(mkstemp(".part", filename, \
                          os.path.join(user_dir, "plugins-download"))[1], "wb+")
-                         
-            Network.get_url(obj.url, self.__process_plugin, obj)
+
+            Network.get_url(
+                # Maybe too long string? :P
+                obj.updates[obj.selected_update_idx].url[obj.last_update_idx],
+                self.__process_plugin, obj
+            )
         except Exception, err:
             obj.status = FILE_ERROR
             obj.label = err
             obj.fract = None
-            
+
             self.__process_next_download()
-    
+
+    def __remove_file(self, obj):
+        try:
+            obj.fd.close()
+            os.remove(obj.fd.name)
+        except:
+            log.error('Error while removing temp %s file' % obj.fd.name)
+
     def __process_plugin(self, file, data, exc, obj):
         """
@@ -182 +233 @@
 
             try:
-                obj.status = FILE_ERROR
-                obj.label = exc.reason
-                obj.fract = 1
-                
+                if obj.last_update_idx + 1 < \
+                   len(obj.updates[obj.selected_update_idx].url):
+
+                    obj.last_update_idx += 1
+
+                    obj.status = FILE_GETTING
+                    obj.label = _('Cycling to next update url. Waiting...')
+                else:
+                    obj.status = FILE_ERROR
+                    obj.label = _('Download failed: %s') % str(exc.reason)
+                    obj.fract = 1
+
+                self.__remove_file(obj)
+
                 self.__process_next_download()
                 return
             finally:
                 obj.lock.release()
-        
+
         elif isinstance(exc, StopNetException):
-            if obj.hash:
+            #TODO: CHECK THIS
+            if obj.updates[obj.selected_update_idx].integrity:
 
                 data = ""
@@ -200 +262 @@
                     obj.label = _('Checking validity ...')
                     obj.status = FILE_CHECKING
-                
+
                     obj.fd.flush()
                     obj.fd.seek(0)
@@ -207 +269 @@
                 finally:
                     obj.lock.release()
-                
+
                 # Not locked it could freeze the ui
-                hasher = md5(data)
-                
+                md5_hash = sha_hash = None
+                sums = obj.updates[obj.selected_update_idx].integrity
+
+                if 'md5' in sums:
+                    md5_hash = md5(data)
+                if 'sha1' in sums:
+                    sha_hash = sha(data)
+
                 obj.lock.acquire()
 
                 try:
-                    if hasher.hexdigest() == obj.hash:
+                    if (md5_hash and md5_hash.hexdigest() == sums['md5']) or \
+                       (sha_hash and sha_hash.hexdigest() == sums['sha1']):
+
                         obj.label = _('Updated. Restart to take effect')
                         obj.status = FILE_GETTED
@@ -231 +301 @@
                 finally:
                     obj.lock.release()
-            
+
             obj.lock.acquire()
 
@@ -239 +309 @@
             finally:
                 obj.lock.release()
-            
+
             try:
                 if obj.status == FILE_ERROR:
@@ -249 +319 @@
                 # TODO: add more sensed control?
                 pass
-            
+
             self.__process_next()
-        
+
         elif isinstance(exc, StartNetException):
             obj.lock.acquire()
@@ -262 +332 @@
                 except:
                     pass
-            
+
                 obj.label = _('Downloading ...')
             finally:
@@ -272 +342 @@
                 obj.fract = float(obj.size) / float(obj.total)
             obj.fd.write(data)
-    
+
     def __process_next(self):
         """
@@ -280 +350 @@
         if not self.update_lst:
             return
-        
+
         obj = self.update_lst.pop(0)
-        Network.get_url("%s/latest.xml" % obj.object.reader.update, \
+        obj.label = _('Downloading update information...')
+
+        Network.get_url("%s/latest.xml" % \
+                        obj.object.reader.update[obj.last_update_idx], \
                         self.__process_manifest, obj)
 
@@ -295 +368 @@
 
             try:
-                obj.status = LATEST_ERROR
-                obj.label = _('Cannot find newer version (%s)') % exc.reason
-                
+                if obj.last_update_idx + 1 < len(obj.object.reader.update):
+                    obj.last_update_idx += 1
+
+                    obj.status = LATEST_GETTING
+                    obj.label = _('Cycling to next update url. Waiting...')
+
+                    self.update_lst.append(obj)
+                elif isinstance(exc, ErrorNetException):
+                    obj.status = LATEST_ERROR
+                    obj.label = _('Cannot find newer version (%s)') % exc.reason
+
                 self.__process_next()
                 return
             finally:
                 obj.lock.release()
-        
+
         elif isinstance(exc, StopNetException):
-            url, version, hash = obj.parse_latest_file()
-
-            new_v = Version(version)
-            cur_v = Version(obj.object.reader.version)
-
+            try:
+                obj.parse_latest_file()
+            except Exception, exc:
+
+                if obj.last_update_idx + 1 < len(obj.object.reader.update):
+                    obj.last_update_idx += 1
+
+                    obj.status = LATEST_GETTING
+                    obj.label = _('Cycling to next update url. Waiting...')
+
+                    self.update_lst.append(obj)
+                else:
+                    obj.status = LATEST_ERROR
+                    obj.label = _('Cannot find newer version (%s)') % str(exc)
+
+                self.__process_next()
+                return
+
+            version = None
             type = -1 # -1 no action / 0 update / 1 downgrade
 
-            if new_v > cur_v:
-                type = 0
-            elif cur_v < new_v:
-                type = 1
+            # If we have only 1 update..
+            if len(obj.updates) == 1:
+                version = obj.updates[0].version
+
+                new_v = Version(version)
+                cur_v = Version(obj.object.reader.version)
+
+                if new_v > cur_v:
+                    type = 0
+                elif cur_v < new_v:
+                    type = 1
 
             obj.lock.acquire()
 
             try:
-                if url and version and type >= 0:
+                if obj.updates:
 
                     # We check if the path is the plugins in config_dir
@@ -330 +432 @@
                         obj.status = LATEST_ERROR
 
-                        if not type:
-                            obj.label = _('Version %s avaiable but need manual update.') % version
-                        else:
-                            obj.label = _('Version %s avaiable but need manual downgrade.') % version
+                        if type == -1:
+                            obj.label = _('Various versions available but require manual intervention.')
+                        elif type == 0:
+                            obj.label = _('Version %s available but need manual update.') % version
+                        elif type == 1:
+                            obj.label = _('Version %s available but need manual downgrade.') % version
                     else:
                         obj.status = LATEST_GETTED
-                        obj.label = _('Version %s avaiable.') % version
-                    
-                    obj.version = version
-                    obj.url = url
-                    obj.hash = hash
+                        if type == -1:
+                            obj.label = _('Various versions available')
+                        else:
+                            obj.label = _('Version %s available.') % version
+
                 else:
                     obj.status = LATEST_ERROR
@@ -355 +459 @@
         elif not exc:
             obj.buffer.append(data)
-    
+
     def get_list(self):
         "Getter for list"
         return self.static_lst
-    
+
     def set_list(self, value):
         "Setter for list"
         lst = []
-        
+
         for iter in value:
             if isinstance(iter, UpdateObject):
@@ -369 +473 @@
             else:
                 lst.append(UpdateObject(iter))
-                
+
         self.update_lst = lst
         self.static_lst = tuple(self.update_lst)
-        
+
     list = property(get_list, set_list)
+
+if __name__ == "__main__":
+    parser = make_parser()
+    loader = UpdateObject(1)
+    parser.setContentHandler(loader)
+    parser.parse(open('test.xml'))
+    print loader.updates