Merge lp:~michael.nelson/ubuntu-webcatalog/store-apps-per-distroseries into lp:ubuntu-webcatalog

[Michael Nelson]

[r=zematynnad][bug=777869,777454] Store apps per distroseries, update when importing and include install button.

Overview
========

This branch ensures that apps are stored per distroseries (bug 777869), and that apps are updated if they already exist in the distroseries (rather than duplicated).

I also added a very simple apt url to the details page to look like this (bug 777454):
http://people.canonical.com/~michaeln/tmp/scribus_with_apturl.png

I'll create bugs for:
 1) more sensible apt-urls (only display if correct distroseries, otherwise display "Not on this distroseries but yours..", or "only for ubuntu" etc.
 2) Rendering of xpm icons for display on browser pages.

To test:
 $ fab bootstrap
 $ fab test

[lp:~michael.nelson/ubuntu-webcatalog/store-apps-per-distroseries]

19. By Michael Nelson on 2011-05-06

Merge trunk.

[Danny Tamez (zematynnad)]

Looks good

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2011-04-13 09:28:55 +0000
+++ src/webcatalog/forms.py	2011-05-06 15:06:19 +0000
@@ -53,6 +53,7 @@
 
     class Meta:
         model = Application
+        exclude = ('distroseries',)
 
     @classmethod
     def get_form_from_desktop_data(cls, str_data):
 
=== modified file 'src/webcatalog/management/commands/import_app_install_data.py'
--- src/webcatalog/management/commands/import_app_install_data.py	2011-04-15 09:18:10 +0000
+++ src/webcatalog/management/commands/import_app_install_data.py	2011-05-06 15:06:19 +0000
@@ -33,9 +33,14 @@
 import apt
 from apt_inst import DebFile
 from django.core.files.images import ImageFile
+from django.forms.models import construct_instance
 from django.core.management.base import LabelCommand
 
 from webcatalog.forms import ApplicationForm
+from webcatalog.models import (
+    Application,
+    DistroSeries,
+    )
 
 __metaclass__ = type
 __all__ = [
@@ -55,13 +60,20 @@
             )
     verbosity = 0
 
-    def handle_label(self, distroseries,  **options):
+    def handle_label(self, distroseries_name,  **options):
         self.verbosity = int(options['verbosity'])
         data_dir = tempfile.mkdtemp()
+        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))
+
         # Download app install data when requested.
         if options['local_app_install_deb'] == '':
             deb_location = self.get_latest_app_data_for_series(
-                distroseries, working_dir=data_dir)
+                distroseries_name, working_dir=data_dir)
         else:
             deb_location = options['local_app_install_deb']
 
@@ -74,7 +86,7 @@
         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)
+            self.process_desktop_file(desktop_file, icon_dir, distroseries)
 
         shutil.rmtree(data_dir)
 
@@ -121,13 +133,26 @@
         shutil.rmtree(tmp_sources_dir)
         return uri
 
-    def process_desktop_file(self, desktop_file_path, icon_dir):
+    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)
 
         if form.is_valid():
-            app = form.save()
+            # Check if the app already exists in our DB.
+            existing_apps = Application.objects.filter(
+                package_name=form.cleaned_data['package_name'],
+                distroseries=distroseries)
+            if existing_apps.count() > 0:
+                # Force the form to update the existing application.
+                # Simply setting the forms.instance doesn't work as the
+                # form constructs its instance during is_valid, and
+                # doesn't reconstruct it to save.
+                app = construct_instance(form, existing_apps[0])
+            else:
+                app = form.save(commit=False)
+                app.distroseries = distroseries
+            app.save()
             app.update_departments()
             self.add_icon_to_app(app, icon_dir)
             if self.verbosity > 0:
 
=== modified file 'src/webcatalog/models.py'
--- src/webcatalog/models.py	2011-04-19 18:46:21 +0000
+++ src/webcatalog/models.py	2011-05-06 15:06:19 +0000
@@ -32,15 +32,27 @@
 __metaclass__ = type
 __all__ = [
     'Application',
+    'DistroSeries',
     ]
 
 
+class DistroSeries(models.Model):
+    """An Ubuntu distribution series."""
+    code_name = models.CharField(max_length=20, unique=True, db_index=True)
+    version = models.CharField(max_length=10, blank=True)
+
+    def __unicode__(self):
+        return "Ubuntu %s (%s)" % (self.code_name.capitalize(), self.version)
+
+
 class Application(models.Model):
     # We'll most likely need one of these per lang/series (as each lang
     # will potentially have a different name) and names/descriptions can
-    # change for a package for different series. Regarding the language,
-    # if we have the gettext data available, we might be able to do this
-    # at runtime instead.
+    # 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
+    # runtime (much preferred)
+    distroseries = models.ForeignKey(DistroSeries)
 
     # The following fields are extracted from app-install-data.
     package_name = models.CharField(max_length=100)
 
=== modified file 'src/webcatalog/static/css/webcatalog.css'
--- src/webcatalog/static/css/webcatalog.css	2011-04-20 19:41:44 +0000
+++ src/webcatalog/static/css/webcatalog.css	2011-05-06 15:06:19 +0000
@@ -108,6 +108,35 @@
     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;
+    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;
+}
+
 .dept-icon {
     float:left;
     width:56px;
 
=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2011-04-08 12:25:25 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2011-05-06 15:06:19 +0000
@@ -9,7 +9,7 @@
       {% if application.icon %}
           <img src="{{ application.icon.url }}"/>
       {% else %}
-      <img src="{{ STATIC_URL }}images/noicon_32.png"/>
+          <img src="{{ STATIC_URL }}images/noicon_32.png"/>
       {% endif %}
 
       <h2>{{ application.name }}</h2>
@@ -23,7 +23,8 @@
         {% endcomment %}
         <img src="http://screenshots.ubuntu.com/thumbnail-with-version/{{ application.package_name }}/ignored" />
       </div>
-      {{ application.description }}
+      <p>{{ application.description }}</p>
+<a href="apt://{{ application.package_name }}" class="awesome">Download {{ application.name }}</a>
     </div>
     <div class="license">
       <table>
 
=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2011-04-14 00:19:29 +0000
+++ src/webcatalog/tests/factory.py	2011-05-06 15:06:19 +0000
@@ -30,6 +30,7 @@
 from webcatalog.models import (
     Application,
     Department,
+    DistroSeries,
     )
 
 __metaclass__ = type
@@ -74,7 +75,8 @@
         user.save()
 
     def make_application(self, package_name=None, name=None,
-        comment=None, description=None, icon_name='', icon=None):
+        comment=None, description=None, icon_name='', icon=None,
+        distroseries=None):
         if name is None:
             name = self.get_unique_string(prefix='Readable Name')
         if package_name is None:
@@ -83,15 +85,26 @@
             comment = self.get_unique_string(prefix='comment')
         if description is None:
             description = self.get_unique_string(prefix='description')
+        if distroseries is None:
+            distroseries = self.make_distroseries()
 
         return Application.objects.create(
             package_name=package_name, name=name, comment=comment,
             description=description, popcon=999, icon=icon,
-            icon_name=icon_name)
+            icon_name=icon_name, distroseries=distroseries)
 
     def make_department(self, name, parent=None):
         return Department.objects.create(name=name, parent=parent)
 
+    def make_distroseries(self, code_name=None, version=None):
+        if code_name is None:
+            code_name = self.get_unique_string(prefix='series-')
+        if version is None:
+            version = "1.{0}".format(self.get_unique_integer)
+
+        return DistroSeries.objects.create(
+            code_name=code_name, version=version)
+
     def get_test_path(self, file_name):
         return os.path.join(
             os.path.dirname(__file__), 'test_data', file_name)
 
=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2011-04-15 09:14:36 +0000
+++ src/webcatalog/tests/test_commands.py	2011-05-06 15:06:19 +0000
@@ -97,6 +97,53 @@
             'Graphic Page Layout and Publication (Stable)',
             scribus.comment)
 
+    def test_applications_updated(self):
+        # If applications already exist for the same series, it is
+        # updated.
+        app = self.factory.make_application(package_name='scribus',
+            comment='old comment',
+            distroseries=self.factory.make_distroseries(code_name='natty'))
+
+        call_command(
+            'import_app_install_data', 'natty',
+            local_app_install_deb=self.factory.get_test_path(
+                'app-install-data-test_all.deb'),
+            verbosity=0)
+
+        app_reloaded = Application.objects.get(id=app.id)
+        self.assertEqual(
+            'Graphic Page Layout and Publication (Stable)',
+            app_reloaded.comment)
+
+    def test_same_app_different_distroseries(self):
+        # Importing the same app (package_name) as an existing app, but
+        # for a different distroseries creates a new record.
+        app = self.factory.make_application(package_name='scribus',
+            comment='old comment',
+            distroseries=self.factory.make_distroseries(code_name='natty'))
+
+        call_command(
+            'import_app_install_data', 'oneric',
+            local_app_install_deb=self.factory.get_test_path(
+                'app-install-data-test_all.deb'),
+            verbosity=0)
+
+        app_reloaded = Application.objects.get(id=app.id)
+        self.assertEqual('old comment', app_reloaded.comment)
+        self.assertEqual(
+            2, Application.objects.filter(package_name='scribus').count())
+
+    def test_distroseries_added_to_app(self):
+        call_command(
+            'import_app_install_data', 'natty',
+            local_app_install_deb=self.factory.get_test_path(
+                'app-install-data-test_all.deb'),
+            verbosity=0)
+
+        self.assertEqual(2, Application.objects.count())
+        scribus = Application.objects.get(package_name='scribus')
+        self.assertEqual('natty', scribus.distroseries.code_name)
+
     def test_icon_added_to_model(self):
         call_command(
             'import_app_install_data', 'natty',
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-04-13 15:48:31 +0000
+++ src/webcatalog/tests/test_views.py	2011-05-06 15:06:19 +0000
@@ -68,6 +68,15 @@
             response, '<img src="http://screenshots.ubuntu.com/'
                       'thumbnail-with-version/pkgfoo/ignored"')
 
+    def test_link_to_apt_package(self):
+        self.factory.make_application(package_name='pkgfoo')
+        url = reverse('wc-package-detail', args=['pkgfoo'])
+
+        response = self.client.get(url)
+
+        self.assertContains( response, '<a href="apt://pkgfoo"')
+
+
 class SearchTestCase(TestCaseWithFactory):
     def test_no_search_retrieves_no_apps(self):
         # Ensure there's some data in the DB
@@ -170,4 +179,4 @@
 
         response = self.client.get(reverse('wc-department', args=[dept.id]))
 
-        self.assertNotContains(response, 'Subsections')
 \ No newline at end of file
+        self.assertNotContains(response, 'Subsections')