Merge lp:~chipaca/unity-lens-video/soupify into lp:unity-lens-video/remote-videos-scope-trunk

[John Lenton]

Change from urllib2 to libsoup for the HTTP work.

Change from urllib2 to libsoup for the HTTP work.

[David Callé (davidc3)]

review: Approve

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-02-22 00:07:06 +0000
+++ src/unity-scope-video-remote	2012-02-22 14:38:26 +0000
@@ -21,7 +21,6 @@
 import json
 import sys
 import urllib
-import urllib2
 import time
 
 #pylint: disable=E0611
@@ -38,6 +37,8 @@
     GObject,
     Gio,
     Unity,
+    Soup,
+    SoupGNOME,
 )
 #pylint: enable=E0611
 
@@ -61,24 +62,21 @@
         self.scope.props.sources.connect("notify::filtering",
             self.on_filtering_changed)
         self.scope.connect ("activate-uri", self.on_activate_uri)
+        self.session = Soup.SessionSync()
+        self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
         self.query_list_of_sources()
         self.scope.export()
 
     def query_list_of_sources(self):
         """Query the server for a list of sources that will be used
         to build sources filter options and search queries."""
-        try:
-            self.sources_list = json.load(urllib2.urlopen("%s/sources"
-                                                          % (SERVER,)))
-            print "Got a list of sources from the server."
-        except (IOError,
-                KeyError,
-                urllib2.URLError,
-                urllib2.HTTPError,
-                ValueError):
+        msg = Soup.Message.new("GET", SERVER + "/sources")
+        if self.session.send_message(msg) != 200:
             self.sources_list = []
             print "Error: Unable to query the server for a list of sources"
+            print "       %d: %s" % (msg.status_code, msg.reason_phrase)
         else:
+            self.sources_list = json.loads(msg.response_body.data)
             for n, source in enumerate(self.sources_list):
                 self.scope.props.sources.add_option(str(n), source, None)
 
@@ -140,21 +138,19 @@
 
     def get_results(self, search, sources):
         """Query the server with the search string and the list of sources."""
-        try:
-            query = dict(q=search)
-            if sources:
-                query['sources'] = sources
-            query = urllib.urlencode(query)
-            url = "%s/search?%s" % (SERVER, query)
-            print "Querying the server:", url
-            return json.load(urllib2.urlopen(url))
-        except (IOError,
-                KeyError,
-                urllib2.URLError,
-                urllib2.HTTPError,
-                ValueError):
+        query = dict(q=search)
+        if sources:
+            query['sources'] = sources
+        query = urllib.urlencode(query)
+        url = "%s/search?%s" % (SERVER, query)
+        print "Querying the server:", url
+        msg = Soup.Message.new("GET", url)
+        if self.session.send_message(msg) != 200:
             print "Error: Unable to get results from the server"
+            print "       %d: %s" % (msg.status_code, msg.reason_phrase)
             return []
+        else:
+            return json.loads(msg.response_body.data)
 
     def on_activate_uri (self, scope, rawuri):
         """On item clicked, parse the custom uri items"""