Merge lp:~submarine/unity-scope-audacious/media_art into lp:unity-scope-audacious

[Mark Tully]

Improvements in media art matching

Improvements in media art matching:
 - Using media-audio rather than audacious as the icon where no media art is found
 - Fix bug where song title rather than uri was being used to try to determine the album directory
 - Look for album.jpg as well as folder.jpg and cover.jpg for media art

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/unity-scope-audacious-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-audacious-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-audacious-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-audacious-saucy-i386-ci/2

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

review: Approve (continuous-integration)

[David Callé (davidc3)]

+1

review: Approve

=== modified file 'src/unity_audacious_daemon.py'
--- src/unity_audacious_daemon.py	2013-04-22 15:34:22 +0000
+++ src/unity_audacious_daemon.py	2013-09-11 23:17:41 +0000
@@ -135,12 +135,15 @@
 
 
 def get_album_art(track):
-    dirname = dirname = os.path.dirname(track[0])
+    dirname = dirname = os.path.dirname(track[1])
     if os.path.exists(dirname + "/cover.jpg"):
         return dirname + "/cover.jpg"
 
     if os.path.exists(dirname + "/folder.jpg"):
         return dirname + "/folder.jpg"
+        
+    if os.path.exists(dirname + "/album.jpg"):
+        return dirname + "/album.jpg"
 
     # Try thumbnailing any embedded album art and use that
     hashname = '%s\t%s' % (unicodedata.normalize("NFKD", track[2]), unicodedata.normalize("NFKD", track[3]))
@@ -163,10 +166,10 @@
                     img.write(artwork)
                 return tb_filename
             else:
-                return "audacious"
+                return "media-audio"
         except:
             # Otherwise, return a generic audio icon
-            return "audacious"
+            return "media-audio"
 
 
 def search(search, filters):