Merge lp:~elachuni/ubuntu-webcatalog/fix-import-for-purchase-apps into lp:ubuntu-webcatalog

[Anthony Lenton]

Fix several issues with the import_for_purchase_apps command, and several other smaller issues.

Overview
========
Fix several issues with the import_for_purchase_apps command,
and several other smaller issues.

Details
=======
In order of appearance (in the diff):
 - Improves the Application admin screens, by allowing you to
   filter by distroseries, as well as displaying the
   distroseries for each app in the list display.
 - Adds ForPurchaseApplicationForm, used by
   import_for_purchase_apps to validate retrieved json,
   instead of validating manually.
 - Adds support for tiff icons to import_app_install_data, by
   allowing gtk2 to handle the conversion to png like we were
   doing with svg and xpm icons already.
 - Drastically improves the speed of import_app_install_data
   by prefetching all existing apps for a distroseries from
   the database, instead of querying the db for each one, and
   skipping an app's update if there's nothing to update.
 - Improves import_for_purchase_apps. The price attribute
   wasn't being imported and neither were available
   distroseries or the icon data, and apps were never being
   updated once created.
 - Provides a migration to create the 'price' field on
   for-purchase apps, that wasn't being tracked at all.
 - Removes the unique constraint on archive_id, as it's
   actually (archive_id, distroseries) that's unique.
 - Allows crumbs() to produce distroseries-specific urls, to
   display on distroseries-specific views.
 - Retouches the css for the "Install" button to make it more
   similar to USC.
 - Provides a themed 404 template.
 - Adds tests for everything.
 - Makes invalid distroseries return a 404 response in the
   department overview view.

[lp:~elachuni/ubuntu-webcatalog/fix-import-for-purchase-apps]

36. By Anthony Lenton on 2011-07-04

Two small fixes per code review.

[Ricardo Kirkner (ricardokirkner)]

LGTM. Just update the copyright date on the templates before the final approval.

review: Approve

=== modified file 'src/webcatalog/admin.py'
--- src/webcatalog/admin.py	2011-07-01 16:18:58 +0000
+++ src/webcatalog/admin.py	2011-07-04 15:54:51 +0000
@@ -35,9 +35,9 @@
 
 
 class ApplicationAdmin(admin.ModelAdmin):
-    list_display = ('package_name', 'name', 'comment')
+    list_display = ('package_name', 'name', 'comment', 'distroseries')
     search_fields = ('package_name', 'name', 'comment')
-    list_filter = ('departments',)
+    list_filter = ('distroseries', 'departments')
     exclude = ('for_purchase', 'archive_id')
 
 admin.site.register(Application, ApplicationAdmin)

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2011-06-24 07:44:24 +0000
+++ src/webcatalog/forms.py	2011-07-04 15:54:51 +0000
@@ -53,7 +53,7 @@
 
     class Meta:
         model = Application
-        exclude = ('distroseries','for_purchase', 'archive_id')
+        exclude = ('distroseries','for_purchase', 'archive_id', 'price')
 
     @classmethod
     def get_form_from_desktop_data(cls, str_data, distroseries):
@@ -85,3 +85,24 @@
                     cleaned_data[key] = instance_value or value
 
         return cleaned_data
+
+class ForPurchaseApplicationForm(forms.ModelForm):
+    class Meta:
+        model = Application
+        exclude = ('distroseries', 'section', 'popcon')
+
+    @classmethod
+    def from_json(cls, app_data, distroseries):
+        app_data = app_data.copy()
+        if 'description' in app_data:
+            tagline, _, description = app_data['description'].partition('\n')
+            app_data['comment'] = tagline
+            app_data['description'] = description
+        try:
+            instance = Application.objects.get(
+                archive_id=app_data.get('archive_id'),
+                distroseries=distroseries)
+        except Application.DoesNotExist:
+            instance = None
+
+        return cls(data=app_data, instance=instance)

=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2011-07-01 15:27:44 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2011-07-04 15:54:51 +0000
@@ -217,8 +217,9 @@
                     break
 
         if icon_path:
