Merge lp:~davidc3/unity-lens-photos/spring-cleaning into lp:~submarine/unity-lens-photos/libunity-7-compatible

[David Callé]

Fix Picasa and Facebook scopes behavior

Fix Picasa and Facebook scopes behavior.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/submarine-unity-lens-photos-libunity-7-compatible-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/submarine-unity-lens-photos-libunity-7-compatible-raring-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/submarine-unity-lens-photos-libunity-7-compatible-ci/2/rebuild

review: Approve (continuous-integration)

=== modified file 'src/unity_facebook_daemon.py'
--- src/unity_facebook_daemon.py	2013-03-21 17:03:01 +0000
+++ src/unity_facebook_daemon.py	2013-04-23 10:07:29 +0000
@@ -92,8 +92,6 @@
         self._scope.connect("search-changed", self.on_search_changed)
         self._scope.connect("notify::active", self.on_lens_active_or_preference_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
-        self._scope.props.sources.connect("notify::filtering", self.on_filtering_changed)
-
         self.preferences = Unity.PreferencesManager.get_default()
         self.preferences.connect("notify::remote-content-search", self.on_lens_active_or_preference_changed)
         filters = Unity.FilterSet.new()
@@ -313,30 +311,6 @@
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
 
-    def on_filtering_changed(self, *_):
-        """Run another search when a filter change is notified."""
-        for source in self._sources_options:
-            filtering = self._scope.props.sources.props.filtering
-            active = self._scope.props.sources.get_option(source).props.active
-            if (active and filtering) or (not active and not filtering):
-                if self._enabled:
-                    self._enabled = True
-                    self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-            else:
-                self.cancel_all_searches ()
-            print ("    %s enabled : %s" % (source, self._enabled))
-
-
-    def cancel_all_searches (self):
-        self._enabled = False
-        for i in range(len(self._pending)):
-            try:
-                self._http[i].cancel_message(self._pending[i],Soup.KnownStatusCode.CANCELLED)
-            except:
-                pass
-        self._scope.props.results_model.clear ()
-
-
     def check_date_filter(self,s):
         """Get active option for a filter name"""
         try:
@@ -352,6 +326,7 @@
     def on_search_changed (self, scope, search, search_type, cancellable):
         """Trigger a search for each category when the lens requests it"""
         self.recent_expected = False
+        
         model = search.props.results_model
         search.set_reply_hint ("no-results-hint", GLib.Variant.new_string(NO_RESULTS_HINT))
         model.clear()
@@ -368,30 +343,29 @@
             return
         search_string = search.props.search_string.strip()
         if self._enabled:
-            if search_type is Unity.SearchType.DEFAULT:
-                print ('Facebook : new search %s' % search_string)
-                date = self.check_date_filter (search)
-                i = 0
-                if search_string:
+            
+            print ('Facebook : new search %s' % search_string)
+            date = self.check_date_filter (search)
+            i = 0
+            if search_string:
 #                    for i in range(1,3):
-                    if self._pending[i] is not None:
-                        self._http[i].cancel_message(self._pending[i],
-                                                    Soup.KnownStatusCode.CANCELLED)
-                    url = self._url_maker(i, search_string, date)
-                    if url:
-                        self._pending[i] = Soup.Message.new("GET", url)
-                        self._http[i].queue_message(self._pending[i],self._search_cb,[search_string, model, i, search])
-                else:
+                if self._pending[i] is not None:
+                    self._http[i].cancel_message(self._pending[i],
+                                                Soup.KnownStatusCode.CANCELLED)
+                url = self._url_maker(i, search_string, date)
+                if url:
+                    self._pending[i] = Soup.Message.new("GET", url)
+                    self._http[i].queue_message(self._pending[i],self._search_cb,[search_string, model, i, search])
+            else:
 #                    for i in range(3):
-                    if self._pending[i] is not None:
-                        self._http[i].cancel_message(self._pending[i],
-                                                    Soup.KnownStatusCode.CANCELLED)
-                    url = self._url_maker(i, search_string, date)
-                    if url:
-                        self._pending[i] = Soup.Message.new("GET", url)
-                        self._http[i].queue_message(self._pending[i],self._search_cb,[search_string, model, i, search])
-            else:
-                search.emit('finished')
+                if self._pending[i] is not None:
+                    self._http[i].cancel_message(self._pending[i],
+                                                Soup.KnownStatusCode.CANCELLED)
+                url = self._url_maker(i, search_string, date)
+                if url:
+                    self._pending[i] = Soup.Message.new("GET", url)
+                    self._http[i].queue_message(self._pending[i],self._search_cb,[search_string, model, i, search])
+
         else:
             search.emit('finished')
 
@@ -472,8 +446,7 @@
         """Handle async Soup callback"""
         results = self._handle_search_msg(msg, search_args[2])
         self.update_results_model(search_args[0], search_args[1], results, search_args[2], False)
-        if search_args[2] == 2:
-            search_args[3].emit('finished')
+        search_args[3].emit('finished')
 
 
     def _handle_search_msg(self, msg, cat):

=== modified file 'src/unity_picasa_daemon.py'
--- src/unity_picasa_daemon.py	2013-03-21 17:03:01 +0000
+++ src/unity_picasa_daemon.py	2013-04-23 10:07:29 +0000
@@ -41,7 +41,7 @@
 gettext.textdomain(APP_NAME)
 _ = gettext.gettext
 
-BUS_NAME = "com.canonical.Unity.Scope.Photos.picasa"
+BUS_NAME = "com.canonical.Unity.Scope.Photos.Picasa"
 CAT_MINE = _("My Photos")
 CAT_FRIENDS = _("Friends Photos")
 CAT_ONLINE = _("Online Photos")
@@ -88,7 +88,6 @@
         self._get_accounts_for_service ('google')
         self._scope.connect("search-changed", self._on_search_changed)
         self._scope.connect("notify::active", self.on_lens_active_or_preference_changed)
-        self._scope.props.sources.connect("notify::filtering", self.on_filtering_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
 
         self.preferences = Unity.PreferencesManager.get_default()
@@ -229,28 +228,6 @@
         self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
 
-    def on_filtering_changed(self, *_):
-        """Run another search when a filter change is notified."""
-        for source in self._sources_options:
-            filtering = self._scope.props.sources.props.filtering
-            active = self._scope.props.sources.get_option(source).props.active
-            if (active and filtering) or (not active and not filtering):
-                if not self._enabled:
-                    self._enabled = True
-                    self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-            else:
-                self.cancel_all_searches ()
-            print ("    %s enabled : %s" % (source, self._enabled))
-
-
-    def cancel_all_searches (self):
-        """Cancel all searches and clear the lens"""
-        self._enabled = False
-        for c in self._cancellable:
-            c.cancel ()
-        self._scope.props.results_model.clear ()
-
-
     def check_date_filter(self, s):
         """Get active option for a filter name"""
         try:
@@ -266,8 +243,8 @@
     def _on_search_changed (self, scope, search, search_type, cancellable):
         """Trigger a search for each category when the lens requests it"""
         self.recent_expected = False
-#        for c in self._cancellable:
-#            c.cancel ()
+        for c in self._cancellable:
+            c.cancel ()
         model = search.props.results_model
         search.set_reply_hint ("no-results-hint", GLib.Variant.new_string(NO_RESULTS_HINT))
         model.clear ()
@@ -277,14 +254,10 @@
         if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
             search.emit('finished')
             return
-
         search_string = search.props.search_string
         if self._enabled:
-            if search_type == Unity.SearchType.DEFAULT:
-                self.update_results_model (search_string, model, search)
-                print("Picasa : new search %s" % search_string)
-            else:
-                search.emit ('finished')
+            self.update_results_model (search_string, model, search)
+            print("Picasa : new search %s" % search_string)
         else:
             search.emit ('finished')
 
@@ -333,22 +306,14 @@
         q = GData.Query.new (search)
         fquery = GData.Query.get_query_uri (q, url)
         self._cancellable[cat] = Gio.Cancellable ()
-        self._client.query_async(None, fquery, q, GData.PicasaWebFile, self._cancellable[cat], None, None, self.get_query_async_feed, [cat, model, s])
-
-
-    def get_query_async_feed (self, service, result, catmodel):
-        """Handle query response"""
         try:
-            feed = self._client.query_finish (result)
+            feed = self._client.query(None, fquery, q, GData.PicasaWebFile, self._cancellable[cat], None, None)
         except Exception as error:
-            print(error)
+            print (error)
             feed = None
-        if feed and catmodel:
-            xml_feed = feed.get_xml ()
-            GLib.idle_add(self.parse_results, xml_feed, catmodel[0], catmodel[1], False)
-#        if catmodel:
-#            catmodel[2].emit('finished')
-
+        if feed:
+            self.parse_results (feed.get_xml(), cat, model, False)
+        s.emit('finished')
 
     def parse_results (self, results, cat, model, recent_done):
         """Parse and update results for category 0, then the others"""
@@ -387,7 +352,7 @@
                                          category=cat,
                                          mimetype="text/html",
                                          title=title,
-                                         comment=str(date)+"_ulp-date_"+album+"_ulp-album_"+photo_feed,
+                                         comment=str(date)[:11]+"_ulp-date_"+album+"_ulp-album_"+photo_feed,
                                          dnd_uri=photo_link,
                                          result_type=Unity.ResultType.PERSONAL);
             print ('Picasa : Added %i results to category %i' % (counter, cat))
@@ -406,7 +371,7 @@
             album = photo_from_feed.split('_ulp-album_')[0]
             photo_id = photo_from_feed.split('_ulp-album_')[1]
             timestamp = scope.last_result.comment.split('_ulp-date_')[0]
-            date = datetime.datetime.fromtimestamp(float(timestamp[:-3])).strftime('%d %b %Y')
+            date = datetime.datetime.fromtimestamp(float(timestamp[:-1])).strftime('%d %b %Y')
             try:
                 meta = self.getMetadataForPhoto(photo_id)
             except: