Merge lp:~canonical-isd-hackers/ubuntu-webcatalog/useragent_778562_patched_browsers into lp:ubuntu-webcatalog

[Danny Tamez]

Adds support for patched browsers that actually give us the distro.

Adds support for patched browsers that actually give us the distro.

[lp:~canonical-isd-hackers/ubuntu-webcatalog/useragent_778562_patched_browsers]

28. By Danny Tamez on 2011-06-28

Fixed typo

[Anthony Lenton (elachuni)]

review: Approve

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2011-06-28 15:03:12 +0000
+++ src/webcatalog/tests/test_views.py	2011-06-28 18:33:31 +0000
@@ -169,6 +169,25 @@
 
         self.assertNotContains(response, 'Purchase %s' % app.name)
 
+    def test_button_for_non_guessed_match(self):
+        ua = 'blah X11; Linux Ubuntu/11.04 blah blah'
+        response, app = self.get_app_and_response(useragent=ua,
+                                                  for_purchase=True)
+
+        self.assertContains(response, 'Purchase %s' % app.name)
+        self.assertNotContains(response, 'Install %s' % app.name)
+        self.assertNotContains(response, 'Not running %s?' %
+                            settings.DEFAULT_DISTRO)
+
+    def test_button_for_non_guessed_non_match(self):
+        ua = 'blah X11; Linux Ubuntu/11.10 blah blah'
+        response, app = self.get_app_and_response(useragent=ua,
+                                                  for_purchase=True)
+
+        self.assertContains(response, 'Not available for your version of'
+                            ' Ubuntu')
+        self.assertNotContains(response, 'Not running %s?' %
+                            settings.DEFAULT_DISTRO)
 
 
 class SearchTestCase(TestCaseWithFactory):
@@ -277,7 +296,6 @@
         self.assertEqual(1, page.number)
 
 
-
 class OverviewTestCase(TestCaseWithFactory):
     def test_index_contains_links_to_departments(self):
         dept = self.factory.make_department('foo')

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2011-06-28 15:03:12 +0000
+++ src/webcatalog/views.py	2011-06-28 18:33:31 +0000
@@ -158,17 +158,31 @@
 
 
 def get_user_os(request):
+    distros = {
+        '10.04': 'lucid',
+        '10.10': 'maverick',
+        '11.04': 'natty',
+        '11.10': 'oneiric',
+    }
     os = {'is_linux': False, 'distro': 'unknown', 'arch': 'unknown'}
     try:
         ua = request.META['HTTP_USER_AGENT']
     except KeyError:
         return os
     os['is_linux'] = ua.find('X11; Linux') > -1
-    # Until we can figure out a way to actually get the distro we'll
-    # assume a default distro
     if os['is_linux']:
         os['distro'] = settings.DEFAULT_DISTRO
         os['distro_is_a_guess'] = True
+        # Some browsers will have a patch that will actually give us the distro
+        if ua.find('buntu') > -1:
+            os['distro_is_a_guess'] = False
+            slash = ua.find('/', ua.find('buntu'))
+            if slash > -1:
+                version = ua[slash + 1: slash + 6]
+                distro = distros[version]
+                if distro:
+                    os['distro'] = distro
+                    os['distro_is_a_guess'] = False
     else:
         os['distro'] = ''
         os['distro_is_a_guess'] = False