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

[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

[lp:~submarine/ubuntu-scopes/audacious-extra-metadata]

28. By Mark Tully on 2013-03-19

Added Suggests: audacious to debian/control

[David Callé (davidc3)]

+1

[David Callé (davidc3)]

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

[James Henstridge (jamesh)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-03-15 09:13:16 +0000
+++ debian/control	2013-03-19 22:08:22 +0000
@@ -6,7 +6,6 @@
                python3,
                python3-distutils-extra,
                python3-gi,
-               python3-gi,
                pkg-config,
                python3-nose,
                python3-dbus,
@@ -30,6 +29,7 @@
          gir1.2-dee-1.0,
          unity-scopes-runner,
          gir1.2-glib-2.0
+Suggests: audacious
 Description: Audacious scope for Unity
  This package contains the "audacious" scope which allows Unity
  to search for audacious content.

=== modified file 'src/unity_audacious_daemon.py'
--- src/unity_audacious_daemon.py	2013-03-14 12:27:15 +0000
+++ src/unity_audacious_daemon.py	2013-03-19 22:08:22 +0000
@@ -40,10 +40,10 @@
 NO_RESULTS_HINT = _('Sorry, there are no Audacious results that match your search.')
 PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
-PROVIDER_ICON = SVG_DIR + 'service-yelp.svg'
-DEFAULT_RESULT_ICON = SVG_DIR + 'result-help.svg'
-DEFAULT_RESULT_MIMETYPE = 'x-scheme-handler/man'
-DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
+PROVIDER_ICON = SVG_DIR + 'service-audacious.svg'
+DEFAULT_RESULT_ICON = SVG_DIR + 'result-audacious.svg'
+DEFAULT_RESULT_MIMETYPE = 'taglib/mp3'
+DEFAULT_RESULT_TYPE = Unity.ResultType.PERSONAL
 AUDACIOUS_DBFILE = os.getenv("HOME") + "/.config/audacious/playlists/"
 
 c1 = {'id': 'songs',
@@ -58,7 +58,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"
@@ -170,6 +182,8 @@
         album = "" if track[3] is None else track[3]
         mimetype = "" if track[4] is None else track[4]
         albumartist = "" if track[5] is None else track[2]
+        year = 0 if track[5] is None else int(track[5])
+        genre = u"" if track[6] is None else track[6]
         trackname = title + " - " + album + " - " + artist
         if search.lower() in trackname.lower():
             albumart = get_album_art(track)
@@ -180,7 +194,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:
@@ -189,7 +207,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