Merge lp:~mhr3/unity-lens-video/fix-1058097 into lp:unity-lens-video/remote-videos-scope-trunk

[Michal Hruby]

Refresh online results periodically, not on every view switch

The online videos category in dash flickers every time user switches from a different lens to video lens. This is caused by unnecessary refresh of the results, which causes their removal and re-adding.

[David Callé (davidc3)]

Works fine for me, but I think you a word in the comment.

review: Approve

[Paweł Stołowski (stolowski)]

The change indeed improves results for online videos. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/unity-scope-video-remote-mbs-autolanding/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-scope-video-remote-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/unity-scope-video-remote-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/1/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The automerge job was migrated to an updated system. It found this outstanding MP, but failed due to a configuration issue on the automerge host. Closer inspection reveals that this MP has already been merged to trunk and is no longer valid.

=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-09-26 13:12:05 +0000
+++ src/unity-scope-video-remote	2012-09-28 13:07:25 +0000
@@ -82,12 +82,12 @@
         self.scope = Unity.Scope.new("/net/launchpad/scope/remotevideos")
         self.scope.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
-        self.scope.connect("notify::active", self.on_lens_active)
         self.scope.connect("filters-changed", self.on_filtering_or_preference_changed)
         self.scope.props.sources.connect("notify::filtering",
             self.on_filtering_or_preference_changed)
-        self.scope.connect ("activate-uri", self.on_activate_uri)
-        self.scope.connect('preview-uri', self.on_preview_uri)
+        self.scope.connect("activate-uri", self.on_activate_uri)
+        self.scope.connect("preview-uri", self.on_preview_uri)
+        self.scope.connect("generate-search-key", lambda scope, search: search.props.search_string.strip())
         self.session = Soup.SessionAsync()
         self.session.props.user_agent = "Unity Video Lens Remote Scope v0.4"
         self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
@@ -96,6 +96,8 @@
         self.preferences = Unity.PreferencesManager.get_default()
         self.preferences.connect("notify::remote-content-search", self.on_filtering_or_preference_changed)
         self.scope.export()
+        # refresh the at least once every 30 minutes
+        GLib.timeout_add_seconds(REFRESH_INTERVAL/2, self.refresh_online_videos)
 
     def update_recommendations(self):
         """Query the server for 'recommendations'.
@@ -153,10 +155,10 @@
         """Run another search when a filter or preference change is notified."""
         self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
 
-    def on_lens_active(self, *_):
-        """ Run a search when the lens is opened """
-        if self.scope.props.active:
-            self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+    def refresh_online_videos(self, *_):
+        """ Periodically refresh the results """
+        self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+        return True
 
     def source_activated(self, source):
         """Return the state of a sources filter option."""