r13301 - in software/thumbnails: . debian

[Paul Wise]

Author: pabs
Date: 2012-02-27 03:25:14 +0000 (Mon, 27 Feb 2012)
New Revision: 13301

Modified:
   software/thumbnails/debian/changelog
   software/thumbnails/fetch-thumbnails
Log:
Support compressed debtags files in the screenshot fetcher

Modified: software/thumbnails/debian/changelog
===================================================================
--- software/thumbnails/debian/changelog	2012-02-26 22:46:25 UTC (rev 13300)
+++ software/thumbnails/debian/changelog	2012-02-27 03:25:14 UTC (rev 13301)
@@ -4,6 +4,9 @@
   * Ran ./fetch-thumbnails to add new thumbnails from
     screenshots.debian.net.  6 new screen shots added.
 
+  [ Paul Wise ]
+  * Support compressed debtags files in the screenshot fetcher
+
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 26 Feb 2012 23:45:16 +0100
 
 games-thumbnails (20120212) unstable; urgency=low

Modified: software/thumbnails/fetch-thumbnails
===================================================================
--- software/thumbnails/fetch-thumbnails	2012-02-26 22:46:25 UTC (rev 13300)
+++ software/thumbnails/fetch-thumbnails	2012-02-27 03:25:14 UTC (rev 13301)
@@ -42,6 +42,7 @@
 
 __JSON_URL = 'http://screenshots.debian.net/json/screenshots'
 __DEBTAGS_FILE = '/var/lib/debtags/debtags-fetch-apt.tag'
+__DEBTAGS_GZ_FILE = '/var/lib/debtags/debtags-fetch-apt.tag.gz'
 __FACET = 'game'
 
 if not path.exists(__BASE_DIR):
@@ -57,8 +58,13 @@
 for s in screenshots_json:
     screenshots[s['name']] = s['large_image_url']
 
+try:
+    f = open(__DEBTAGS_FILE, "r")
+except IOError:
+    import gzip
+    f = gzip.open(__DEBTAGS_GZ_FILE, "r")
 db = debtags.DB()
-db.read(open(__DEBTAGS_FILE, "r"))
+db.read(f)
 games = db.filter_tags(lambda t: t.startswith(__FACET))
 
 work = []