-            if icon_path.endswith('.xpm') or icon_path.endswith('.svg'):
-                target_path = icon_path[:-4] + '.png'
+            parts = os.path.splitext(icon_path)
+            if parts[1] in ['.xpm', '.svg', '.tiff']:
+                target_path = parts[0] + '.png'
                 if create_png_from_file(target_path, icon_path, 32, 32):
                     icon_path = target_path
             with open(icon_path, "r") as icon_file:
@@ -236,6 +237,9 @@
             self.output("Created a DistroSeries record called '{0}'.\n".format(
                     distroseries_name), 1)
 
+        prefetched_apps = dict((app.package_name, app) for app in
+            Application.objects.filter(distroseries=distroseries))
+        
         # For each package in the apt-cache, we update (or possibly
         # create) a matching db entry.
         for package in cache:
@@ -252,17 +256,20 @@
             if not app_comment:
                 app_comment = package.name
 
-            try:
-                app = Application.objects.get(
-                    package_name=package.name,
-                    distroseries=distroseries)
+            if package.name in prefetched_apps:
+                app = prefetched_apps[package.name]
+                if (app.description == candidate.description and
+                    app.section == candidate.section and
+                    app.name == app_name and
+                    app.comment == app_comment):
+                        continue
                 app.description = candidate.description
                 app.section = candidate.section
                 app.name = app_name
                 app.comment = app_comment
                 app.save()
 
-            except Application.DoesNotExist:
+            else:
                 app = Application.objects.create(
                     package_name=package.name,
                     distroseries=distroseries,

=== modified file 'src/webcatalog/management/commands/import_for_purchase_apps.py'
--- src/webcatalog/management/commands/import_for_purchase_apps.py	2011-06-17 18:12:02 +0000
+++ src/webcatalog/management/commands/import_for_purchase_apps.py	2011-07-04 15:54:51 +0000
@@ -23,13 +23,19 @@
     )
 
 import json
+import os
 import urllib
+from StringIO import StringIO
+from tempfile import mkstemp
 
 from django.conf import settings
+from django.core.files.images import ImageFile
 from django.core.management.base import BaseCommand
 
+from webcatalog.forms import ForPurchaseApplicationForm
 from webcatalog.models import (
     Application,
+    DistroSeries,
 )
 
 __metaclass__ = type
@@ -49,15 +55,49 @@
             raise Exception("Couldn't connect to server at %s" % url)
         app_list = json.loads(response.read())
         for app_data in app_list:
-            archive_id = app_data['archive_id']
-            # see if we've already imported it
-            try:
-                app = Application.objects.get(archive_id=archive_id)
-                continue
-            except Application.DoesNotExist:
-                pass
-            # not already imported - save to webcatalog
-            app = Application.from_json(app_data)
-            # mark it as for purchase since it came from sca
+            for series_name in app_data['series']:
+                distroseries, created = DistroSeries.objects.get_or_create(
+                    code_name=series_name)
+                if created:
+                    self.output(
+                        "Created a DistroSeries record called '{0}'.\n".format(
+                            series_name), 1)
+                self.import_app_from_data(app_data, distroseries)
+
+    def import_app_from_data(self, app_data, distroseries):
+        form = ForPurchaseApplicationForm.from_json(app_data, distroseries)
+        if form.is_valid():
+            app = form.save(commit=False)
+            app.distroseries = distroseries
             app.for_purchase = True
             app.save()
+            app.update_departments()
+            self.add_icon_to_app(app, data=app_data.get('icon_data', ''),
+                url=app_data.get('icon_url', ''))
+            self.output(u"{0} created.\n".format(app.name).encode('utf-8'), 1)
+
+    def add_icon_to_app(self, app, data, url):
+        if data:
+            pngfile = StringIO(data.decode('base64'))
+        else:
+            pngfile = urllib.urlopen(url)
+        try:
+            fd, filename = mkstemp(prefix=app.package_name, suffix='.png')
+            iconfile = os.fdopen(fd, 'w')
+            iconfile.write(pngfile.read())
+            iconfile.close()
+            with open(filename) as f:
+                app.icon = ImageFile(f)
+                app.save()
+        finally:
+            if os.path.exists(filename):
+                os.unlink(filename)
+
+    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()
+
+    
\ No newline at end of file

=== added file 'src/webcatalog/migrations/0004_add_price_and_make_archive_id_not_unique.py'
--- src/webcatalog/migrations/0004_add_price_and_make_archive_id_not_unique.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/migrations/0004_add_price_and_make_archive_id_not_unique.py	2011-07-04 15:54:51 +0000
@@ -0,0 +1,72 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Removing unique constraint on 'Application', fields ['archive_id']
+        db.delete_unique('webcatalog_application', ['archive_id'])
+
+        # Adding field 'Application.price'
+        db.add_column('webcatalog_application', 'price', self.gf('django.db.models.fields.DecimalField')(null=True, max_digits=7, decimal_places=2), keep_default=False)
+
+        # Adding unique constraint on 'Application', fields ['archive_id', 'distroseries']
+        db.create_unique('webcatalog_application', ['archive_id', 'distroseries_id'])
+
+
+    def backwards(self, orm):
+        
+        # Removing unique constraint on 'Application', fields ['archive_id', 'distroseries']
+        db.delete_unique('webcatalog_application', ['archive_id', 'distroseries_id'])
+
+        # Deleting field 'Application.price'
+        db.delete_column('webcatalog_application', 'price')
+
+        # Adding unique constraint on 'Application', fields ['archive_id']
+        db.create_unique('webcatalog_application', ['archive_id'])
+
+
+    models = {
+        'webcatalog.application': {
+            'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},
+            'app_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
+            'architectures': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'archive_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'null': 'True', 'blank': 'True'}),
+            'categories': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'channel': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'comment': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['webcatalog.Department']", 'symmetrical': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'distroseries': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.DistroSeries']"}),
+            'for_purchase': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'icon': ('django.db.models.fields.files.ImageField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'icon_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'package_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'popcon': ('django.db.models.fields.IntegerField', [], {}),
+            'price': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '7', 'decimal_places': '2'}),
+            'screenshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'section': ('django.db.models.fields.CharField', [], {'max_length': '32'})
+        },
+        'webcatalog.department': {
+            'Meta': {'object_name': 'Department'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['webcatalog.Department']", 'null': 'True', 'blank': 'True'})
+        },
+        'webcatalog.distroseries': {
+            'Meta': {'object_name': 'DistroSeries'},
+            'code_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '10', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['webcatalog']

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2011-07-01 16:18:58 +0000
+++ src/webcatalog/models/applications.py	2011-07-04 15:54:51 +0000
@@ -54,7 +54,7 @@
     # will potentially have a different name) and names/descriptions can
     # change for a package for different series.
     # We may need to have one application item per language, depending
-    # whether we have geettext data available that we could use at
+    # whether we have gettext data available that we could use at
     # runtime (much preferred)
     distroseries = models.ForeignKey(DistroSeries)
 
@@ -78,7 +78,9 @@
         null=True, blank=True)
     for_purchase = models.BooleanField(default=False)
     archive_id = models.CharField(max_length=64, null=True,
-         db_index=True, blank=True, unique=True)
+         db_index=True, blank=True)
+    price = models.DecimalField(max_digits=7, decimal_places=2, null=True,
+        help_text="For-purchase applications (in US Dollars).")
 
     # Other desktop fields used by s-c
     # x-gnome-fullname
@@ -104,16 +106,6 @@
         return DistroSeries.objects.filter(
             application__package_name=self.package_name).order_by('version')
 
-    @classmethod
-    def from_json(cls, data):
-        app = Application()
-        for name in app._meta.get_all_field_names():
-            try:
-                setattr(app, name, data[name])
-            except KeyError:
-                pass
-        return app
-
     def update_departments(self):
         """Update the list of departments for this app"""
         self.departments.clear()
