Merge lp:~lore-mattei/onehundredscopes/flickr-precise into lp:~davidc3/onehundredscopes/flickr

[Lorenzo Mattei]

[David Callé (davidc3)]

I'm merging it with a few changes. Have a look at the final diff.

review: Approve

[lp:~lore-mattei/onehundredscopes/flickr-precise]

10. By David Callé on 2012-02-29

Port to Precise. Thanks Lorenzo.

=== modified file 'debian/control'
--- debian/control	2012-01-08 15:33:20 +0000
+++ debian/control	2012-02-29 14:38:19 +0000
@@ -17,8 +17,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         gir1.2-unity-4.0,
-         gir1.2-dee-0.5,
+         gir1.2-unity-5.0,
+         gir1.2-dee-1.0,
          python-flickrapi,
          unity-lens-photo,
 Enhances: unity-lens-photo
 
=== modified file 'src/unity-scope-flickr'
--- src/unity-scope-flickr	2012-01-07 20:07:47 +0000
+++ src/unity-scope-flickr	2012-02-29 14:38:19 +0000
@@ -43,10 +43,10 @@
 	def __init__ (self):
 		self.scope = Unity.Scope.new ("/net/launchpad/scope/image/flickr")
 		self.scope.search_in_global = False
-		self.scope.connect ("notify::active-search", self.on_search_changed)
-		self.scope.connect ("filters-changed", self.on_search_changed);
-#		self.scope.connect ("notify::active", self.on_search_changed);
+		self.scope.connect ("search-changed", self.on_search_changed)
+		self.scope.connect ("filters-changed", self.on_search_changed)
 		self.scope.connect ("activate-uri", self.on_activate_uri);
+		self.scope.connect("notify::active", self.on_lens_active)
 		self.scope.export()
 
 	def on_activate_uri (self, scope, uri):
@@ -71,30 +71,42 @@
 		(token, frob) = flickr.get_token_part_one(perms='write')
 		global clicked
 		clicked = True
-
-	def get_search_string (self):
-		search = self.scope.props.active_search
-		return search.props.search_string if search else None
-
-	def on_search_changed (self, scope, param_spec=None):
-			search = self.get_search_string()
-			print "Search changed to: '%s'" % search
-			results = self.scope.props.results_model
-			results.clear()
+	
+	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 on_search_changed (self, scope, search, search_type, _):
+			search_string = search.props.search_string.strip()
+			model = search.props.results_model
+			model.clear()
+			print "Search changed to: '%s'" % search_string
+			
 			if flickr.token_cache.token:
 				has_token = True
 			else:
 				has_token = False
 				if clicked:
 					flickr.get_token_part_two((token, frob))
-			self.update_results_model (search, results, '1', has_token)
-			results.flush_revision_queue ()
+			if search_type is Unity.SearchType.DEFAULT:
+				if search_string == '':
+					print "Global view without search string : hide"
+				else:
+					self.update_results_model(search_string, model, '1', has_token)
+			if search:
+				search.finished()
 
 	def update_results_model(self, search, model, page, has_token):
 		i = ''
 		counter = 0
+		cat = 0
+		if len(search) > 0:
+			cat = 2
+		else:
+			cat = 0
 		if not has_token:
-			model.append ("connect", "goa-panel", 2,"text/html", "Authorize with Flickr", '', '')
+			model.append ("connect", "goa-panel", cat,"text/html", "Authorize with Flickr", '', '')
 		else:
 			taken_by = self.check_filters("taken_by")
 			date = self.check_filters("date")
@@ -104,15 +116,13 @@
 				comment = i[1]
 				uri = i[2]
 				icon_hint = i[3]
-				model.append (uri, icon_hint, 2,"text/html", title, comment, uri)
+				model.append (uri, icon_hint, cat,"text/html", title, comment, uri)
 			if i and counter > 49:
 				if not search:
 					search = ''
 				page = int(page)+1
-				model.append ("more__"+search+"__"+str(page), "add", 2,"text/html", "More results", '', '')
+				model.append ("more__"+search+"__"+str(page), "add", cat,"text/html", "More results", '', '')
 
-		if self.scope.props.active_search:
-			self.scope.props.active_search.emit("finished")
 
 	def check_filters(self, filter_name):
 		try: