Merge lp:~michael.nelson/ubuntu-webcatalog/1180770-handle-incorrect-desktop-files into lp:ubuntu-webcatalog

[Michael Nelson]

Invalid desktop files are handled (skipped) rather than erroring.

Invalid desktop files are handled (skipped) rather than erroring.

See the linked bug for a description of the problem.

`fab test`

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'src/webcatalog/forms.py'
--- src/webcatalog/forms.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/forms.py	2013-05-21 12:28:08 +0000
@@ -21,7 +21,10 @@
 
 import apt
 import json
-from ConfigParser import ConfigParser
+from ConfigParser import (
+    ConfigParser,
+    ParsingError,
+)
 from StringIO import StringIO
 
 from django import forms
@@ -64,7 +67,11 @@
     @classmethod
     def get_form_from_desktop_data(cls, str_data, distroseries):
         parser = ConfigParser()
-        parser.readfp(StringIO(str_data))
+        try:
+            parser.readfp(StringIO(str_data))
+        except ParsingError:
+            return cls(data={}, instance=None)
+
         data = dict(parser.items('Desktop Entry'))
         for desktop_key, app_key in desktop_field_mappings.items():
             if desktop_key in data:
 
=== added file 'src/webcatalog/tests/test_data/workrave:workrave.desktop'
--- src/webcatalog/tests/test_data/workrave:workrave.desktop	1970-01-01 00:00:00 +0000
+++ src/webcatalog/tests/test_data/workrave:workrave.desktop	2013-05-21 12:28:08 +0000
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Categories=Application;Other
+X-AppInstall-Package=workrave
+X-AppInstall-Popcon=500
+X-AppInstall-Section=universe
+
+Type=Application
+Categories=Utility;GTK;Accessibility
+Exec=workrave
+Icon=workrave
+Comment=Assists in the prevention and recovery of Repetitive Strain Injury (RSI)
+- RSI (Repetitive Strain Injury) oraz wspomaga rekonwalescencję
+ запястья и снятии общего мышечного напряжения.
+Name=Workrave
+
+X-Ubuntu-Gettext-Domain=app-install-data
 
=== modified file 'src/webcatalog/tests/test_forms.py'
--- src/webcatalog/tests/test_forms.py	2012-07-02 21:25:30 +0000
+++ src/webcatalog/tests/test_forms.py	2013-05-21 12:28:08 +0000
@@ -19,6 +19,8 @@
 
 from __future__ import absolute_import
 
+import os
+
 from django.forms import ValidationError
 from django.test import TestCase
 
@@ -108,6 +110,20 @@
         self.assertTrue(form.is_valid())
         self.assertEqual('MyPkg description', form.cleaned_data['description'])
 
+    def test_get_form_from_desktop_data_bad_data(self):
+        """Don't panic if we can't parse the desktop file."""
+        app = self.factory.make_application(package_name='workrave')
+        curdir = os.path.dirname(__file__)
+        desktop_file_path = os.path.join(curdir, 'test_data',
+                                         'workrave:workrave.desktop')
+        with open(desktop_file_path, 'r') as desktop_file:
+            data = desktop_file.read()
+
+        form = ArchiveApplicationForm.get_form_from_desktop_data(
+            data, distroseries=app.distroseries)
+
+        self.assertFalse(form.is_valid())
+
     def test_extra_fields(self):
         # There are a bunch of extra fields which are also supported by
         # the model form.