Merge lp:~mvo/software-center/click_url into lp:software-center/5.2

[Michael Vogt]

This small branch adds support for a "click_url" from the exhibits banner to support banners for things like the humble-bundle where we don't have packages but URLs.

[Gary Lasker (gary-lasker)]

Hi Michael, this code looks good and the test case seems good. Were you by chance able to test this in the "real world" using a banner with a click_url value from the agent? In any case, this is straightforward and seems fine and so I will set this to approved and merge it.

Many thanks!

review: Approve

[Michael Vogt (mvo)]

On Mon, Jul 09, 2012 at 10:39:20PM -0000, Gary Lasker wrote:
> Review: Approve
>
> Hi Michael, this code looks good and the test case seems good. Were you by chance able to test this in the "real world" using a banner with a click_url value from the agent? In any case, this is straightforward and seems fine and so I will set this to approved and merge it.

Thanks for the review. I don't know of a easy way. One is to see if
the staging server for software-center-agent supports it and add one
there, the other one would be to make the default exhibit have a
click_url just for testing.

Cheers,
 Michael

=== modified file 'softwarecenter/backend/scagent.py'
--- softwarecenter/backend/scagent.py	2012-05-30 14:16:11 +0000
+++ softwarecenter/backend/scagent.py	2012-07-02 17:09:21 +0000
@@ -129,6 +129,9 @@
                         exhibit.html)
                 else:
                     exhibit.title_translated = ""
+            # allow having urls to click on in a banner
+            if not hasattr(exhibit, "click_url"):
+                exhibit.click_url = ""
             # ensure to fix #1004417
             if exhibit.package_names:
                 exhibit.package_names = exhibit.package_names.strip()

=== modified file 'softwarecenter/ui/gtk3/views/catview_gtk.py'
--- softwarecenter/ui/gtk3/views/catview_gtk.py	2012-05-22 15:40:01 +0000
+++ softwarecenter/ui/gtk3/views/catview_gtk.py	2012-07-02 17:09:21 +0000
@@ -22,6 +22,7 @@
 from gi.repository import Gtk, GObject
 import logging
 import os
+import webbrowser
 import xapian
 
 from gettext import gettext as _
@@ -328,7 +329,10 @@
 
     def _on_show_exhibits(self, exhibit_banner, exhibit):
         pkgs = exhibit.package_names.split(",")
-        if len(pkgs) == 1:
+        url = exhibit.click_url
+        if url:
+            webbrowser.open_new_tab(url)
+        elif len(pkgs) == 1:
             app = Application("", pkgs[0])
             self.emit("application-activated", app)
         else:
@@ -344,10 +348,13 @@
         result = []
         # filter out those exhibits that are not available in this run
         for exhibit in exhibit_list:
-            available = all(self.db.is_pkgname_known(p) for p in
-                            exhibit.package_names.split(','))
-            if available:
+            if not exhibit.package_names:
                 result.append(exhibit)
+            else:
+                available = all(self.db.is_pkgname_known(p) for p in
+                                exhibit.package_names.split(','))
+                if available:
+                    result.append(exhibit)
 
         # its ok if result is empty, since set_exhibits() will ignore
         # empty lists

=== modified file 'softwarecenter/ui/gtk3/widgets/exhibits.py'
--- softwarecenter/ui/gtk3/widgets/exhibits.py	2012-03-19 22:05:35 +0000
+++ softwarecenter/ui/gtk3/widgets/exhibits.py	2012-07-02 17:09:21 +0000
@@ -338,9 +338,8 @@
                         int(event.x), int(event.y)):
             self.pressed = False
             return
-
         exhibit = self.exhibits[self.cursor]
-        if exhibit.package_names and self.pressed:
+        if (exhibit.package_names or exhibit.click_url) and self.pressed:
             self.emit("show-exhibits-clicked", exhibit)
         self.pressed = False
 

=== modified file 'test/gtk3/test_catview.py'
--- test/gtk3/test_catview.py	2012-06-04 16:47:05 +0000
+++ test/gtk3/test_catview.py	2012-07-02 17:09:21 +0000
@@ -326,7 +326,35 @@
         self.assertEqual(1, len(banner.exhibits))
         self.assertIs(banner.exhibits[0], exhibit)
 
-
+    def test_exhibit_with_url(self):
+        # available exhibit
+        exhibit = Mock()
+        exhibit.package_names = ''
+        exhibit.click_url = 'http://example.com'
+        exhibit.banner_url = 'banner'
+        exhibit.title_translated = ''
+
+        sca = ObjectWithSignals()
+        sca.query_exhibits = lambda: sca.emit('exhibits', sca,
+                                              [exhibit])
+
+        with patch.object(catview_gtk, 'SoftwareCenterAgent', lambda: sca):
+            # add the banners
+            self.lobby._append_banner_ads()
+            # fake click
+            alloc = self.lobby.exhibit_banner.get_allocation()
+            mock_event = Mock()
+            mock_event.x = alloc.x
+            mock_event.y = alloc.y
+            with patch.object(self.lobby.exhibit_banner, 'emit') as mock_emit:
+                self.lobby.exhibit_banner.on_button_press(None, mock_event)
+                self.lobby.exhibit_banner.on_button_release(None, mock_event)
+                mock_emit.assert_called()
+                signal_name = mock_emit.call_args[0][0]
+                call_exhibit = mock_emit.call_args[0][1]
+                self.assertEqual(signal_name, "show-exhibits-clicked")
+                self.assertEqual(call_exhibit.click_url, "http://example.com")
+        
 if __name__ == "__main__":
     #import logging
     #logging.basicConfig(level=logging.DEBUG)