Merge lp:~elachuni/ubuntu-webcatalog/xpmreader into lp:ubuntu-webcatalog

[Anthony Lenton]

Use gtk to render xpm and svg icons

Overview
========
This branch adds an xpmreader utility that will convert xpm icons to png format for using within the webcatalog.

Details
=======
PIL only supports reading xpms with less than 256 colors, so a small utility was added instead to parse the relatively simple xpm file format.
Tests included.

To test
=======
Follow the instructions in the readme, but basically just run: fab bootstrap test

[Anthony Lenton (elachuni)]

This has been tested against the whole set of xpm icons pulled in by both natty's and maverick's app-install-data.

[ISD Branch Mangler (isd-branches-mangler)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-06-18 23:17:11 +0000
+++ fabtasks/bootstrap.py	2011-07-01 15:38:25 +0000
@@ -31,6 +31,7 @@
     local("virtualenv/bin/pip install -r requirements.txt", capture=False)
     local("virtualenv/bin/python setup.py develop", capture=False)
     symlink_python_apt()
+    symlink_gtk2()
 
 
 def symlink_python_apt():
@@ -48,6 +49,44 @@
         virtualenv_libdir + 'site-packages/apt_inst.so')
 
 
+def symlink_gtk2():
+    minor = sys.version_info[1]
+
+    def _symlink_libs(filenames):
+        for filename in filenames:
+            basename = os.path.basename(filename)
+            _symlink(filename, 'virtualenv/lib/python2.%s/site-packages/%s' %
+                (minor, basename))
+
+    _symlink_libs([
+        '/usr/lib/pymodules/python2.%s/gtk-2.0' % minor,
+        '/usr/lib/pymodules/python2.%s/cairo' % minor,
+        ])
+    pth_file_prenatty = '/usr/lib/pymodules/python2.%s/pygtk.pth' % minor
+    pth_file_natty = '/usr/share/pyshared/pygtk.pth'
+    if os.path.exists(pth_file_prenatty):
+        _symlink_libs([
+            pth_file_prenatty,
+            '/usr/lib/pymodules/python2.%s/pygtk.py' % minor,
+        ])
+    elif os.path.exists(pth_file_natty):
+        _symlink_libs([
+            pth_file_natty,
+            '/usr/lib/pymodules/python2.%s/cairo' % minor,
+            '/usr/lib/python2.%s/dist-packages/glib' % minor,
+            '/usr/lib/python2.%s/dist-packages/gobject' % minor,
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0' % minor,
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0-pysupport-compat.pth'
+                % minor,
+            '/usr/share/pyshared/pygtk.py',
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0/gio' % minor,
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0/LaunchpadIntegration'
+                % minor,
+        ])
+    else:
+        raise EnvironmentError("Unable to find system-wide gtk2 installation")
+
+
 def _symlink(source, link_name):
     if not os.path.exists(link_name):
         os.symlink(os.path.abspath(source), link_name)

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2011-06-24 07:54:02 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2011-07-01 15:38:25 +0000
@@ -42,6 +42,7 @@
     Application,
     DistroSeries,
     )
+from webcatalog.utilities import create_png_from_file
 
 __metaclass__ = type
 __all__ = [
@@ -110,20 +111,19 @@
             help=('Use a local app-install-data deb package rather than '
                   'downloading from the archive.')),
             )
-    verbosity = 0
+    verbosity = 1
 
     def handle_label(self, distroseries_name, **options):
+        self.verbosity = int(options['verbosity'])
+        data_dir = tempfile.mkdtemp()
+        # First create the apps based on the current cache.
+        distroseries, created = DistroSeries.objects.get_or_create(
+            code_name=distroseries_name)
+        if created:
+            self.output(
+                "Created a DistroSeries record called '{0}'.\n".format(
+                    distroseries_name), 1)
         with Cache(distroseries_name) as cache:
-            self.verbosity = int(options['verbosity'])
-            data_dir = tempfile.mkdtemp()
-
-            # First create the apps based on the current cache.
-            distroseries, created = DistroSeries.objects.get_or_create(
-                code_name=distroseries_name)
-            if created and self.verbosity > 0:
-                self.stdout.write(
-                    "Created a DistroSeries record with codename '{0}'.".format(
-                        distroseries_name))
             self.update_from_cache(cache, distroseries_name)
 
             # Download app install data when requested.
@@ -135,40 +135,38 @@
 
             # Extract and parse the deb archive.
             deb_file = DebFile(deb_location)
-            if self.verbosity > 0:
-                self.stdout.write(
-                    "Processing application data to update database...\n")
+            self.output("Processing application data to update database...\n", 1)
             deb_file.data.extractall(data_dir)
             matcher = data_dir + '/usr/share/app-install/desktop/*.desktop'
             icon_dir = data_dir + '/usr/share/app-install/icons/'
 
             for desktop_file in iglob(matcher):
-                self.process_desktop_file(desktop_file, icon_dir, distroseries,
-                                            cache)
+                if self.verbosity > 1:
+                    self.output("Processing {0}\n".format(desktop_file))
+                elif self.verbosity > 0:
+                    self.output(".", flush=True)
+                self.process_desktop_file(desktop_file, icon_dir, distroseries)
 
             shutil.rmtree(data_dir)
 
-    def get_latest_app_data_for_series(self, distroseries, working_dir, cache=None):
+    def get_latest_app_data_for_series(self, distroseries, working_dir,
+        cache=None):
         # Write a temporary sources.list, update the cache and access:
         # cache['app-install-data-ubuntu'].candidate.uri
-        install_data_url = self.get_app_data_uri_for_series(distroseries, cache)
+        install_data_url = self.get_app_data_uri_for_series(distroseries,
+        cache)
         rest, sep, deb_filename = install_data_url.rpartition('/')
 
-        if self.verbosity > 0:
-            self.stdout.write(
-                u"Downloading app-install-data-ubuntu from {0}...".format(
-                    install_data_url))
+        self.output(u"Downloading app-install-data from {0}...\n".format(
+                    install_data_url), 1)
         deb_location = os.path.join(working_dir, deb_filename)
         urllib.urlretrieve(install_data_url, deb_location)
-        if self.verbosity > 0:
-            self.stdout.write("Done.\n")
+        self.output("Done.\n", 1)
         return deb_location
 
     def get_app_data_uri_for_series(self, distroseries, cache=None):
-        if self.verbosity > 0:
-            self.stdout.write(
-                "Determining URI for current version of "
-                "app-install-data in {0}.\n".format(distroseries))
+        self.output("Determining URI for current version of "
+                "app-install-data in {0}.\n".format(distroseries), 1)
         uri = None
         if cache == None:
             with Cache(distroseries) as cache:
@@ -177,8 +175,7 @@
             uri = cache['app-install-data'].candidate.uri
         return uri
 
-    def process_desktop_file(self, desktop_file_path, icon_dir, distroseries,
-                             cache):
+    def process_desktop_file(self, desktop_file_path, icon_dir, distroseries):
         with open(desktop_file_path, 'r') as desktop_file:
             data = desktop_file.read()
         form = ApplicationForm.get_form_from_desktop_data(data, distroseries)
@@ -189,15 +186,12 @@
             app.save()
             app.update_departments()
             self.add_icon_to_app(app, icon_dir)
-            if self.verbosity > 0:
-                self.stdout.write(
-                    u"{0} created.\n".format(app.name).encode('utf-8'))
+            self.output(u"{0} created.\n".format(app.name).encode('utf-8'), 1)
         else:
