From: kaliko Date: Tue, 15 Dec 2020 12:26:29 +0000 (+0100) Subject: Some style formating X-Git-Tag: 0.16.0~7 X-Git-Url: https://git.kaliko.me/?a=commitdiff_plain;h=8f2cfb30b762325dd79bdee44322631ae0ce486f;p=mpd-sima.git Some style formating --- diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py index 6a2acf7..5cad0e8 100644 --- a/sima/plugins/internal/tags.py +++ b/sima/plugins/internal/tags.py @@ -32,6 +32,7 @@ from ...lib.plugin import Plugin from ...lib.track import Track from ...utils.utils import PluginException + def forge_filter(cfg): tags = set(cfg.keys()) & Tags.supported_tags cfg_filter = cfg.get('filter', None) @@ -83,7 +84,7 @@ class Tags(Plugin): def _setup_tagsneeded(self): config_tags = {k for k, v in self.plugin_conf.items() if v} self.log.debug('%s plugin needs the followinng metadata: %s', - self, config_tags & Tags.supported_tags) + self, config_tags & Tags.supported_tags) tags = config_tags & Tags.supported_tags self.player.needed_tags |= tags @@ -98,8 +99,9 @@ class Tags(Plugin): def start(self): if (0, 21, 0) > tuple(map(int, self.player.mpd_version.split('.'))): self.log.warning('MPD protocol version: %s < 0.21.0', - self.player.mpd_version) - self.log.error('Need at least MPD 0.21 to use Tags plugin (filters required)') + self.player.mpd_version) + self.log.error( + 'Need at least MPD 0.21 to use Tags plugin (filters required)') self.player.disconnect() raise PluginException('MPD >= 0.21 required') # Check filter is valid diff --git a/sima/utils/utils.py b/sima/utils/utils.py index 429b0f9..187d6da 100644 --- a/sima/utils/utils.py +++ b/sima/utils/utils.py @@ -43,7 +43,8 @@ def getws(dic): """ aka = push(bytes(dic.get('apikey') + '=', 'utf-8')) aka = getencoder('rot-13')(str((aka), 'utf-8'))[0] - dic.update({'apikey':aka}) + dic.update({'apikey': aka}) + def get_mpd_environ(): """ @@ -61,6 +62,7 @@ def get_mpd_environ(): passwd = mpd_host_env[1] return (host, environ.get('MPD_PORT', None), passwd) + def normalize_path(path): """Get absolute path """ @@ -68,6 +70,7 @@ def normalize_path(path): return normpath(join(getcwd(), path)) return path + def exception_log(): """Log unknown exceptions""" log = logging.getLogger(__name__) @@ -82,7 +85,7 @@ def exception_log(): class SigHup(Exception): """SIGHUP raises this Exception""" - pass + # ArgParse Callbacks class Obsolete(Action): @@ -92,6 +95,7 @@ class Obsolete(Action): def __call__(self, parser, namespace, values, option_string=None): raise ArgumentError(self, 'obsolete argument') + class FileAction(Action): """Generic class to inherit from for ArgParse action on file/dir """ @@ -108,6 +112,7 @@ class FileAction(Action): """ pass + class Wfile(FileAction): # pylint: disable=R0903 """Is file writable @@ -126,6 +131,7 @@ class Wfile(FileAction): if not access(self._file, W_OK): self.parser.error('no write access to "{0}"'.format(self._file)) + class Rfile(FileAction): # pylint: disable=R0903 """Is file readable @@ -138,6 +144,7 @@ class Rfile(FileAction): if not access(self._file, R_OK): self.parser.error('no read access to "{0}"'.format(self._file)) + class Wdir(FileAction): # pylint: disable=R0903 """Is directory writable @@ -150,6 +157,7 @@ class Wdir(FileAction): if not access(self._file, W_OK): self.parser.error('no write access to "{0}"'.format(self._file)) + class Throttle: """throttle decorator""" def __init__(self, wait): @@ -165,22 +173,28 @@ class Throttle: return result return wrapper + class MPDSimaException(Exception): - pass + """Generic MPD_sima Exception""" + # http client exceptions (for webservices) class WSError(MPDSimaException): pass + class WSNotFound(WSError): pass + class WSTimeout(WSError): pass + class WSHTTPError(WSError): pass + class PluginException(MPDSimaException): pass