Merge lp:~mmcg069/software-center/bug839462 into lp:software-center

[Michael Vogt]

[Michael Vogt (mvo)]

Thanks for your branch.

This is indeed a way of fixing the race condition. I used a slightly different approach
in http://bazaar.launchpad.net/~software-store-developers/software-center/trunk/revision/2325

It uses the same idea but a more GIOish approach. Please have a look and let me know if you
think this is sufficient or if it misses anything that your branch is doing.

Thanks!
 Michael

[Michael Vogt (mvo)]

If sufficient it would be nice if you could mark the branch superseeded so that it does not show up in the code browser.

[Matthew McGowan (mmcg069)]

looks good, will mark my branch superseded.

Cheers
Matt

On Wed, Sep 14, 2011 at 9:34 PM, Michael Vogt <email address hidden>wrote:

> If sufficient it would be nice if you could mark the branch superseeded so
> that it does not show up in the code browser.
> --
> https://code.launchpad.net/~mmcg069/software-center/bug839462/+merge/75317
> You are the owner of lp:~mmcg069/software-center/bug839462.
>

--
From the mind of me!

Unmerged revisions

2154. By Matthew McGowan on 2011-09-05

make the log messages more informational

2153. By Matthew McGowan on 2011-09-05

fix another small programming error

2152. By Matthew McGowan on 2011-09-05

using loggin and shuffle timestamp_mismatch check around

2151. By Matthew McGowan on 2011-09-05

fix a wee programmign error

2150. By Matthew McGowan on 2011-09-05

with regards thumbnail downloading enforce timestamp matching to ensure the correct image gets displayed in scenarios where there is an existing thumbnail is being downloaded when an itemview page gets configured to a new pkg/app.

=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview_gtk.py'
--- softwarecenter/ui/gtk3/views/appdetailsview_gtk.py	2011-09-11 11:25:44 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview_gtk.py	2011-09-14 09:31:17 +0000
@@ -1588,7 +1588,7 @@
             elif app_details.icon_url:
                 LOG.debug("did not find the icon locally, must download it")
 
-                def on_image_download_complete(downloader, image_file_path):
+                def on_image_download_complete(downloader, image_file_path, *args):
                     # when the download is complete, replace the icon in the view with the downloaded one
                     try:
                         pb = GdkPixbuf.Pixbuf.new_from_file(image_file_path)

=== modified file 'softwarecenter/ui/gtk3/widgets/thumbnail.py'
--- softwarecenter/ui/gtk3/widgets/thumbnail.py	2011-09-12 02:49:29 +0000
+++ softwarecenter/ui/gtk3/widgets/thumbnail.py	2011-09-14 09:31:17 +0000
@@ -91,6 +91,7 @@
 
         # convienience class for handling the downloading (or not) of any screenshot
         self.loader = SimpleFileDownloader()
+        self.loader.enforce_timestamp_matching = True
         self.loader.connect('error', self._on_screenshot_load_error)
         self.loader.connect('file-url-reachable', self._on_screenshot_query_complete)
         self.loader.connect('file-download-complete', self._on_screenshot_download_complete)

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2011-09-14 09:30:28 +0000
+++ softwarecenter/utils.py	2011-09-14 09:31:17 +0000
@@ -523,7 +523,15 @@
     def __init__(self):
         GObject.GObject.__init__(self)
         self.tmpdir = None
+<<<<<<< TREE
         self._cancellable = None
+=======
+        self.enforce_timestamp_matching = False
+
+    def _timestamp_mismatch(self, timestamp):
+        return (self.enforce_timestamp_matching and
+                timestamp != self.timestamp)
+>>>>>>> MERGE-SOURCE
 
     def download_file(self, url, dest_file_path=None, use_cache=False,
                       simple_quoting_for_webkit=False):
@@ -538,6 +546,7 @@
         """
         self.LOG.debug("download_file: %s %s %s" % (
                 url, dest_file_path, use_cache))
+        self.url = url
 
         # cancel anything pending to avoid race conditions
         # like bug #839462
@@ -568,8 +577,8 @@
                 self.tmpdir = tempfile.mkdtemp(prefix="software-center-")
             dest_file_path = os.path.join(self.tmpdir, uri_to_filename(url))
 
-        self.url = url
         self.dest_file_path = dest_file_path
+        self.timestamp = GObject.get_current_time()
 
         # FIXME: we actually need to do etag based checking here to see
         #        if the source needs refreshing
@@ -584,15 +593,23 @@
             f.query_info_async(Gio.FILE_ATTRIBUTE_STANDARD_SIZE, 0, 0, 
                                self._cancellable,
                                self._check_url_reachable_and_then_download_cb,
-                               None)
+                               (self.timestamp,))
         else:
             f = Gio.File(url)
             # first check if the url is reachable
             f.query_info_async(Gio.FILE_ATTRIBUTE_STANDARD_SIZE,
-                               self._check_url_reachable_and_then_download_cb)
-                           
+                               self._check_url_reachable_and_then_download_cb,
+                               (self.timestamp,))
+        return
+
     def _check_url_reachable_and_then_download_cb(self, f, result, user_data=None):
         self.LOG.debug("_check_url_reachable_and_then_download_cb: %s" % f)
+
+        timestamp = user_data[0]
+        if self._timestamp_mismatch(timestamp):                  
+            self.LOG.debug("timestamp mismatch. discarding result - this:%s != current:%s" % (timestamp, self.timestamp))
+            return
+
         try:
             info = f.query_info_finish(result)
             etag = info.get_etag()
@@ -602,18 +619,28 @@
                                                         etag))
             # url is reachable, now download the file
             if have_gi:
+<<<<<<< TREE
                 f.load_contents_async(
                     self._cancellable, self._file_download_complete_cb, None)
+=======
+                f.load_contents_async(None, self._file_download_complete_cb, (timestamp,))
+>>>>>>> MERGE-SOURCE
             else:
-                f.load_contents_async(self._file_download_complete_cb)
+                f.load_contents_async(self._file_download_complete_cb, (timestamp,))
         except GObject.GError as e:
             self.LOG.debug("file *not* reachable %s" % self.url)
             self.emit('file-url-reachable', False)
             self.emit('error', GObject.GError, e)
         del f
 
-    def _file_download_complete_cb(self, f, result, path=None):
+    def _file_download_complete_cb(self, f, result, user_data=None):
         self.LOG.debug("file download completed %s" % self.dest_file_path)
+
+        timestamp = user_data[0]
+        if self._timestamp_mismatch(timestamp):
+            self.LOG.debug("timestamp mismatch. discarding result - this:%s != current:%s" % (timestamp, self.timestamp))
+            return
+
         # The result from the download is actually a tuple with three 
         # elements (content, size, etag?)
         # The first element is the actual content so let's grab that