-            if self.verbosity > 0:
-                self.stdout.write(
-                    u"Skipping {0} as input failed validation: {1}.\n".format(
-                        form.cleaned_data['package_name'],
-                        form.errors).encode('utf-8'))
+            self.output(
+                u"Skipping {0} as input failed validation: {1}.\n".format(
+                    form.cleaned_data['package_name'],
+                    form.errors).encode('utf-8'), 1)
 
     def add_icon_to_app(self, app, icon_dir):
         # If the desktop file specifies an icon, we check for it in the
@@ -223,27 +217,32 @@
                     break
 
         if icon_path:
+            if icon_path.endswith('.xpm') or icon_path.endswith('.svg'):
+                target_path = icon_path[:-4] + '.png'
+                if create_png_from_file(target_path, icon_path, 32, 32):
+                    icon_path = target_path
             with open(icon_path, "r") as icon_file:
                 app.icon = ImageFile(icon_file)
                 app.save()
         else:
-            if self.verbosity > 0:
-                self.stdout.write(
-                    u"No icon found for {0} at {1}.({2}).\n".format(
+            self.output(u"No icon found for {0} at {1}.({2}).\n".format(
                         app.name, icon_path_generic,
-                        '|'.join(supported_extensions)).encode('utf-8'))
+                        '|'.join(supported_extensions)).encode('utf-8'), 1)
 
     def update_from_cache(self, cache, distroseries_name):
         distroseries, created = DistroSeries.objects.get_or_create(
             code_name=distroseries_name)
-        if created and self.verbosity > 0:
-            self.stdout.write(
-                "Created a DistroSeries record with codename '{0}'.".format(
-                    distroseries_name))
+        if created:
+            self.output("Created a DistroSeries record called '{0}'.\n".format(
+                    distroseries_name), 1)
 
         # For each package in the apt-cache, we update (or possibly
         # create) a matching db entry.
         for package in cache:
+            if self.verbosity > 1:
+                self.output("Updating {0}\n".format(package.name))
+            elif self.verbosity > 0:
+                self.output(".", flush=True)
             candidate = package.candidate
             # USC uses the first line of the summary as the
             # application name and the rest as the comment..
@@ -272,4 +271,13 @@
                     name=app_name,
                     comment=app_comment,
                     )
+        if self.verbosity == 1:
+            self.output("\n")
         return distroseries
+
+    def output(self, message, level=None, flush=False):
+        if hasattr(self, 'stdout'):
+            if level is None or self.verbosity >= level:
+                self.stdout.write(message)
+            if flush:
+                self.stdout.flush()

=== modified file 'src/webcatalog/tests/__init__.py'
--- src/webcatalog/tests/__init__.py	2011-06-29 11:59:28 +0000
+++ src/webcatalog/tests/__init__.py	2011-07-01 15:38:25 +0000
@@ -21,4 +21,5 @@
 from .test_forms import *
 from .test_models import *
 from .test_templatetags import *
+from .test_utilities import *
 from .test_views import *

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2011-06-24 07:54:02 +0000
+++ src/webcatalog/tests/test_commands.py	2011-07-01 15:38:25 +0000
@@ -247,12 +247,8 @@
         self.assertEqual(4, Application.objects.count())
         scribus = Application.objects.get(package_name='scribus')
         firefox = Application.objects.get(package_name='firefox')
-        self.assertEqual(
-            os.path.getsize(self.factory.get_test_path('firefox.xpm')),
-            firefox.icon.size)
-        self.assertEqual(
-            os.path.getsize(self.factory.get_test_path('scribus.xpm')),
-            scribus.icon.size)
+        self.assertTrue(firefox.icon.size > 1)
+        self.assertTrue(scribus.icon.size > 1)
 
     def test_get_app_data_uri_for_series(self):
         uri = Command().get_app_data_uri_for_series('natty')