@@ -131,7 +123,7 @@
     def crumbs(self):
         depts = self.departments.order_by('-parent')
         if depts.count():
-            crumbs = depts[0].crumbs()
+            crumbs = depts[0].crumbs(distro=self.distroseries.code_name)
         else:
             crumbs = [{'name': 'Get Software', 'url': reverse('wc-index')}]
         crumbs.append({'name': self.name, 'url': reverse('wc-package-detail',
@@ -144,6 +136,7 @@
 
     class Meta:
         app_label = 'webcatalog'
+        unique_together = ('distroseries', 'archive_id')
 
 
 class Department(models.Model):
@@ -157,13 +150,17 @@
     def normalized_name(self):
         return re.sub(r'[-&.,;" \']', '', self.name)
 
-    def crumbs(self):
+    def crumbs(self, distro=None):
         if self.parent:
-            crumbs = self.parent.crumbs()
+            crumbs = self.parent.crumbs(distro=distro)
         else:
             crumbs = [{'name': 'Get Software', 'url': reverse('wc-index')}]
-        crumbs.append({'name': self.name, 'url': reverse('wc-department',
-            args=[self.id])})
+        args = []
+        if distro is not None:
+            args = [distro]
+        args.append(self.id)
+        url =reverse('wc-department', args=args)
+        crumbs.append({'name': self.name, 'url': url})
         return crumbs
 
     class Meta:

=== modified file 'src/webcatalog/static/css/webcatalog.css'
--- src/webcatalog/static/css/webcatalog.css	2011-07-01 16:18:58 +0000
+++ src/webcatalog/static/css/webcatalog.css	2011-07-04 15:54:51 +0000
@@ -162,33 +162,21 @@
     width: 300px;
 }
 
-.awesome, .awesome:visited {
-    background-color: #222222;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.25);
-    border-radius: 5px 5px 5px 5px;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
-    cursor: pointer;
-    display: inline-block;
-    font-size: 20px;
-    font-weight: bold;
-    line-height: 1;
-    margin: 5px;
+.install-bar {
+    background: #B1CEE6;
+    border: 1px solid #639BCE;
+    height: 28px;
+    margin: 0 16px;
+    padding: 4px;
+}
+.install-bar p {
+    font-size: 14px;
     padding: 5px;
-    position: relative;
-    text-decoration: none;
-    text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25);
-}
-.awesome:hover {
-    background-color: #D45500;
-    color: #FFFFFF;
-    text-decoration: none;
-}
-.awesome:active {
-    top: 1px;
-}
-.awesome, .awesome:visited {
-    background-color: #FF5C00;
-    color: #FFFFFF;
+}
+.install-bar div.install-button {
+    float: right;
+    height: 28px;
+    line-height: 28px;
 }
 
 .dept-icon {

=== added file 'src/webcatalog/templates/404.html'
--- src/webcatalog/templates/404.html	1970-01-01 00:00:00 +0000
+++ src/webcatalog/templates/404.html	2011-07-04 15:54:51 +0000
@@ -0,0 +1,16 @@
+{% extends "light/404.html" %}
+{% load i18n %}
+
+{% comment %}
+Copyright 2010 Canonical Ltd.  This software is licensed under the
+GNU Affero General Public License version 3 (see the file  LICENSE).
+{% endcomment %}
+
+{% block content_container_extra %}
+        <div>
+          <p>
+            {% blocktrans %}(Error <abbr>ID</abbr>: {{ oopsid }}){% endblocktrans %}
+          </p>
+        </div>
+{% endblock %}
+

=== added file 'src/webcatalog/templates/light/404.html'
--- src/webcatalog/templates/light/404.html	1970-01-01 00:00:00 +0000
+++ src/webcatalog/templates/light/404.html	2011-07-04 15:54:51 +0000
@@ -0,0 +1,73 @@
+{% extends 'light/index.1col.html' %}
+
+{% block title %}Error | Ubuntu{% endblock %}
+
+{% block header %}{% endblock %}
+
+{% block head_extra %}
+        <link rel="stylesheet" type="text/css" href="{{ ASSET_ROOT }}/assets/light/css/404.css"/>
+{% endblock %}
+
+{% block content_container %}
+<div id="template-err2">
+    <div id="row-main-row" >
+        <div class="pane-content">
+            <div class="img_404">
+                <h1>404</h1>
+            </div>
+            <h2>This page does not exist.</h2>
+            <h3>Well, obviously <em>this</em> page exists. But the
+                page you requested does not exist. This page is just
+                here to tell you that the page you requested does not exist.
+            </h3>
+            {% block content_container_default %}
+            <p>You can use the search box above to find what you need.
+                Or you can make a fresh start at the
+                <a href="http://www.ubuntu.com">Ubuntu home page</a>.
+            </p>
+            <p>Still can't find what you're looking for?
+                <a href="/contact-us">Get in touch today</a>.
+            </p>
+            {% endblock %}
+        </div>
+    </div>
+    {% block content_container_extra %}{% endblock %}
+
+    <div class="clear"> </div>
+
+    <div id="row-2" class="row-wrapper-2">
+
+        <div class="grid-4 err2_pane_4" >
+            <div>
+                <h2><a href="http://www.ubuntu.com/project">About Ubuntu</a></h2>
+                <p></p>
+                <p>Find out more about the Ubuntu Project and how you can contribute.</p>
+                <p></p>
+                <p><img src="http://www.ubuntu.com/sites/default/files/active/error_page_imagery/pictogram_knowledge_medium.png" alt="pictogram_knowledge_medium" /></p>
+            </div>
+        </div>
+
+        <div class="grid-4 err2_pane_4" >
+            <div>
+                <h2><a href="http://www.ubuntu.com/desktop/get-ubuntu">Get Ubuntu</a></h2>
+                <p></p>
+                <p>Download Ubuntu today.</p>
+                <p></p>
+                <p><img src="http://www.ubuntu.com/sites/default/files/active/03_global/02_pictograms/pictogram_download_medium.png" alt="pictogram_download_medium" /></p>
+            </div>
+        </div>
+
+        <div class="grid-4 err2_pane_4" >
+            <div>
+                <h2><a href="http://shop.canonical.com">Visit the shop</a></h2>
+                <p></p>
+                <p>Buy Ubuntu CDs, accessories or training at the Canonical shop.</p>
+                <p></p>
+                <p><img src="http://www.ubuntu.com/sites/default/files/active/error_page_imagery/pictogram_shop_medium.png" alt="pictogram_shop_medium.png" /></p>
+            </div>
+        </div>
+
+        <div class="clear"> </div>
+    </div>
+</div>
+{% endblock %}

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2011-07-01 16:18:58 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2011-07-04 15:54:51 +0000
@@ -33,6 +33,10 @@
       <h2>{{ application.name }}</h2>
       <p>{{ application.comment }}</p>
     </div>
+    <div class="install-bar">
+        <div class="install-button">{% install_options application %}</div>
+        <p>{% if application.price %}US$ {{ application.price }}{% else %}Free{% endif %}</p>
+    </div>
     <div class="description">
       <div class="screenshot">
         {% comment %}
@@ -42,7 +46,6 @@
         <img src="http://screenshots.ubuntu.com/thumbnail-with-version/{{ application.package_name }}/ignored" />
       </div>
       <p>{{ application.description }}</p>
-      {% install_options application %}
     </div>
     <div class="license">
       <table>

=== modified file 'src/webcatalog/templates/webcatalog/install_options_snippet.html'
--- src/webcatalog/templates/webcatalog/install_options_snippet.html	2011-06-29 14:43:55 +0000
+++ src/webcatalog/templates/webcatalog/install_options_snippet.html	2011-07-04 15:54:51 +0000
@@ -2,14 +2,11 @@
 {% if message_text %}
   {{ message_text }}
 {% endif %}{% if display_install_button %}
-  <a href="apt://{{ application.package_name }}" class="awesome">
-    {% if application.for_purchase %}
-      Purchase {{ application.name }}
-    {% else %}
-      Install {{ application.name }}
-    {% endif %}
-  </a>
-{% endif %}{% if display_ubuntu_download %}
+  <form action="apt://{{ application.package_name }}" method="GET">
+  <input type="submit" value="{% if application.for_purchase %}Purchase{% else %}Install{% endif %} {{ application.name }}" />
+  </form>
+{% endif %}
+{% if display_ubuntu_download %}
 <a href="http://www.ubuntu.com/download" class="awesome">{% trans "Download Ubuntu" %}</a>
 {% endif %}
 

=== modified file 'src/webcatalog/templatetags/webcatalog.py'
--- src/webcatalog/templatetags/webcatalog.py	2011-06-29 15:37:50 +0000
+++ src/webcatalog/templatetags/webcatalog.py	2011-07-04 15:54:51 +0000
@@ -70,7 +70,7 @@
                 distroseries__code_name=useragent.distroseries)
             app_in_series_url = reverse(
                 'wc-package-detail',
-                args=[application.package_name, useragent.distroseries])
+                args=[useragent.distroseries, application.package_name])
             template_context['message_text'] = _(
                 '{application_name} is also available for '
                 '<a href="{app_in_series_url}">your version of '

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2011-06-30 16:38:56 +0000
+++ src/webcatalog/tests/test_commands.py	2011-07-04 15:54:51 +0000
@@ -367,6 +367,7 @@
     def setUp(self):
         curdir = os.path.dirname(__file__)
         sca_apps_file = os.path.join(curdir, 'test_data', 'sca_apps.txt')
+        self.distroseries = DistroSeries.objects.create(code_name='natty')
         with open(sca_apps_file) as content:
             self.response_content = content.read()
         mock_response = Mock()
@@ -381,7 +382,8 @@
         apps_for_purchase = Application.objects.filter(for_purchase=True)
         self.assertEqual(0, len(apps_for_purchase))
         call_command('import_for_purchase_apps')
-        app_for_purchase = Application.objects.get(name='MyApp')
+        app_for_purchase = Application.objects.get(name='MyApp',
+            distroseries=self.distroseries)
         self.assertEqual(True, app_for_purchase.for_purchase)
         self.assertTrue(app_for_purchase.description.find('hello') > -1)
 
@@ -399,3 +401,38 @@
         self.assertTrue(second > first)
         # number of apps should not increase
         self.assertEqual(second, third)
+
+    @patch('urllib.urlopen')
+    def test_app_gets_distroseries(self, mock_urllib):
+        mock_urllib.return_value = self.mock_response
+        call_command('import_for_purchase_apps')
+        app = Application.objects.get(name='MyApp',
+            distroseries=self.distroseries)
+        self.assertEqual(2, len(app.available_distroseries()))
+
+    @patch('urllib.urlopen')
+    def test_app_gets_price(self, mock_urllib):
+        mock_urllib.return_value = self.mock_response
+        call_command('import_for_purchase_apps')
+        app = Application.objects.get(name='MyApp',
+            distroseries=self.distroseries)
+        self.assertEqual(2.50, app.price)
+
+    @patch('urllib.urlopen')
+    def test_app_gets_updated(self, mock_urllib):
+        mock_urllib.return_value = self.mock_response
+        call_command('import_for_purchase_apps')
+        updated = self.response_content.replace('hello', 'bye')
+        self.mock_response.read.return_value = updated
+        call_command('import_for_purchase_apps')
+        app = Application.objects.get(name='MyApp',
+            distroseries=self.distroseries)
+        self.assertEqual('bye', app.package_name)
+
+    @patch('urllib.urlopen')
+    def test_app_gets_icon(self, mock_urllib):
+        mock_urllib.return_value = self.mock_response
+        call_command('import_for_purchase_apps')
+        app = Application.objects.get(name='MyApp',
+            distroseries=self.distroseries)
+        self.assertEqual(6461, app.icon.size)

=== modified file 'src/webcatalog/tests/test_data/sca_apps.txt'
--- src/webcatalog/tests/test_data/sca_apps.txt	2011-06-17 21:27:33 +0000
+++ src/webcatalog/tests/test_data/sca_apps.txt	2011-07-04 15:54:51 +0000
@@ -4,14 +4,14 @@
         "signing_key_id": "",
         "description": "MyAppTagline\nThe classic greeting, and a good example\r\n The GNU hello program produces a familiar, friendly greeting.  It\r\n allows non-programmers to use a classic computer science tool which\r\n would otherwise be unavailable to them.\r\n .\r\n Seriously, though: this is an example of how to do a Debian package.\r\n It is the Debian version of the GNU Project's `hello world' program\r\n (which is itself an example for the GNU Project).",
         "package_name": "hello",
-        "series": {},
-        "price": "1",
+        "series": {"maverick": ["i386", "amd64"], "natty": ["i386", "amd64"]},
+        "price": "2.50",
         "archive_id": "launchpad_zematynnad2/myppa",
         "icon_data": "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",
         "screenshot_url": "",
         "archive_root": "",
         "tos_url": "",
-        "icon_url": "http://localhost:8000/site_media/icons/2011/06/eg_64x64_______.png",
+        "icon_url": "http://localhost:8000/site_media/icons/2011/06/eg_64x64.png",
         "categories": "Audio",
         "name": "MyApp"
     }

=== modified file 'src/webcatalog/tests/test_models.py'
--- src/webcatalog/tests/test_models.py	2011-06-28 15:03:12 +0000
+++ src/webcatalog/tests/test_models.py	2011-07-04 15:54:51 +0000
@@ -76,7 +76,7 @@
         dept = app.departments.get()
         expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
             {'name': dept.name, 'url': reverse('wc-department',
-                args=[dept.id])},
+                args=[app.distroseries.code_name, dept.id])},
             {'name': app.name, 'url': reverse('wc-package-detail',
                 args=[app.distroseries.code_name, app.package_name])}]
 
