X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fclient.py;h=6cd3802396688a01bc683318815d5e40aedb6a54;hb=deb847c3dbc3bec518f4edd414039098c8d04f3e;hp=8122fdcd0f49a8a258dc096ef3c3b74a902e8cca;hpb=57621c64288a742232b379b53bfe5fce34959535;p=mpd-sima.git

diff --git a/sima/client.py b/sima/client.py
index 8122fdc..6cd3802 100644
--- a/sima/client.py
+++ b/sima/client.py
@@ -21,6 +21,7 @@ except ImportError as err:
 # local import
 from .lib.player import Player
 from .lib.track import Track
+from .lib.meta import Album
 from .lib.simastr import SimaStr
 
 
@@ -56,7 +57,7 @@ def blacklist(artist=False, album=False, track=False):
     return decorated
 
 class PlayerClient(Player):
-    """MPC Client
+    """MPD Client
     From python-musicpd:
         _fetch_nothing  …
         _fetch_item     single str
@@ -68,7 +69,7 @@ class PlayerClient(Player):
         _fetch_songs    list of dict, especially tracks
         _fetch_plugins,
     TODO: handle exception in command not going through _client_wrapper() (ie.
-          find_aa, remove…)
+          remove…)
     """
     database = None  # sima database (history, blaclist)
 
@@ -85,10 +86,6 @@ class PlayerClient(Player):
         wrapper = self._execute
         return lambda *args: wrapper(command, args)
 
-    def __del__(self):
-        """Avoid hanging sockets"""
-        self.disconnect()
-
     def _execute(self, command, args):
         self._write_command(command, args)
         return self._client_wrapper()
@@ -213,24 +210,26 @@ class PlayerClient(Player):
             return alb_art_search
         return self.find('artist', artist, 'album', album)
 
-    #@blacklist(album=True)
+    @blacklist(album=True)
     def find_albums(self, artist):
         """
         Fetch all albums for "AlbumArtist"  == artist
         Filter albums returned for "artist" == artist since MPD returns any
                album containing at least a single track for artist
         """
-        albums = set()
-        albums.update(self.list('album', 'albumartist', artist))
+        albums = []
+        kwalbart = {'albumartist':artist, 'artist':artist}
+        for album in self.list('album', 'albumartist', artist):
+            if album not in albums:
+                albums.append(Album(name=album, **kwalbart))
         for album in self.list('album', 'artist', artist):
             arts = set([trk.artist for trk in self.find('album', album)])
-            if len(arts) < 2:
-                albums.add(album)
-            else:
+            if len(arts) < 2:  # TODO: better heuristic, use a ratio instead
+                if album not in albums:
+                    albums.append(Album(name=album, albumartist=artist))
+            elif (album and album not in albums):
                 self.log.debug('"{0}" probably not an album of "{1}"'.format(
-                             album, artist) + '({0})'.format('/'.join(arts)))
-        if albums:
-            self.log.debug('Albums candidate: {0}'.format('/'.join(albums)))
+                               album, artist) + '({0})'.format('/'.join(arts)))
         return albums
 
     def monitor(self):
@@ -330,6 +329,7 @@ class PlayerClient(Player):
     def disconnect(self):
         # Try to tell MPD we're closing the connection first
         try:
+            self._client.noidle()
             self._client.close()
         # If that fails, don't worry, just ignore it and disconnect
         except (MPDError, IOError):