Merge lp:~verterok/unity-scope-songkick/songkick-logging into lp:unity-scope-songkick

[Guillermo Gonzalez]

Add basic logging (replace print with logging)

Add basic logging (replace print with logging)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:14
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/4/console

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

review: Needs Fixing (continuous-integration)

[lp:~verterok/unity-scope-songkick/songkick-logging]

15. By Guillermo Gonzalez on 2013-09-25

fix test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-songkick-saucy-i386-ci/5

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

review: Approve (continuous-integration)

[David Callé (davidc3)]

+1

review: Approve

=== modified file 'src/unity_songkick_daemon.py'
--- src/unity_songkick_daemon.py	2013-08-16 10:43:51 +0000
+++ src/unity_songkick_daemon.py	2013-09-25 02:59:45 +0000
@@ -20,6 +20,7 @@
 import urllib.request
 import json
 import datetime
+import logging
 
 APP_NAME = 'unity-scope-songkick'
 LOCAL_PATH = '/usr/share/locale/'
@@ -55,6 +56,7 @@
 
 EXTRA_METADATA = []
 
+logger = logging.getLogger("unity.scope.songkick")
 
 def search(search, filters):
     '''
@@ -68,12 +70,13 @@
         uri = '%s?artist_name=%s&apikey=%s' % (SEARCH_URI, search, API_KEY)
 
     try:
+        logger.debug("Request: %s", uri)
         response = urllib.request.urlopen(uri).read()
-        print(uri)
         response = response.decode('utf8')
         json_response = json.loads(response)
         result = json_response['resultsPage']['results']['event']
-    except:
+    except Exception:
+        logger.exception("Error while fetching: %r", uri)
         result = {}
     if result:
         for item in result:
@@ -194,14 +197,9 @@
                             if m['id'] == e:
                                 i['metadata'][e] = i[e]
                 i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
-                result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
-                                                  i['category'], i['result_type'],
-                                                  str(i['mimetype']), str(i['title']),
-                                                  str(i['comment']), str(i['dnd_uri']),
-                                                  i['metadata'])
-                result_set.add_result(result)
-        except Exception as error:
-            print(error)
+                result_set.add_result(**i)
+        except Exception:
+            logger.exception("Error while building result set.")
 
 
 class Scope(Unity.AbstractScope):

=== modified file 'tests/test_songkick.py'
--- tests/test_songkick.py	2013-02-14 20:14:58 +0000
+++ tests/test_songkick.py	2013-09-25 02:59:45 +0000
@@ -24,7 +24,7 @@
     def perform_query(self, query, filter_set = Unity.FilterSet.new()):
         result_set = ResultSet()
         ctx = Unity.SearchContext.create(query, 0, filter_set,
-                                         None, result_set, None)
+                                         {}, result_set, None)
         s = self.scope.create_search_for_query(ctx)
         s.run()
         return result_set