@@ -89,16 +89,16 @@
         dept = app.departments.get()
         expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
             {'name': dept.parent.name, 'url': reverse('wc-department',
-                args=[dept.parent.id])},
+                args=[app.distroseries.code_name, dept.parent.id])},
             {'name': dept.name, 'url': reverse('wc-department',
-                args=[dept.id])},
+                args=[app.distroseries.code_name, dept.id])},
             {'name': app.name, 'url': reverse('wc-package-detail',
                 args=[app.distroseries.code_name, app.package_name])}]
 
         self.assertEquals(expected, app.crumbs())
 
 
-def DepartmentTestCse(TestCaseWithFactory):
+def DepartmentTestCase(TestCaseWithFactory):
     def test_normalized_name(self):
         cases = {
             'Foo': 'Foo',
@@ -129,3 +129,14 @@
                 args=[dept.id])}]
 
         self.assertEquals(expected, dept.crumbs())
+
+    def test_crumbs_with_distroseries(self):
+        parent = self.factory.make_department('Foo')
+        dept = self.factory.make_department('Bar', parent=parent)
+        expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
+            {'name': dept.parent.name, 'url': reverse('wc-department',
+                args=['frobbly', dept.parent.id])},
+            {'name': dept.name, 'url': reverse('wc-department',
+                args=['frobbly', dept.id])}]
+
+        self.assertEquals(expected, dept.crumbs(distro='frobbly'))

