Changeset d8e9cb2325469b3c2eb53e85bca47650b14a8822

Timestamp:

11/22/10 14:43:16 (18 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

a9600c54b979c31276a8cb1ebde6f86a1fad96b1, cf7994aa7727099d65825b7d6e36b7077d59ad18

Parents:

bad98400ae7869c9fbc79bec7e188fd66356b64c

git-committer:

Luper Rouch <luper.rouch@…> (11/22/10 14:43:16)

Message:

pyflu.update:

• qt update dialog mixin class supports non-fixed progress bar and label widgets names
• sending signals.not_updated when appropriate so listeners can react appropriately (e.g. show main window)
• passing on HTTP errors when checking the update URL

Location:

pyflu/pyflu/update

Files:

• qt.py (modified) (7 diffs)
• signals.py (modified) (1 diff)

pyflu/pyflu/update/qt.py

@@ -5 +5 @@
 import re
 import louie
+import urllib2
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *    
@@ -12 +13 @@
 from pyflu.update.remote import find_patches_groups
 from pyflu.update.version import Version
+from pyflu.qt.util import get_or_create_app
 
 
@@ -39 +41 @@
     patch_dl_dir = None
     patch_target_dir = None
+    progress_bar_name = "progress_bar"
+    operation_label_name = "operation_label"
 
     def start_update(self, confirm=True):
@@ -45 +49 @@
 
         If *confirm* is True, a confirmation dialog is shown before starting
-        the update.
-        """
+        the update. The :class:`~pyflu.update.signals.not_updated` signal is
+        sent if no update was performed (either because there was no update
+        available or the user refused to apply it).
+        """
+        # Check for updates
         self.patches_paths = []
-        QDialog.show(self)
-        # Check for updates if we are running a frozen executable
         self.start_long_operation(
                 self.trUtf8("Searching for updates..."), 1)
@@ -68 +73 @@
                 self._download_next()
                 return
-            else:
-                self._exit(0)
-                return
+        louie.send(signals.not_updated, self)
 
     def start_long_operation(self, text, length):
-        self.operation_label.setText(text)
-        self.progress_bar.setValue(0)
-        self.progress_bar.setRange(0, length)
+        pb = getattr(self, self.progress_bar_name)
+        ol = getattr(self, self.operation_label_name)
+        ol.setText(text)
+        pb.setValue(0)
+        pb.setRange(0, length)
+        app = get_or_create_app()
+        app.processEvents()
 
     def update_long_operation(self, index):
-        self.progress_bar.setValue(index)
+        pb = getattr(self, self.progress_bar_name)
+        pb.setValue(index)
+        app = get_or_create_app()
+        app.processEvents()
 
     def _download_next(self):
+        pb = getattr(self, self.progress_bar_name)
+        ol = getattr(self, self.operation_label_name)
         # Open download file object
         self.download_url = self.download_queue.pop(0)        
         fname = basename(self.download_url)
         self.save_path = join(self.patch_dl_dir, fname)
-        self.operation_label.setText(self.trUtf8("Downloading '%1'")
-                .arg(fname))
-        self.progress_bar.setValue(0)
+        ol.setText(self.trUtf8("Downloading '%1'").arg(fname))
+        pb.setValue(0)
         self.file = QFile(self.save_path)
         self.file.open(QFile.ReadWrite)
@@ -99 +110 @@
 
     def _update_download_progress(self, received, total):
-        self.progress_bar.setRange(0, total)
-        self.progress_bar.setValue(received)
+        pb = getattr(self, self.progress_bar_name)
+        pb.setRange(0, total)
+        pb.setValue(received)
 
     def _flush_download(self):
@@ -191 +203 @@
         latest version.
         """
-        groups = find_patches_groups(self.update_url,
-                re.compile(self.patch_files_pattern))
-        # Find patches chain entry point
-        current_version = Version(self.current_version)
-        group = groups.get(current_version, [])
-        return [x[2] for x in group]
+        try:
+            groups = find_patches_groups(self.update_url,
+                    re.compile(self.patch_files_pattern))
+        except urllib2.HTTPError, err:
+            pb = getattr(self, self.progress_bar_name)
+            ol = getattr(self, self.operation_label_name)
+            pb.setValue(0)
+            ol.setText(self.trUtf8("Error opening update url: %1")
+                    .arg(unicode(err)))                
+        else:
+            # Find patches chain entry point
+            current_version = Version(self.current_version)
+            group = groups.get(current_version, [])
+            return [x[2] for x in group]
 
 
 __all__ = ["StartupDialog"]
-
-

pyflu/pyflu/update/signals.py

@@ -9 +9 @@
     It receives a single argument, containing the path of the patched files.
     """
+
+
+class not_updated(Signal):
+    """
+    Sent by :meth:`~pyflu.update.qt.UpdateDialogMixin.start_update` when no
+    update was performed.
+    """