=== added file 'src/webcatalog/tests/test_data/access.svg'
--- src/webcatalog/tests/test_data/access.svg	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/access.svg	2011-07-01 15:38:25 +0000
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="32"
+   height="32"
+   id="svg2522">
+  <defs
+     id="defs2524">
+    <linearGradient
+       id="linearGradient8838">
+      <stop
+         id="stop8840"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8842"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="62.625"
+       cy="4.625"
+       r="10.625"
+       fx="62.625"
+       fy="4.625"
+       id="radialGradient2502"
+       xlink:href="#linearGradient8838"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5058824,0,0,0.37647,-78.305888,26.258824)" />
+    <linearGradient
+       id="linearGradient2490-182-124">
+      <stop
+         id="stop2788"
+         style="stop-color:#1f4b6a;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2790"
+         style="stop-color:#4083c2;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="18.379412"
+       y1="44.980297"
+       x2="18.379412"
+       y2="3.0816143"
+       id="linearGradient2499"
+       xlink:href="#linearGradient2490-182-124"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7126612,0,0,0.7126613,-1.1038706,-1.1038704)" />
+    <linearGradient
+       id="linearGradient3242-187-536">
+      <stop
+         id="stop2778"
+         style="stop-color:#8badea;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2780"
+         style="stop-color:#6396cd;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop2782"
+         style="stop-color:#3b7caf;stop-opacity:1"
+         offset="0.66093999" />
+      <stop
+         id="stop2784"
+         style="stop-color:#194c70;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="23.895569"
+       cy="3.9900031"
+       r="20.397499"
+       fx="23.895569"
+       fy="3.9900031"
+       id="radialGradient2497"
+       xlink:href="#linearGradient3242-187-536"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.7008781,-2.245129,0,24.958071,-40.236051)" />
+    <linearGradient
+       id="linearGradient4873">
+      <stop
+         id="stop4875"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4877"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="63.397362"
+       y1="-12.489107"
+       x2="63.397362"
+       y2="5.4675598"
+       id="linearGradient2494"
+       xlink:href="#linearGradient4873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436509,0,0,1.5436158,-80.015712,21.419381)" />
+  </defs>
+  <g
+     id="layer1">
+    <path
+       d="M 31.999998,28 C 31.999998,30.209139 24.836553,32 15.999997,32 C 7.1634417,32 -3.2e-06,30.209139 -3.2e-06,28 C -3.2e-06,25.790861 7.1634417,24 15.999997,24 C 24.836553,24 31.999998,25.790861 31.999998,28 L 31.999998,28 z"
+       id="path8836"
+       style="opacity:0.3;fill:url(#radialGradient2502);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       d="M 16.000001,1.5017975 C 8.0003938,1.5017975 1.5017978,8.0003912 1.5017978,15.999999 C 1.5017978,23.999608 8.0003938,30.498205 16.000001,30.498202 C 23.999606,30.498202 30.49821,23.999608 30.498202,15.999999 C 30.498202,8.0003912 23.999606,1.5017975 16.000001,1.5017975 z"
+       id="path2555"
+       style="fill:url(#radialGradient2497);fill-opacity:1;stroke:url(#linearGradient2499);stroke-width:1.00365412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       d="M 29.5,15.999522 C 29.5,23.455607 23.455399,29.5 16.000172,29.5 C 8.5442598,29.5 2.5,23.455539 2.5,15.999522 C 2.5,8.5437822 8.5442598,2.5000011 16.000172,2.5000011 C 23.455399,2.5000011 29.5,8.5437822 29.5,15.999522 L 29.5,15.999522 z"
+       id="path8655"
+       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2494);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 18.299799,8.1756486 C 18.299799,9.3766078 17.316035,10.351299 16.103898,10.351299 C 14.891759,10.351299 13.907996,9.3766078 13.907996,8.1756486 C 13.907996,6.9746909 14.891759,5.9999997 16.103898,5.9999997 C 17.316035,5.9999997 18.299799,6.9746909 18.299799,8.1756486 z M 23.780465,10.489071 C 23.678901,10.505375 23.582932,10.545064 23.50068,10.604851 L 15.999771,11.763753 L 8.5392604,10.588868 C 8.3464065,10.450283 8.0752623,10.408784 7.8597702,10.511673 C 7.6442771,10.614562 7.5030077,10.858427 7.5000365,11.090481 C 7.4973158,11.322567 7.646957,11.522717 7.8597702,11.630709 L 13.705808,13.468134 L 13.665824,17.686241 L 11.602993,24.003606 C 11.404317,24.291273 11.464871,24.660718 11.762875,24.852499 C 12.060892,25.044308 12.483506,24.985866 12.682202,24.698167 L 16.011195,17.879188 L 19.277349,24.686382 C 19.453959,24.984755 19.847645,25.088403 20.156699,24.917911 C 20.465753,24.747422 20.573126,24.367363 20.396522,24.068988 L 18.371982,17.724445 L 18.292054,13.753383 L 24.22012,11.608108 C 24.459637,11.445958 24.563691,11.138982 24.459951,10.874963 C 24.356202,10.610915 24.071092,10.457077 23.780445,10.489071 L 23.780465,10.489071 z"
+       id="path2520"
+       style="fill:#1f4b6b;fill-opacity:1;stroke:none" />
+    <path
+       d="M 18.299799,9.1756488 C 18.299799,10.376608 17.316035,11.351299 16.103898,11.351299 C 14.891759,11.351299 13.907996,10.376608 13.907996,9.1756488 C 13.907996,7.9746911 14.891759,6.9999999 16.103898,6.9999999 C 17.316035,6.9999999 18.299799,7.9746911 18.299799,9.1756488 z M 23.780465,11.489071 C 23.678901,11.505375 23.582932,11.545064 23.50068,11.604851 L 15.999771,12.763753 L 8.5392604,11.588868 C 8.3464065,11.450283 8.0752623,11.408784 7.8597702,11.511673 C 7.6442771,11.614562 7.5030077,11.858427 7.5000365,12.090481 C 7.4973158,12.322567 7.646957,12.522717 7.8597702,12.630709 L 13.705808,14.468134 L 13.665824,18.686241 L 11.602993,25.003606 C 11.404317,25.291273 11.464871,25.660718 11.762875,25.852499 C 12.060892,26.044308 12.483506,25.985866 12.682202,25.698167 L 16.011195,18.879188 L 19.277349,25.686382 C 19.453959,25.984755 19.847645,26.088403 20.156699,25.917911 C 20.465753,25.747422 20.573126,25.367363 20.396522,25.068988 L 18.371982,18.724445 L 18.292054,14.753383 L 24.22012,12.608108 C 24.459637,12.445958 24.563691,12.138982 24.459951,11.874963 C 24.356202,11.610915 24.071092,11.457077 23.780445,11.489071 L 23.780465,11.489071 z"
+       id="path6668"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  </g>
+</svg>