=== modified file 'src/webcatalog/tests/test_templatetags.py'
--- src/webcatalog/tests/test_templatetags.py	2011-06-29 14:09:36 +0000
+++ src/webcatalog/tests/test_templatetags.py	2011-07-04 15:54:51 +0000
@@ -94,7 +94,7 @@
         context = Context(
             dict(user_agent=self.make_useragent(ubuntu_version='10.04')))
 
-        lucid_app_url = reverse('wc-package-detail', args=['pkgfoo', 'lucid'])
+        lucid_app_url = reverse('wc-package-detail', args=['lucid', 'pkgfoo'])
         self.assertEqual(dict(
             application=natty_application, display_install_button=False,
             message_text='Package Foo is also available for '

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-07-01 17:04:53 +0000
+++ src/webcatalog/tests/test_views.py	2011-07-04 15:54:51 +0000
@@ -103,7 +103,7 @@
     def test_link_to_apt_package(self):
         response, app = self.get_app_and_response()
 
-        self.assertContains(response, '<a href="apt://pkgfoo"')
+        self.assertContains(response, 'action="apt://pkgfoo"')
 
     def test_button_for_non_puchase_app(self):
         response, app = self.get_app_and_response()
@@ -129,7 +129,7 @@
         response, app = self.get_app_and_response(name="<a>Escape me",
             useragent="blah Ubuntu/10.04 blah")
 
-        lucid_app_url = reverse('wc-package-detail', args=['pkgfoo', 'lucid'])
+        lucid_app_url = reverse('wc-package-detail', args=['lucid', 'pkgfoo'])
         self.assertContains(response,
             '&lt;a&gt;Escape me is also available for '
             '<a href="{lucid_app_url}">your version of Ubuntu</a>.'.format(
@@ -313,9 +313,10 @@
     def test_department_contains_links_to_subdepartments(self):
         dept = self.factory.make_department('foo')
         subdept = self.factory.make_department('bar', parent=dept)
+        distro = self.factory.make_distroseries(code_name='lucid')
 
         response = self.client.get(reverse('wc-department', args=[
-            settings.DEFAULT_DISTRO, dept.id]))
+            'lucid', dept.id]))
 
         self.assertContains(response, reverse('wc-department',
             args=[subdept.id]))
@@ -333,9 +334,10 @@
 
     def test_department_with_no_subdepts_doesnt_contain_header(self):
         dept = self.factory.make_department('bar')
+        distro = self.factory.make_distroseries(code_name='lucid')
 
         response = self.client.get(reverse('wc-department', args=[
-            settings.DEFAULT_DISTRO, dept.id]))
+            'lucid', dept.id]))
 
         self.assertNotContains(response, 'Subsections')
 
@@ -361,7 +363,8 @@
 
     def test_invalid_page_doesnt_error(self):
         dept = self.factory.make_department('bar')
-        url = reverse('wc-department', args=[settings.DEFAULT_DISTRO, dept.id])
+        distro = self.factory.make_distroseries(code_name='lucid')
+        url = reverse('wc-department', args=['lucid', dept.id])
         response = self.client.get(url, data={'page': 'aef8'})
         page = response.context['page']
         self.assertEqual(1, page.number)
@@ -376,6 +379,8 @@
 
     def test_department_includes_right_navigation(self):
         dept = self.factory.make_department('bar')
+        default = self.factory.make_distroseries(
+            code_name=settings.DEFAULT_DISTRO, version='11.04')
         lucid = self.factory.make_distroseries(code_name='lucid',
             version='10.04')
         maverick = self.factory.make_distroseries(code_name='maverick',
@@ -388,3 +393,10 @@
             url = reverse('wc-department', args=[ds, dept.id])
             self.assertContains(response, '<a href="{0}">Ubuntu'.format(url))
 
+    def test_invalid_distroseries_returns_404(self):
+        dept = self.factory.make_department('bar')
+
+        response = self.client.get(reverse('wc-department', args=[
+            'amnesiac', dept.id]))
+
+        self.assertEqual(404, response.status_code)
\ No newline at end of file

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2011-07-01 16:18:58 +0000
+++ src/webcatalog/views.py	2011-07-04 15:54:51 +0000
@@ -108,6 +108,9 @@
         return HttpResponseRedirect(
             reverse('wc-department', args=[distro, dept_id]))
 
+    # Attempt to retrieve the DistroSeries to ensure that it actually exists
+    get_object_or_404(DistroSeries, code_name=distro)
+
     dept = get_object_or_404(Department, pk=dept_id)
     subdepts = Department.objects.filter(parent=dept)
     subdepts = subdepts.order_by('name')