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

[Mark Tully]

Add year, genre, artist and album to result's metadata. Change DEFAULT_RESULT_TYPE to PERSONAL and fix 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.

review: Approve

[James Henstridge (jamesh)]

Actually, looking closer: please update the test to verify that the metadata actually gets included in the result. It looks like it should be pretty easy to update the existing test.

review: Needs Fixing

[David Callé (davidc3)]

Currently, the metadata is not passed to the model. This needs further changes to the way we deal with add_result(). This applies to pretty much all new-API scopes with extra metadata.

[David Callé (davidc3)]

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

[James Henstridge (jamesh)]

Looks good.

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/musique-extra-metadata/+merge/154130/+edit-commit-message

review: Needs Fixing (continuous-integration)

[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/musique-extra-metadata/+merge/154130/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-03-15 09:11:48 +0000
+++ debian/control	2013-03-19 22:07:22 +0000
@@ -29,6 +29,7 @@
          unity-scopes-runner,
          gir1.2-glib-2.0,
          python3-dbus,
+Suggests: musique
 Description: Musique scope for Unity
  This package contains the "musique" scope which allows Unity
  to search datas from the "musique" media player.
 
=== modified file 'src/unity_musique_daemon.py'
--- src/unity_musique_daemon.py	2013-03-14 12:28:52 +0000
+++ src/unity_musique_daemon.py	2013-03-19 22:07:22 +0000
@@ -39,9 +39,9 @@
 PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
 PROVIDER_ICON = SVG_DIR + 'service-musique.svg'
-DEFAULT_RESULT_ICON = SVG_DIR + 'result-help.svg'
-DEFAULT_RESULT_MIMETYPE = 'text-html'
-DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
+DEFAULT_RESULT_ICON = SVG_DIR + 'result-musique.svg'
+DEFAULT_RESULT_MIMETYPE = 'taglib/mp3'
+DEFAULT_RESULT_TYPE = Unity.ResultType.PERSONAL
 MUSIQUE_DBFILE = os.getenv("HOME") + "/.local/share/data/Flavio Tordini/Musique/musique.db"
 MUSIQUE_BACKUP_DBFILE = os.getenv("HOME") + "/.local/share/data/Flavio Tordini/Musique/musiquee-scope-backup.db"
 
@@ -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"
@@ -152,6 +164,8 @@
         album = u"" if track[3] is None else str(track[3])
         mimetype = u"" if track[4] is None else str(track[4])
         albumartist = u"" if track[2] is None else str(track[2])
+        year = 0 if track[5] is None else int(track[5])
+        genre = ""
         trackname = title + u" - " + album + u" - " + artist
         if search.lower() in trackname.lower():
             albumart = get_album_art(track)
@@ -162,7 +176,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:
@@ -171,7 +189,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