=== added file 'src/webcatalog/tests/test_data/empty.xpm'
=== added file 'src/webcatalog/tests/test_data/junk.svg'
--- src/webcatalog/tests/test_data/junk.svg	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/junk.svg	2011-07-01 15:38:25 +0000
@@ -0,0 +1,4 @@
+This is not an xpm file. {
+"",
+Really, it's not?
+}
\ No newline at end of file

=== added file 'src/webcatalog/tests/test_data/junk.xpm'
--- src/webcatalog/tests/test_data/junk.xpm	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/junk.xpm	2011-07-01 15:38:25 +0000
@@ -0,0 +1,4 @@
+This is not an xpm file. {
+"",
+Really, it's not?
+}
\ No newline at end of file

=== added file 'src/webcatalog/tests/test_data/mini-gsmc.xpm'
--- src/webcatalog/tests/test_data/mini-gsmc.xpm	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/mini-gsmc.xpm	2011-07-01 15:38:25 +0000
@@ -0,0 +1,23 @@
+/* XPM */
+static char * mini-mix_xpm[] = {
+"16 16 4 1",
+" 	c None s None",
+".	c black",
+"r	c red",
+"y	c green",
+"      ....      ",
+"    .. r  ..    ",
+"   .   r    .   ",
+"  .    r     .  ",
+" .      r ... . ",
+" .      .ryyy.. ",
+".       .yryyy..",
+".      .yyyrryy.",
+".............rrr",
+".      .yyyrryy.",
+" .      .yryyy. ",
+" .       ryyy.. ",
+"  .     r ....  ",
+"   .   r    .   ",
+"    .. r  ..    ",
+"      ....      "};

