Merge lp:~verterok/unity-scope-soundcloud/soundcloud-logging into lp:unity-scope-soundcloud/legacy

[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:34
http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-saucy-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-saucy-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-saucy-i386-ci/7/console

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

review: Needs Fixing (continuous-integration)

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

35. By Guillermo Gonzalez on 2013-09-25

fix test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-saucy-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-soundcloud-saucy-i386-ci/8

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

review: Approve (continuous-integration)

[David Callé (davidc3)]

+1

review: Approve

=== modified file 'src/unity_soundcloud_daemon.py'
--- src/unity_soundcloud_daemon.py	2013-04-26 12:48:36 +0000
+++ src/unity_soundcloud_daemon.py	2013-09-25 19:10:31 +0000
@@ -2,24 +2,25 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2013 David Callé <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Unity, UnityExtras
+from gi.repository import Unity
 from gi.repository import Gio, GLib
 import urllib.parse
 import urllib.request
 import json
 import gettext
+import logging
 
 APP_NAME = 'unity-scope-soundcloud'
 LOCAL_PATH = '/usr/share/locale/'
@@ -71,6 +72,8 @@
       'field':Unity.SchemaFieldType.OPTIONAL}
 EXTRA_METADATA = [m1, m2, m3, m4, m5, m6, m7]
 
+logger = logging.getLogger("unity.scope.soundcloud")
+
 def search(search, filters):
     '''
     Any search method returning results as a list of tuples.
@@ -90,13 +93,13 @@
         return results
     search = urllib.parse.quote(search)
     uri = "%stracks.json?consumer_key=%s&q=%s&order=hotness&limit=30" % (SEARCH_URI, API_KEY, search)
-    print(uri)
+    logger.debug("Request: %s", uri)
     data = []
     try:
         response = urllib.request.urlopen(uri).read()
         data = json.loads(response.decode('utf8'))
-    except Exception as error:
-        print(error)
+    except Exception:
+        logger.exception("Error while fetching: %r", uri)
     checks = ['permalink_url', 'artwork_url',
               'title', 'description', 'stream_url',
               'genre', 'label_name', 'license',
@@ -161,8 +164,8 @@
                 if not 'dnd_uri' in i or not i['dnd_uri'] or i['dnd_uri'] == '':
                     i['dnd_uri'] = i['uri']
                 result_set.add_result(**i)
-        except Exception as error:
-            print (error)
+        except Exception:
+            logger.exception("Error while building result set.")
 
 class Preview (Unity.ResultPreviewer):
 
@@ -222,7 +225,7 @@
         '''
         fs = Unity.FilterSet.new ()
 #        if FILTERS:
-#            
+#
         return fs
 
     def do_get_group_name (self):

=== modified file 'tests/test_soundcloud.py'
--- tests/test_soundcloud.py	2013-02-13 14:31:12 +0000
+++ tests/test_soundcloud.py	2013-09-25 19:10:31 +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