# -*- coding: utf-8 -*-
-# Copyright (c) 2009-2021 kaliko <kaliko@azylum.org>
+# Copyright (c) 2009-2022, 2024 kaliko <kaliko@azylum.org>
#
# This file is part of sima
#
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 as PlayerError
from .lib.track import Track
from .lib.simastr import SimaStr
from .utils.leven import levenshtein_ratio
+from .utils.utils import get_decorator
# Some decorators
return result
return wrapper
+
def set_artist_mbid(func):
def wrapper(*args, **kwargs):
cls = args[0]
return result
return wrapper
+
def tracks_wrapper(func):
"""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.
return Track(**ret)
return [Track(**t) for t in ret]
return wrapper
+
+# Decorator to wrap non MPDError exceptions from musicpd in PlayerError
+we = get_decorator(errors=(OSError, TimeoutError), wrap_into=PlayerError)
# / decorators
def __init__(self, config):
super().__init__()
+ self.socket_timeout = 10
self.use_mbid = True
self.log = getLogger('sima')
self.config = config
self._cache = None
# ######### Overriding MPDClient ###########
+ @we
def __getattr__(self, cmd):
"""Wrapper around MPDClient calls for abstract overriding"""
track_wrapped = {'currentsong', 'find', 'playlistinfo', }
port = mpd_config.get('port')
password = mpd_config.get('password', fallback=None)
self.disconnect()
- try:
- super().connect(host, port)
- # Catch socket errors
- except OSError as err:
- raise PlayerError('Could not connect to "%s:%s": %s' %
- (host, port, err.strerror))
- # 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 PlayerError as err:
- raise PlayerError('Could not connect to "%s:%s": %s' %
- (host, port, err))
+ super().connect(host, port)
if password:
- try:
- self.password(password)
- except (PlayerError, OSError) as err:
- raise PlayerError("Could not connect to '%s': %s" % (host, err))
+ self.password(password)
# Controls we have sufficient rights
available_cmd = self.commands()
for cmd in MPD.needed_cmds:
if cmd not in available_cmd:
self.disconnect()
- raise PlayerError('Could connect to "%s", '
- 'but command "%s" not available' %
- (host, cmd))
- self.tagtypes('clear')
+ raise PlayerError(f'Could connect to "{host}", but command "{cmd}" not available')
+ self.tagtypes_clear()
for tag in MPD.needed_tags:
- self.tagtypes('enable', tag)
- tt = set(map(str.lower, self.tagtypes()))
+ self.tagtypes_enable(tag)
+ ltt = set(map(str.lower, self.tagtypes()))
needed_tags = set(map(str.lower, MPD.needed_tags))
- if len(needed_tags & tt) != len(MPD.needed_tags):
- self.log.warning('MPD exposes: %s', tt)
+ if len(needed_tags & ltt) != len(MPD.needed_tags):
+ self.log.warning('MPD exposes: %s', ltt)
self.log.warning('Tags needed: %s', needed_tags)
raise PlayerError('Missing mandatory metadata!')
for tag in MPD.needed_mbid_tags:
- self.tagtypes('enable', tag)
+ self.tagtypes_enable(tag)
# Controls use of MusicBrainzIdentifier
if self.config.getboolean('sima', 'musicbrainzid'):
- tt = set(self.tagtypes())
- if len(MPD.needed_mbid_tags & tt) != len(MPD.needed_mbid_tags):
+ ltt = set(self.tagtypes())
+ if len(MPD.needed_mbid_tags & ltt) != len(MPD.needed_mbid_tags):
self.log.warning('Use of MusicBrainzIdentifier is set but MPD '
'is not providing related metadata')
- self.log.info(tt)
+ self.log.info(ltt)
self.log.warning('Disabling MusicBrainzIdentifier')
self.use_mbid = Meta.use_mbid = False
else:
- self.log.debug('Available metadata: %s', tt)
+ self.log.debug('Available metadata: %s', ltt)
self.use_mbid = Meta.use_mbid = True
else:
self.log.warning('Use of MusicBrainzIdentifier disabled!')
return False
return self.current.id != previous.id # pylint: disable=no-member
+ @we
def monitor(self):
"""Monitor player for change
Returns a list a events among:
* skipped current track skipped
"""
curr = self.current
- try:
- ret = self.idle('database', 'playlist', 'player', 'options')
- except (PlayerError, OSError) 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
+ self.noidle()
def clean(self):
"""Clean blocking event (idle) and pending commands
elif self._pending:
self.log.warning('pending commands: %s', self._pending)
+ @we
def add(self, payload):
"""Overriding MPD's add method to accept Track objects
plm = {'repeat': None, 'single': None,
'random': None, 'consume': None, }
for key, val in self.status().items():
- if key in plm.keys():
+ if key in plm:
plm.update({key: bool(int(val))})
return plm
artist.name, mbids[0], artist.mbid)
else:
return mbids[0]
+ return None
@bl_artist
@set_artist_mbid
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])
- self.log.debug('Also add alias for %s: %s', artist, new_alias)
- artist = Artist(name=library[0], mbid=artist.mbid)
- artist.add_alias(new_alias)
# Fetches remaining artists for potential match
artists = self._cache['nombid_artists']
else: # not using MusicBrainzIDs
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
+ 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