Aggregates artist name and MusicBrainzID, simplified album search

diff --git a/doc/Changelog b/doc/Changelog
index dcb72d90232046efb16456a6dba2a590aa79f4ec..b9fc7ada72d00af960dbf42bbf4dbb31f5da442d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -6,6 +6,8 @@ MPD_sima v0.15.0
  * Honor MPC password/host format on command line option 'host'
  * Fixed fuzzy search for short artist names
  * Client side hardcoded one month caching (ugly workaround for #7)
+ * Simplified album search
+ * Track search aggregates artist name and MusicBrainzID searches
 
 -- kaliko jack <kaliko@azylum.org> UNRELEASED
 

diff --git a/sima/client.py b/sima/client.py
index 8bb5de3192947d706e669651cdd38fb7a1f9d732..40842ba3fa4a46d1a2ecc22b4653420fe35d95a5 100644 (file)
--- a/sima/client.py
+++ b/sima/client.py
@@ -172,12 +172,11 @@ class PlayerClient(Player):
                                         'title', title))
             else:
                 tracks |= set(self.find('musicbrainz_artistid', artist.mbid))
-        else:
-            for name in artist.names:
-                if title:
-                    tracks |= set(self.find('artist', name, 'title', title))
-                else:
-                    tracks |= set(self.find('artist', name))
+        for name in artist.names:
+            if title:
+                tracks |= set(self.find('artist', name, 'title', title))
+            else:
+                tracks |= set(self.find('artist', name))
         return list(tracks)
 
     @bl_artist
@@ -248,28 +247,26 @@ class PlayerClient(Player):
         match = get_close_matches(title, all_artist_titles, 50, 0.78)
         if not match:
             return []
-        for title_ in match:
-            leven = levenshtein_ratio(title.lower(), title_.lower())
+        for mtitle in match:
+            leven = levenshtein_ratio(title.lower(), mtitle.lower())
             if leven == 1:
                 pass
             elif leven >= 0.79:  # PARAM
                 self.log.debug('title: "%s" should match "%s" (lr=%1.3f)',
-                               title_, title, leven)
+                               mtitle, title, leven)
             else:
                 self.log.debug('title: "%s" does not match "%s" (lr=%1.3f)',
-                               title_, title, leven)
+                               mtitle, title, leven)
                 return []
-            return self.find('artist', artist, 'title', title_)
+            return self.find('artist', artist, 'title', mtitle)
 
     def find_album(self, artist, album):
         """
         Special wrapper around album search:
         Album lookup is made through AlbumArtist/Album instead of Artist/Album
+        MPD falls back to Artist if AlbumArtist is not found  (cf. documentation)
         """
-        alb_art_search = self.find('albumartist', artist, 'album', album)
-        if alb_art_search:
-            return alb_art_search
-        return self.find('artist', artist, 'album', album)
+        return self.find('albumartist', artist, 'album', album)
 
     @blacklist(album=True)
     def search_albums(self, artist):

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index cd28128978a9f6981e40486789e8f898d1446750..2ff88d2224f7c59f7fb8b88296207bd9ff82a0b7 100644 (file)
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -112,6 +112,7 @@ class WebService(Plugin):
             * not blacklisted
         """
         artist = tracks[0].artist
+        # In random play mode use complete playlist to filter
         if self.player.playmode.get('random'):
             black_list = self.player.playlist + self.to_add
         else:
@@ -198,6 +199,7 @@ class WebService(Plugin):
         if not self.player.playlist:
             return
         history = list(self.history)
+        # In random play mode use complete playlist to filter
         if self.player.playmode.get('random'):
             history = self.player.playlist + history
         else:
@@ -272,6 +274,7 @@ class WebService(Plugin):
         if not ret:
             self.log.warning('Got nothing from music library.')
             return []
+        # In random play mode use complete playlist to filter
         if self.player.playmode.get('random'):
             queued_artists = MetaContainer([trk.Artist for trk in self.player.playlist])
         else:
@@ -326,16 +329,14 @@ class WebService(Plugin):
             album_to_queue = str()
             random.shuffle(albums_not_in_hist)
             for album in albums_not_in_hist:
-                tracks = self.player.find_album(artist, album)
-                # Look if one track of the album is already queued
-                # Good heuristic, at least enough to guess if the whole album is
-                # already queued.
-                if tracks[0] in self.player.queue:
-                    self.log.debug('"%s" already queued, skipping!', tracks[0].album)
+                # Controls the album found is not already queued
+                if album in {t.album for t in self.player.queue}:
+                    self.log.debug('"%s" already queued, skipping!', album)
                     continue
-                if tracks[0] in self.player.playlist:
-                    if self.player.playmode.get('random'):
-                        self.log.debug('"%s" already in playlist, skipping!', tracks[0].album)
+                # In random play mode use complete playlist to filter
+                if self.player.playmode.get('random'):
+                    if album in {t.album for t in self.player.playlist}:
+                        self.log.debug('"%s" already in playlist, skipping!', album)
                         continue
                 album_to_queue = album
             if not album_to_queue: