X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fclient.py;h=9bee62d0e4397c7173cccce7ec8706526081a01c;hb=92860d5ab0d6008fad149eea960de91acd15719a;hp=8122fdcd0f49a8a258dc096ef3c3b74a902e8cca;hpb=57621c64288a742232b379b53bfe5fce34959535;p=mpd-sima.git diff --git a/sima/client.py b/sima/client.py index 8122fdc..9bee62d 100644 --- a/sima/client.py +++ b/sima/client.py @@ -1,4 +1,22 @@ -# -* coding: utf-8 -*- +# -*- coding: utf-8 -*- +# Copyright (c) 2013, 2014 Jack Kaliko +# +# This file is part of sima +# +# sima is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# sima is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with sima. If not, see . +# +# """MPD client for Sima This client is built above python-musicpd a fork of python-mpd @@ -21,7 +39,9 @@ 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 +from .utils.leven import levenshtein_ratio class PlayerError(Exception): @@ -51,12 +71,17 @@ def blacklist(artist=False, album=False, track=False): if bl_getter(elem, add_not=True): cls.log.info('Blacklisted: {0}'.format(elem)) results.remove(elem) + if track and cls.database.get_bl_album(elem, add_not=True): + # filter album as well in track mode + # (artist have already been) + cls.log.info('Blacklisted: {0}'.format(elem)) + results.remove(elem) return results return wrapper return decorated class PlayerClient(Player): - """MPC Client + """MPD Client From python-musicpd: _fetch_nothing … _fetch_item single str @@ -68,7 +93,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 +110,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() @@ -133,7 +154,7 @@ class PlayerClient(Player): or not hasattr(old_curr, 'id') or not hasattr(self.current, 'id')): return False - return (self.current.id != old_curr.id) # pylint: disable=no-member + return self.current.id != old_curr.id # pylint: disable=no-member def _flush_cache(self): """ @@ -148,12 +169,36 @@ class PlayerClient(Player): } self._cache['artists'] = frozenset(self._client.list('artist')) + @blacklist(track=True) def find_track(self, artist, title=None): #return getattr(self, 'find')('artist', artist, 'title', title) if title: return self.find('artist', artist, 'title', title) return self.find('artist', artist) + @blacklist(track=True) + def fuzzy_find_track(self, artist, title): + # Retrieve all tracks from artist + all_tracks = self.find('artist', artist) + # Get all titles (filter missing titles set to 'None') + all_artist_titles = frozenset([tr.title for tr in all_tracks + if tr.title is not None]) + 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()) + if leven == 1: + pass + elif leven >= 0.79: # PARAM + self.log.debug('title: "%s" should match "%s" (lr=%1.3f)' % + (title_, title, leven)) + else: + self.log.debug('title: "%s" does not match "%s" (lr=%1.3f)' % + (title_, title, leven)) + return [] + return self.find('artist', artist, 'title', title_) + @blacklist(artist=True) def fuzzy_find_artist(self, art): """ @@ -213,24 +258,30 @@ 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: + album_trks = [trk for trk in self.find('album', album)] + if 'Various Artists' in [tr.albumartist for tr in album_trks]: + self.log.debug('Discarding {0} ("Various Artists" set)'.format(album)) + continue + arts = set([trk.artist for trk in album_trks]) + if len(set(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): @@ -271,7 +322,7 @@ class PlayerClient(Player): def queue(self): plst = self.playlist plst.reverse() - return [ trk for trk in plst if int(trk.pos) > int(self.current.pos)] + return [trk for trk in plst if int(trk.pos) > int(self.current.pos)] @property def playlist(self): @@ -330,6 +381,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):