from difflib import get_close_matches
from functools import wraps
from logging import getLogger
+from select import select
# external module
from musicpd import MPDClient, MPDError
from .lib.track import Track
from .lib.simastr import SimaStr
from .utils.leven import levenshtein_ratio
+from .utils.utils import MPDSimaException
-class PlayerError(Exception):
+class PlayerError(MPDSimaException):
"""Fatal error in the player."""
cls = args[0]
if not cls.database:
return func(*args, **kwargs)
- results = func(*args, **kwargs)
- if not results:
+ result = func(*args, **kwargs)
+ if not result:
return None
- for art in results.names:
- mbid = results.mbid
- if not mbid:
- mbid = cls._find_musicbrainz_artistid(results)
- artist = Artist(name=art, mbid=mbid)
+ for art in result.names:
+ artist = Artist(name=art, mbid=result.mbid)
if cls.database.get_bl_artist(artist, add=False):
cls.log.debug('Artist in blocklist: %s', artist)
return None
- return results
+ return result
+ return wrapper
+
+
+def set_artist_mbid(func):
+ def wrapper(*args, **kwargs):
+ cls = args[0]
+ result = func(*args, **kwargs)
+ if Meta.use_mbid:
+ if result and not result.mbid:
+ mbid = cls._find_musicbrainz_artistid(result)
+ artist = Artist(name=result.name, mbid=mbid)
+ artist.add_alias(result)
+ return artist
+ return result
return wrapper
def tracks_wrapper(func):
- """Convert plain track mapping as returned by MPDClient into :py:obj:Track
+ """Convert plain track mapping as returned by MPDClient into :py:obj:`sima.lib.track.Track`
objects. This decorator accepts single track or list of tracks as input.
"""
@wraps(func)
"""
Player instance inheriting from MPDClient (python-musicpd).
- Some methods are overridden to format objects as sima.lib.Track for
+ Some methods are overridden to format objects as :py:obj:`sima.lib.track.Track` for
instance, other are calling parent class directly through super().
cf. MPD.__getattr__
def __init__(self, config):
super().__init__()
+ self.socket_timeout = 10
self.use_mbid = True
self.log = getLogger('sima')
self.config = config
def __getattr__(self, cmd):
"""Wrapper around MPDClient calls for abstract overriding"""
track_wrapped = {'currentsong', 'find', 'playlistinfo', }
- if cmd in track_wrapped:
- return tracks_wrapper(super().__getattr__(cmd))
- return super().__getattr__(cmd)
+ try:
+ if cmd in track_wrapped:
+ return tracks_wrapper(super().__getattr__(cmd))
+ return super().__getattr__(cmd)
+ except OSError as err:
+ raise PlayerError(err) from err
def disconnect(self):
"""Overriding explicitly MPDClient.disconnect()"""
try:
super().connect(host, port)
# Catch socket errors
- except IOError as err:
+ except OSError as err:
raise PlayerError('Could not connect to "%s:%s": %s' %
- (host, port, err.strerror))
+ (host, port, err.strerror)) from err
# Catch all other possible errors
# ConnectionError and ProtocolError are always fatal. Others may not
# be, but we don't know how to handle them here, so treat them as if
# they are instead of ignoring them.
except MPDError as err:
raise PlayerError('Could not connect to "%s:%s": %s' %
- (host, port, err))
+ (host, port, err)) from err
if password:
try:
self.password(password)
- except (MPDError, IOError) as err:
- raise PlayerError("Could not connect to '%s': %s" % (host, err))
+ except (MPDError, OSError) as err:
+ raise PlayerError("Could not connect to '%s': %s" % (host, err)) from err
# Controls we have sufficient rights
available_cmd = self.commands()
for cmd in MPD.needed_cmds:
* skipped current track skipped
"""
curr = self.current
- try:
- ret = self.idle('database', 'playlist', 'player', 'options')
- except (MPDError, IOError) as err:
- raise PlayerError("Couldn't init idle: %s" % err)
- if self._skipped_track(curr):
- ret.append('skipped')
- if 'database' in ret:
- self._reset_cache()
- return ret
+ select_timeout = 5
+ while True:
+ self.send_idle('database', 'playlist', 'player', 'options')
+ _read, _, _ = select([self], [], [], select_timeout)
+ if _read: # tries to read response
+ ret = self.fetch_idle()
+ if self._skipped_track(curr):
+ ret.append('skipped')
+ if 'database' in ret:
+ self._reset_cache()
+ return ret
+ # Nothing to read, canceling idle
+ try: # noidle cmd does not go through __getattr__, need to catch OSError then
+ self.noidle()
+ except OSError as err:
+ raise PlayerError(err) from err
def clean(self):
"""Clean blocking event (idle) and pending commands
def add(self, payload):
"""Overriding MPD's add method to accept Track objects
- :param Track,list payload: Either a single :py:obj:`Track` or a list of it
+ :param Track,list payload: Either a single track or a list of it
"""
if isinstance(payload, Track):
super().__getattr__('add')(payload.file)
def find_tracks(self, what):
"""Find tracks for a specific artist or album
>>> player.find_tracks(Artist('Nirvana'))
- >>> player.find_tracks(Album('In Utero', artist=(Artist('Nirvana'))
+ >>> player.find_tracks(Album('In Utero', artist=Artist('Nirvana'))
:param Artist,Album what: Artist or Album to fetch track from
-
- Returns a list of :py:obj:Track objects
+ :return: A list of track objects
+ :rtype: list(Track)
"""
if isinstance(what, Artist):
return self._find_art(what)
for name in artist.names:
tracks |= set(self.find('artist', name))
# album blocklist
- albums = {Album(trk.album, mbid=trk.musicbrainz_albumid)
+ albums = {Album(trk.Album.name, mbid=trk.musicbrainz_albumid)
for trk in tracks}
bl_albums = {Album(a.get('album'), mbid=a.get('musicbrainz_album'))
for a in self.database.view_bl() if a.get('album')}
filt = f"(MUSICBRAINZ_ALBUMID == '{album.mbid}')"
albums = self.find(filt)
# Now look for album with no MusicBrainzIdentifier
- if not albums and album.artist.mbid: # Use album artist MBID if possible
- filt = f"((MUSICBRAINZ_ALBUMARTISTID == '{album.artist.mbid}') AND (album == '{album.name_sz}'))"
+ if not albums and album.Artist.mbid: # Use album artist MBID if possible
+ filt = f"((MUSICBRAINZ_ALBUMARTISTID == '{album.Artist.mbid}') AND (album == '{album.name_sz}'))"
albums = self.find(filt)
if not albums: # Falls back to (album)?artist/album name
- for artist in album.artist.names_sz:
+ for artist in album.Artist.names_sz:
filt = f"((albumartist == '{artist}') AND (album == '{album.name_sz}'))"
albums.extend(self.find(filt))
return albums
# #### Search Methods #####
def _find_musicbrainz_artistid(self, artist):
+ """Find MusicBrainzArtistID when possible.
+ """
if not self.use_mbid:
return None
- mbids = self.list('MUSICBRAINZ_ARTISTID',
- f'(artist == "{artist.name_sz}")')
+ mbids = None
+ for name in artist.names_sz:
+ filt = f'((artist == "{name}") AND (MUSICBRAINZ_ARTISTID != ""))'
+ mbids = self.list('MUSICBRAINZ_ARTISTID', filt)
+ if mbids:
+ break
if not mbids:
return None
if len(mbids) > 1:
return mbids[0]
@bl_artist
+ @set_artist_mbid
def search_artist(self, artist):
"""
Search artists based on a fuzzy search in the media library
>>> ['The Beatles', 'Beatles', 'the beatles']
:param Artist artist: Artist to look for in MPD music library
-
- Returns an Artist object
+ :return: Artist object
+ :rtype: Artist
"""
found = False
if artist.mbid:
# library could fetch several artist name for a single MUSICBRAINZ_ARTISTID
if len(library) > 1:
self.log.debug('I got "%s" searching for %r', library, artist)
+ for name in library:
+ if SimaStr(artist.name) == name and name != artist.name:
+ self.log.debug('add alias for %s: %s', artist, name)
+ artist.add_alias(name)
elif len(library) == 1 and library[0] != artist.name:
new_alias = artist.name
self.log.info('Update artist name %s->%s', artist, library[0])
if artist.aliases:
self.log.debug('Searching album for %s aliases: "%s"',
artist, artist.aliases)
+ albums = set()
+ if self.use_mbid and artist.mbid:
+ mpd_filter = f"((musicbrainz_albumartistid == '{artist.mbid}') AND ( album != ''))"
+ raw_album_id = self.list('musicbrainz_albumid', mpd_filter)
+ for albumid in raw_album_id:
+ mpd_filter = f"((musicbrainz_albumid == '{albumid}') AND ( album != ''))"
+ album_name = self.list('album', mpd_filter)
+ if not album_name: # something odd here
+ continue
+ albums.add(Album(album_name[0], artist=artist.name,
+ Artist=artist, mbid=albumid))
for name_sz in artist.names_sz:
mpd_filter = f"((albumartist == '{name_sz}') AND ( album != ''))"
raw_albums = self.list('album', mpd_filter)
- albums = list()
for alb in raw_albums:
+ if alb in [a.name for a in albums]:
+ continue
mbid = None
if self.use_mbid:
_ = Album(alb)
mbids = self.list('MUSICBRAINZ_ALBUMID', mpd_filter)
if mbids:
mbid = mbids[0]
- albums.append(Album(alb, albumartist=artist.name,
- artist=artist.name, mbid=mbid))
+ albums.add(Album(alb, artist=artist.name,
+ Artist=artist, mbid=mbid))
candidates = []
for album in albums:
album_trks = self.find_tracks(album)
+ if not album_trks: # find_track result can be empty, blocklist applied
+ continue
album_artists = {tr.albumartist for tr in album_trks if tr.albumartist}
- if album.artist.names & album_artists:
+ if album.Artist.names & album_artists:
candidates.append(album)
continue
+ if self.use_mbid and artist.mbid:
+ if artist.mbid == album_trks[0].musicbrainz_albumartistid:
+ candidates.append(album)
+ continue
+ else:
+ self.log.debug('Discarding "%s", "%r" not set as musicbrainz_albumartistid', album, album.Artist)
+ continue
if 'Various Artists' in album_artists:
self.log.debug('Discarding %s ("Various Artists" set)', album)
continue
- if album_artists and album.artist.name not in album_artists:
- self.log.debug('Discarding "%s", "%s" not set as albumartist', album, album.artist)
+ if album_artists and album.Artist.name not in album_artists:
+ self.log.debug('Discarding "%s", "%s" not set as albumartist', album, album.Artist)
continue
- # Attempt to detect false positive
+ # Attempt to detect false positive (especially when no
+ # AlbumArtist/MBIDs tag ar set)
# Avoid selecting albums where artist is credited for a single
# track of the album
album_trks = self.find(f"(album == '{album.name_sz}')")
arts = [trk.artist for trk in album_trks] # Artists in the album
# count artist occurences
- ratio = arts.count(album.artist.name)/len(arts)
+ ratio = arts.count(album.Artist.name)/len(arts)
if ratio >= 0.8:
candidates.append(album)
else:
self.log.debug('"%s" probably not an album of "%s" (ratio=%.2f)',
album, artist, ratio)
continue
- for alb in albums:
- if self.database.get_bl_album(album, add=False):
- candidates.remove(album)
return candidates
# #### / Search Methods ###
home / dev / repositories / mpd-sima.git / blobdiff