Merge lp:~submarine/ubuntu-scopes/guayadeque-extra-metadata into lp:~submarine/ubuntu-scopes/guayadeque

[Mark Tully]

Added year, genre, artist and album to result's metadata.

Also changing DEFAULT_RESULT_TYPE to PERSONAL & fixing other variables

Added year, genre, artist and album to result's metadata.

Also changing DEFAULT_RESULT_TYPE to PERSONAL & fixing other variables

[David Callé (davidc3)]

+1

[James Henstridge (jamesh)]

Looks good. You don't need to use the u"" syntax for text strings in Python 3 though, which would be good to keep in mind.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~submarine/ubuntu-scopes/guayadeque-extra-metadata/+merge/154133/+edit-commit-message

review: Needs Fixing (continuous-integration)

[David Callé (davidc3)]

Fixed commit message.

[James Henstridge (jamesh)]

On further inspection, I'd like you to update the test suite to show that this new data makes it into the results from the scope.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-guayadeque-autolanding/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/submarine-ubuntu-scopes-guayadeque-raring-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

[David Callé (davidc3)]

Extra metadata needs testing, this will be added in another merge to fix https://bugs.launchpad.net/ubuntu-scopes/+bug/1157674

[James Henstridge (jamesh)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-03-19 22:08:23 +0000
@@ -0,0 +1,1 @@
+./tests/data/Collection/guayadeque-scope-backup.db

=== modified file 'debian/control'
--- debian/control	2013-03-15 09:12:13 +0000
+++ debian/control	2013-03-19 22:08:23 +0000
@@ -29,6 +29,7 @@
          gir1.2-dee-1.0,
          unity-scopes-runner,
          gir1.2-glib-2.0
+Suggests: guayadeque
 Description: Guayadeque scope for Unity
  This package contains the "guayadeque" scope which allows Unity
  to search for guayadeque content.

=== modified file 'src/unity_guayadeque_daemon.py'
--- src/unity_guayadeque_daemon.py	2013-03-14 12:28:29 +0000
+++ src/unity_guayadeque_daemon.py	2013-03-19 22:08:23 +0000
@@ -39,10 +39,10 @@
 NO_RESULTS_HINT = _('Sorry, there are no Guayadeque results that match your search.')
 PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
-PROVIDER_ICON = SVG_DIR + 'service-yelp.svg'
+PROVIDER_ICON = SVG_DIR + 'service-guayadeque.svg'
 DEFAULT_RESULT_ICON = SVG_DIR + 'result-guayadeque.svg'
-DEFAULT_RESULT_MIMETYPE = 'x-scheme-handler/man'
-DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
+DEFAULT_RESULT_MIMETYPE = 'taglib/mp3'
+DEFAULT_RESULT_TYPE = Unity.ResultType.PERSONAL
 GUAYADEQUE_DBFILE = os.getenv("HOME") + "/.guayadeque/Collections"
 
 c1 = {'id': 'songs',
@@ -57,7 +57,19 @@
 
 FILTERS = []
 
-EXTRA_METADATA = []
+m1 = {'id'   :'album',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+m2 = {'id'   :'artist',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+m3 = {'id'   :'genre',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+m4 = {'id'   :'year',
+      'type' :'i',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+EXTRA_METADATA = [m1, m2, m3, m4]
 
 REFRESH_TIMEOUT = 300
 PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer"
@@ -146,6 +158,8 @@
         album = u"" if track[3] is None else track[4]
         mimetype = u"" if track[4] is None else track[5]
         albumartist = u"" if track[5] is None else track[6]
+        year = 0 if track[8] is None else track[8]
+        genre = u"" if track[9] is None else track[9]
         trackname = title + u" - " + album + u" - " + artist
         if search.lower() in trackname.lower():
             try:
@@ -159,7 +173,11 @@
                                 'category': 0,
                                 'mimetype': mimetype,
                                 'title': title,
-                                'comment': artist})
+                                'comment': artist,
+                                'album':GLib.Variant('s', album),
+                                'artist':GLib.Variant('s', artist),
+                                'genre':GLib.Variant('s', genre),
+                                'year':GLib.Variant('i', year)})
                 trackresults.append(track)
 
             if album not in albumresults:
@@ -168,7 +186,11 @@
                                 'category': 1,
                                 'mimetype': mimetype,
                                 'title': album,
-                                'comment': artist})
+                                'comment': artist,
+                                'album':GLib.Variant('s', album),
+                                'artist':GLib.Variant('s', artist),
+                                'genre':GLib.Variant('s', genre),
+                                'year':GLib.Variant('i', year)})
                 albumresults.append(album)
     return results