Merge lp:~davidc3/unity-scope-openweathermap/less-random-previews into lp:unity-scope-openweathermap

[David Callé]

Tag results with a random int to pick a Flickr photo for each result instead of doing it for each preview generation

Tag results with a random int to pick a Flickr photo for each result instead of doing it for each preview generation

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/unity-scope-openweathermap-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openweathermap-raring-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openweathermap-ci/1/rebuild

review: Approve (continuous-integration)

[lp:~davidc3/unity-scope-openweathermap/less-random-previews]

24. By David Callé on 2013-04-17

Use a metadata field for the photo hint

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/unity-scope-openweathermap-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openweathermap-raring-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openweathermap-ci/2/rebuild

review: Approve (continuous-integration)

[lp:~davidc3/unity-scope-openweathermap/less-random-previews]

25. By David Callé on 2013-04-17

Don't pass variants during resultset creation

[David Callé (davidc3)]

To test the last rev, you need libunity-7.0 rev > 361

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/unity-scope-openweathermap-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-openweathermap-raring-amd64-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openweathermap-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[David Callé (davidc3)]

^ Obviously, he doesn't have it :)

[Michal Hruby (mhr3)]

+1 latest libunity should be in the PPA, so it should pass fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/openweathermap.scope.in'
--- data/openweathermap.scope.in	2013-03-22 18:18:40 +0000
+++ data/openweathermap.scope.in	2013-04-17 17:02:34 +0000
@@ -4,7 +4,7 @@
 Icon=
 _Keywords=openweathermap;weather;sky;forecast;
 RequiredMetadata=
-OptionalMetadata=min_temp[s];max_temp[s];pressure[s];humidity[s];wind_speed[s];wind_direction[s];latitude[s];longitude[s];
+OptionalMetadata=min_temp[s];max_temp[s];pressure[s];humidity[s];wind_speed[s];wind_direction[s];latitude[s];longitude[s];photo_hint[i];
 Loader=/usr/share/unity-scopes/openweathermap/unity_openweathermap_daemon.py
 RemoteContent=true
 Type=info

=== modified file 'src/unity_openweathermap_daemon.py'
--- src/unity_openweathermap_daemon.py	2013-03-26 17:54:44 +0000
+++ src/unity_openweathermap_daemon.py	2013-04-17 17:02:34 +0000
@@ -72,7 +72,10 @@
 m8 = {'id'   :'longitude',
       'type' :'s',
       'field':Unity.SchemaFieldType.OPTIONAL}
-EXTRA_METADATA = [m1, m2, m3, m4, m5, m6, m7, m8]
+m9 = {'id'   :'photo_hint',
+      'type' :'i',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+EXTRA_METADATA = [m1, m2, m3, m4, m5, m6, m7, m8, m9]
 
 def weather_search(query, s_type):
     print (query)
@@ -167,18 +170,20 @@
         return results
     if not uri or not city_id:
         return results
+    photo_hint = randrange(20)
     results.append({'uri':uri,
                     'icon':icon,
                     'title':title,
                     'comment':description,
-                    'min_temp':GLib.Variant('s', min_temp),
-                    'max_temp':GLib.Variant('s', max_temp),
-                    'pressure':GLib.Variant('s', str(pressure)),
-                    'humidity':GLib.Variant('s', str(humidity)),
-                    'wind_speed':GLib.Variant('s', str(wind_speed)),
-                    'wind_direction':GLib.Variant('s', str(wind_direction)),
-                    'latitude':GLib.Variant('s', str(latitude)),
-                    'longitude':GLib.Variant('s', str(longitude))})
+                    'min_temp':min_temp,
+                    'max_temp':max_temp,
+                    'pressure':str(pressure),
+                    'humidity':str(humidity),
+                    'wind_speed':str(wind_speed),
+                    'wind_direction':str(wind_direction),
+                    'latitude':str(latitude),
+                    'longitude':str(longitude),
+                    'photo_hint':photo_hint})
     forecast = weather_search(city_id, 'forecast')
     if not forecast or not "list" in forecast:
         return results
@@ -210,18 +215,21 @@
         except Exception as error:
             print(error)
             return results
-        results.append({'uri':uri+"#"+day_name,
+        uri += "#%s" % day_name
+        photo_hint = randrange(20)
+        results.append({'uri':uri,
                         'icon':icon,
                         'title':title,
                         'comment':description,
-                        'min_temp':GLib.Variant('s', min_temp),
-                        'max_temp':GLib.Variant('s', max_temp),
-                        'pressure':GLib.Variant('s', str(pressure)),
-                        'humidity':GLib.Variant('s', str(humidity)),
-                        'wind_speed':GLib.Variant('s', str(wind_speed)),
-                        'wind_direction':GLib.Variant('s', str(wind_direction)),
-                        'latitude':GLib.Variant('s', str(latitude)),
-                        'longitude':GLib.Variant('s', str(longitude))})
+                        'min_temp':min_temp,
+                        'max_temp':max_temp,
+                        'pressure':str(pressure),
+                        'humidity':str(humidity),
+                        'wind_speed':str(wind_speed),
+                        'wind_direction':str(wind_direction),
+                        'latitude':str(latitude),
+                        'longitude':str(longitude),
+                        'photo_hint':photo_hint})
     return results
 
 
@@ -265,7 +273,7 @@
 
 class Preview (Unity.ResultPreviewer):
 
-    def get_image(self,q, lat, lon):
+    def get_image(self,rand, q, lat, lon):
         print (lat, lon)
         flick_map={'weather-clear':'clear',
                    'weather-clear-night':'clear',
@@ -305,7 +313,7 @@
         try:
             response = urllib.request.urlopen(uri).read()
             data = json.loads(response.decode('utf-8'))
-            photo = randrange(len(data['photos']['photo']))
+            photo = min(rand, int(data['photos']['total'])-1)
             image = data['photos']['photo'][photo]['url_m']
             owner = data['photos']['photo'][photo]['ownername']
             license = license_list[int(data['photos']['photo'][photo]['license'])]
@@ -319,7 +327,8 @@
         
         preview = Unity.GenericPreview.new(self.result.title.split('\n')[0], '', None)
         preview.props.subtitle = self.result.comment.capitalize()
-        image, owner, license, link = self.get_image(self.result.icon_hint,
+        image, owner, license, link = self.get_image(self.result.metadata['photo_hint'].get_int32(),
+                                                     self.result.icon_hint,
                                                      self.result.metadata['latitude'].get_string(),
                                                      self.result.metadata['longitude'].get_string())