Changeset 3089

Timestamp:

07/05/08 16:38:36 (5 years ago)

Author:

nopper

Message:

Fixing lock atomic operations

Location:

branch/UmitPlugins/umitPlugin

Files:

• Network.py (modified) (2 diffs)
• PluginPage.py (modified) (7 diffs)
• Update.py (modified) (7 diffs)

branch/UmitPlugins/umitPlugin/Network.py

@@ -36 +36 @@
     def proxy(*args, **kwargs):
         thread = Thread(target=func, args=args, kwargs=kwargs)
-        #thread.setDaemon(True)
+        thread.setDaemon(True)
         thread.start()
         return thread
@@ -158 +158 @@
     data = list()
     Network.get_url( \
-            "http://localhost/~stack/plugins/systeminfo/SystemInfo-2.0.0.ump", \
+            "http://localhost/~stack/plugins/systeminfo/SystemInfo.ump", \
             callback, data)
 

branch/UmitPlugins/umitPlugin/PluginPage.py

@@ -32 +32 @@
 from higwidgets.higrichlists import HIGRichList, PluginRow
 
-from Update import FILE_GETTING
+from Update import FILE_GETTING, FILE_CHECKING
 from Update import LATEST_GETTED, LATEST_ERROR, LATEST_GETTING
 
@@ -40 +40 @@
 
         self.p_window = parent
+        self.menu_enabled = True
 
         self.__create_widgets()
@@ -128 +129 @@
         self.install_updates_btn.hide()
         self.find_updates_btn.show()
+
+        self.menu_enabled = True
     
     def __on_install_updates(self, widget):
@@ -170 +173 @@
         for obj in self.p_window.update_eng.list:
             with obj.lock:
-                if obj.status == FILE_GETTING:
+                if obj.status == FILE_GETTING or \
+                   obj.status == FILE_CHECKING:
                     working = True
                     
@@ -212 +216 @@
 
         self.find_updates_btn.set_sensitive(False)
+        self.menu_enabled = False
         
         lst = []
@@ -295 +300 @@
                 self.populate()
 
+                self.menu_enabled = True
             else:
                 # Now prepare the download page
@@ -330 +336 @@
         "Popup menu"
 
+        if not self.menu_enabled:
+            return
+
         menu = gtk.Menu()
 

branch/UmitPlugins/umitPlugin/Update.py

@@ -31 +31 @@
 
 from umitPlugin.Network import *
+from umitPlugin.Atoms import Version
 
 STATUS_IDLE = 0
@@ -144 +145 @@
     
     def __process_plugin(self, file, data, exc, obj):
-        with obj.lock:
-            self.__process_plugin_cb(file, data, exc, obj)
-
-    def __process_plugin_cb(self, file, data, exc, obj):
         if isinstance(exc, ErrorNetException):
-            obj.status = FILE_ERROR
-            obj.label = exc.reason
-            obj.fract = 1
-            
-            self.__process_next_download()
-            return
+
+            with obj.lock:
+                obj.status = FILE_ERROR
+                obj.label = exc.reason
+                obj.fract = 1
+                
+                self.__process_next_download()
+                return
         
         elif isinstance(exc, StopNetException):
             if obj.hash:
-                obj.label = _('Checking validity ...')
-                obj.status = FILE_CHECKING
-                
-                obj.fd.flush()
-                obj.fd.seek(0)
-                
+
+                data = ""
+
+                with obj.lock:
+                    obj.label = _('Checking validity ...')
+                    obj.status = FILE_CHECKING
+                
+                    obj.fd.flush()
+                    obj.fd.seek(0)
+
+                    data = obj.fd.read()
+                
+                # Not locked it could freeze the ui
                 hasher = md5.new()
-                hasher.update(obj.fd.read())
-                
-                if hasher.hexdigest() == obj.hash:
+                hasher.update(data)
+                
+                with obj.lock:
+                    if hasher.hexdigest() == obj.hash:
+                        obj.label = _('Updated. Restart to take effect')
+                        obj.status = FILE_GETTED
+                    else:
+                        obj.label = _('Corrupted file.')
+                        obj.status = FILE_ERROR
+            else:
+                with obj.lock:
                     obj.label = _('Updated. Restart to take effect')
                     obj.status = FILE_GETTED
-                else:
-                    obj.label = _('Corrupted file.')
-                    obj.status = FILE_ERROR
-            else:
-                obj.label = _('Updated. Restart to take effect')
-                obj.status = FILE_GETTED
-                
-            obj.fd.close()
-            obj.fract = 1
+            
+            with obj.lock:
+                obj.fd.close()
+                obj.fract = 1
             
             # TODO: try/except here
@@ -190 +199 @@
         
         elif isinstance(exc, StartNetException):
-            try:
-                obj.status = FILE_GETTING
-                obj.size = 0
-                obj.total = int(file.info()['Content-Length'])
-            except:
-                pass
-            
-            obj.label = _('Downloading ...')
+            with obj.lock:
+                try:
+                    obj.status = FILE_GETTING
+                    obj.size = 0
+                    obj.total = int(file.info()['Content-Length'])
+                except:
+                    pass
+            
+                obj.label = _('Downloading ...')
 
         elif not exc:
@@ -218 +228 @@
 
     def __process_manifest(self, file, data, exc, obj):
-        with obj.lock:
-            self.__process_manifest_cb(file, data, exc, obj)
-
-    def __process_manifest_cb(self, file, data, exc, obj):
         """
         Callback to parse latest.xml file containing meta information about
@@ -228 +234 @@
 
         if isinstance(exc, ErrorNetException):
-            obj.status = LATEST_ERROR
-            obj.label = _('Cannot find newer version (%s)') % exc.reason
-            
-            self.__process_next()
-            return
+            with obj.lock:
+                obj.status = LATEST_ERROR
+                obj.label = _('Cannot find newer version (%s)') % exc.reason
+                
+                self.__process_next()
+                return
         
         if isinstance(exc, StopNetException):
@@ -238 +245 @@
 
             new_v = Version(version)
-            cur_v = Version(obj.object.version)
+            cur_v = Version(obj.object.reader.version)
 
             type = -1 # -1 no action / 0 update / 1 downgrade
@@ -246 +253 @@
             elif cur_v < new_v:
                 type = 1
-            
-            if url and version and type >= 0:
-
-                # We check if the path is the plugins in config_dir
-
-                plug_dir = os.path.join(Path.config_dir, 'plugins')
-
-                if os.path.dirname(obj.object.reader.get_path()) != plug_dir and \
-                   os.access(plug_dir, os.O_RDWR):
-
+
+            with obj.lock:
+                if url and version and type >= 0:
+
+                    # We check if the path is the plugins in config_dir
+
+                    plug_dir = os.path.join(Path.config_dir, 'plugins')
+
+                    if os.path.dirname(obj.object.reader.get_path()) != plug_dir and \
+                       os.access(plug_dir, os.O_RDWR):
+
+                        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
+                    else:
+                        obj.status = LATEST_GETTED
+                        obj.label = _('Version %s avaiable.') % version
+                    
+                    obj.version = version
+                    obj.url = url
+                    obj.hash = hash
+                else:
                     obj.status = LATEST_ERROR
 
-                    if not type:
-                        obj.label = _('Version %s avaiable but need manual update.') % version
+                    if type < 0:
+                        obj.label = _('Unable to parse latest.xml')
                     else:
-                        obj.label = _('Version %s avaiable 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
-            else:
-                obj.status = LATEST_ERROR
-
-                if type < 0:
-                    obj.label = _('Unable to parse latest.xml')
-                else:
-                    obj.label = _('No applicable updates found')
-
-            self.__process_next()
+                        obj.label = _('No applicable updates found')
+
+                self.__process_next()
 
         if not exc: