Merge lp:~submarine/unity-lens-photos/unlock-remote-in-home into lp:~submarine/unity-lens-photos/libunity-7-compatible

[David Callé]

Scopes (flickr/facebook/picasa) that were previously prevented from being searched from the Dash home (12.10) are now available from it.

Scopes (flickr/facebook/picasa) that were previously prevented from being searched from the Dash home (12.10) are now available from it.

[lp:~submarine/unity-lens-photos/unlock-remote-in-home]

145. By David Callé on 2013-03-27

Comment out sources filter status detection, they are not used in the Dash anymore, but don't delete it just in case they make an unexpected comeback

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

145. By David Callé on 2013-03-27

Comment out sources filter status detection, they are not used in the Dash anymore, but don't delete it just in case they make an unexpected comeback

144. By David Callé on 2013-03-27

Unlock remote results in the Dash home

=== 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-03-27 00:46:22 +0000
@@ -92,7 +92,7 @@
         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._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)
@@ -313,18 +313,18 @@
         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 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):
@@ -368,30 +368,27 @@
             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')
 

=== modified file 'src/unity_flickr_daemon.py'
--- src/unity_flickr_daemon.py	2013-03-21 17:03:01 +0000
+++ src/unity_flickr_daemon.py	2013-03-27 00:46:22 +0000
@@ -92,7 +92,7 @@
         self._get_accounts_for_service ('flickr')
         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.props.sources.connect("notify::filtering", self.on_filtering_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
 
         self.preferences = Unity.PreferencesManager.get_default()
@@ -377,18 +377,18 @@
         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 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):
@@ -433,28 +433,25 @@
             return
         search_string = search.props.search_string.strip()
         if self._enabled:
-            if search_type is Unity.SearchType.DEFAULT:
-                print ('Flickr : new search %s' % search_string)
-                for i in range(4):
-                    if self._pending[i] is not None:
-                        self._http[i].cancel_message(self._pending[i],
-                                                    Soup.KnownStatusCode.CANCELLED)
-                    if search_string:
-                        if i > 0:
-                            args = self.query_for_cat(i, search_string, search)
-                            url = self._url_maker(args[0], args[1])
-                            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, 3])
-                    else:
-                        if i < 3:
-                            args = self.query_for_cat(i, search_string, search)
-                            url = self._url_maker(args[0], args[1])
-                            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, 2])
-            else:
-                search.emit('finished')
+            print ('Flickr : new search %s' % search_string)
+            for i in range(4):
+                if self._pending[i] is not None:
+                    self._http[i].cancel_message(self._pending[i],
+                                                Soup.KnownStatusCode.CANCELLED)
+                if search_string:
+                    if i > 0:
+                        args = self.query_for_cat(i, search_string, search)
+                        url = self._url_maker(args[0], args[1])
+                        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, 3])
+                else:
+                    if i < 3:
+                        args = self.query_for_cat(i, search_string, search)
+                        url = self._url_maker(args[0], args[1])
+                        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, 2])
         else:
             search.emit('finished')
 

=== 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-03-27 00:46:22 +0000
@@ -88,7 +88,7 @@
         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.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,18 +229,18 @@
         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 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):
@@ -280,11 +280,8 @@
 
         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')
 

=== modified file 'src/unity_shotwell_daemon.py'
--- src/unity_shotwell_daemon.py	2013-03-21 17:03:01 +0000
+++ src/unity_shotwell_daemon.py	2013-03-27 00:46:22 +0000
@@ -77,7 +77,7 @@
         self._scope = Scope (dbus_path="/com/canonical/unity/scope/photos/shotwell", id="shotwell")
         self._scope.connect ("search-changed", self.on_search_changed)
         self._scope.connect("notify::active", self.on_lens_active)
-        self._scope.connect("notify::filtering", self.on_filtering_changed)
+#        self._scope.connect("notify::filtering", self.on_filtering_changed)
         self._scope.connect('preview-uri', self.on_preview_uri)
         source_name = SOURCE
         self.last_db_change = None
@@ -123,19 +123,19 @@
     def callback(object, result, user_data):
         object.preview_result_finish(result)
 
-    def on_filtering_changed(self, *_):
-        """Update results 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._enabled = False
-                self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
-            print ("    %s enabled : %s" % (source, self._enabled))
+#    def on_filtering_changed(self, *_):
+#        """Update results 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._enabled = False
+#                self._scope.queue_search_changed(Unity.SearchType.DEFAULT)
+#            print ("    %s enabled : %s" % (source, self._enabled))
 
 
     def on_lens_active(self, *_):
@@ -154,18 +154,11 @@
         print ("Search changed to \"%s\"" % search_string)
         if self._enabled:
             date = self.check_date_filter (search)
-            if search_type is Unity.SearchType.GLOBAL:
-                if len(search_string) > 0:
-                    cats = [4]
-                    GLib.idle_add(self.update_results_model,search_string, model, cats, date, search)
-                else:
-                    search.emit('finished')
+            if search_string or date:
+                cats = [1]
             else:
-                if search_string or date:
-                    cats = [1]
-                else:
-                    cats = [0,1]
-                GLib.idle_add(self.update_results_model,search_string, model, cats, date, search)
+                cats = [0,1]
+            GLib.idle_add(self.update_results_model,search_string, model, cats, date, search)
         else:
             search.emit('finished')