=== added file 'src/webcatalog/tests/test_utilities.py'
--- src/webcatalog/tests/test_utilities.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_utilities.py	2011-07-01 15:38:25 +0000
@@ -0,0 +1,35 @@
+import os
+
+from webcatalog.tests.factory import TestCaseWithFactory
+from webcatalog.utilities import create_png_from_file
+
+class CreatePNGFromFileTestCase(TestCaseWithFactory):
+    def test_file_conversion(self):
+        filenames = [
+            self.factory.get_test_path('firefox.xpm'), # Regular xpm
+            self.factory.get_test_path('mini-gsmc.xpm'), # named colors
+            self.factory.get_test_path('access.svg'), # SVG file
+        ]
+        pngpath = 'test_file_DELETEME.png'
+        for f in filenames:
+            try:
+                self.assertTrue(create_png_from_file(pngpath, f, 32, 32))
+                self.assertTrue(os.path.exists(pngpath))
+            finally:
+                if os.path.exists(pngpath):
+                    os.unlink(pngpath)
+
+    def test_invalid_files(self):
+        filenames = [
+            self.factory.get_test_path('junk.xpm'),
+            self.factory.get_test_path('empty.xpm'),
+            self.factory.get_test_path('junk.svg'),
+        ]
+        pngpath = 'test_file_DELETEME.png'
+        for f in filenames:
+            try:
+                self.assertFalse(create_png_from_file(pngpath, f, 32, 32))
+                self.assertFalse(os.path.exists(pngpath))
+            finally:
+                if os.path.exists(pngpath):
+                    os.unlink(pngpath)

=== modified file 'src/webcatalog/utilities.py'
--- src/webcatalog/utilities.py	2011-06-29 14:52:33 +0000
+++ src/webcatalog/utilities.py	2011-07-01 15:38:25 +0000
@@ -184,3 +184,14 @@
             return True
 
         return False
+
+
+def create_png_from_file(target_path, source_file, width, height):
+    import gtk
+    from glib import GError
+    try:
+        pix = gtk.gdk.pixbuf_new_from_file_at_size(source_file, width, height)
+        pix.save(target_path, "png")
+        return True
+    except GError:
+        return False

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2011-06-29 14:27:13 +0000
+++ src/webcatalog/views.py	2011-07-01 15:38:25 +0000
@@ -68,6 +68,7 @@
             ors = [Q(package_name__icontains=term) for term in terms]
             ors += [Q(name__icontains=term) for term in terms]
             apps = Application.objects.filter(reduce(operator.or_, ors))
+            apps = apps.order_by('name')
 
     crumbs = [{'name': 'Get Software', 'url': reverse('wc-index')},
               {'name': 'Search results', 'url': reverse('wc-search') + '?' +
@@ -88,6 +89,7 @@
 
 def index(request):
     depts = Department.objects.filter(parent=None).order_by('name')
+    depts = depts.order_by('name')
     context = RequestContext(request, dict={'depts': depts})
     return render_to_response('webcatalog/index.html',
         context_instance=context)
@@ -96,7 +98,9 @@
 def department_overview(request, dept_id):
     dept = get_object_or_404(Department, pk=dept_id)
     subdepts = Department.objects.filter(parent=dept)
+    subdepts = subdepts.order_by('name')
     apps = Application.objects.filter(departments=dept)
+    apps = apps.order_by('name')
     paginator = Paginator(apps, settings.PAGE_BATCH_SIZE)
     page_num = _get_page_num_from_request(request, paginator)