Merge lp:~mvo/software-center/screenshots-sorting into lp:software-center

[Michael Vogt]

Small branch that ensures the multiple screenshots are sorted properly when they come from the json API

[Gary Lasker (gary-lasker)]

Cool! Thanks mvo!

review: Approve

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2012-02-02 13:31:14 +0000
+++ softwarecenter/db/application.py	2012-02-09 20:20:24 +0000
@@ -32,7 +32,7 @@
 from softwarecenter.paths import (APP_INSTALL_CHANNELS_PATH,
                                   SOFTWARE_CENTER_ICON_CACHE_DIR,
                                   )
-from softwarecenter.utils import utf8, split_icon_ext
+from softwarecenter.utils import utf8, split_icon_ext, version_compare
 from softwarecenter.region import get_region_cached, REGIONTAG
 
 LOG = logging.getLogger(__name__)
@@ -566,6 +566,20 @@
         except:
             LOG.exception("failed to load content")
 
+    def _sort_screenshots_by_best_version(self, screenshot_list):
+        """ take a screenshot result dict from screenshots.debian.org 
+            and sort it
+        """
+        my_version = self.version
+        # remove all versions we don't have
+        for item in screenshot_list[:]:
+            if version_compare(my_version, item["version"]) < 0:
+                screenshot_list.remove(item)
+        # now sort from high to low
+        return sorted(
+            screenshot_list, 
+            cmp=lambda a,b: version_compare(a["version"], b["version"]),
+            reverse=True)
 
     def _gio_screenshots_json_download_complete_cb(self, source, result, path):
         try:
@@ -574,7 +588,6 @@
             # ignore read errors, most likely transient
             return
         if content is not None:
-            import json
             content = json.loads(content)
 
         if isinstance(content, dict):
@@ -585,8 +598,9 @@
             screenshot_list = []
 
         # save for later and emit
-        self._screenshot_list = screenshot_list
-        self.emit("screenshots-available", screenshot_list)
+        self._screenshot_list = self._sort_screenshots_by_best_version(
+            screenshot_list)
+        self.emit("screenshots-available", self._screenshot_list)
         return
 
     @property

=== modified file 'softwarecenter/ui/gtk3/widgets/thumbnail.py'
--- softwarecenter/ui/gtk3/widgets/thumbnail.py	2012-01-24 09:54:42 +0000
+++ softwarecenter/ui/gtk3/widgets/thumbnail.py	2012-02-09 20:20:24 +0000
@@ -471,19 +471,13 @@
 
         # if there are multiple screenshots
         n = data.get_n_screenshots()
-
         if n <= 1:
             return
 
-        # get a random selection of thumbnails from those avaialble
-        import random
-        seq = random.sample(
-            range(n),
-            min(n, ThumbnailGallery.THUMBNAIL_MAX_COUNT))
-
-        seq.sort()
-
-        for i in seq:
+        # pick the first ones, the data is sorted by most appropriate
+        # version first - if at some later point we have a lot of
+        # screenshots we could consider randomizing again
+        for i in range(min(n, ThumbnailGallery.THUMBNAIL_MAX_COUNT)):
             url = data.get_nth_small_screenshot(i)
             self._create_thumbnail_for_url(i, url)
 

=== modified file 'test/test_database.py'
--- test/test_database.py	2012-02-02 13:31:14 +0000
+++ test/test_database.py	2012-02-09 20:20:24 +0000
@@ -49,6 +49,22 @@
         self.cache = get_pkg_info()
         self.cache.open()
 
+    def test_multiple_versions_sorting(self):
+        db = get_test_db()
+        app = Application("", "software-center")
+        details = AppDetails(db, application=app)
+        details._pkg = Mock()
+        details._pkg.installed = Mock()
+        details._pkg.installed.version  = "2.0"
+        self.assertEqual(details.version, "2.0")
+        v1 = { "version" : "1.0", }
+        v2 = { "version" : "2.0", }
+        v3 = { "version" : "3.0", }
+        screenshots_list = [ v1, v2, v3 ]
+        res = details._sort_screenshots_by_best_version(screenshots_list)
+        self.assertEqual(res, [ v2, v1 ])
+
+
     def test_update_from_desktop_file(self):
         # ensure we index with german locales to test i18n
         os.environ["LANGUAGE"] = "de"
@@ -224,7 +240,7 @@
         details = app.get_details(db)
         distro = get_distro().get_codename()
         self.assertEqual(app.request, 'channel=' + distro + '-partner')
-
+    
     def ensure_installation_date_and_lazy_history_loading(self, appdetails):
         # we run two tests, the first is to ensure that we get a
         # result from installation_data immediately (at this point the