X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Futils.py;h=cc81f61643153ffec7d9c56b325fb74c2f27bd2f;hb=e86c25ed9e97c5dd3e0672d5b17bed01d4a23fdf;hp=b9dc980c37f5a109b207e133b660df4bb26517df;hpb=d67a78c3f86751a551b370c32aaf3934e772825f;p=mpd-sima.git diff --git a/sima/utils/utils.py b/sima/utils/utils.py index b9dc980..cc81f61 100644 --- a/sima/utils/utils.py +++ b/sima/utils/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# Copyright (c) 2010, 2011, 2013, 2014, 2015, 2020 kaliko +# Copyright (c) 2010, 2011, 2013, 2014, 2015, 2020, 2021 kaliko # # This file is part of sima # @@ -34,6 +34,9 @@ from os import getenv, access, getcwd, W_OK, R_OK from os.path import dirname, isabs, join, normpath, exists, isdir, isfile from time import sleep +from musicpd import VERSION as mversion +from sima.info import __version__ as sversion + def getws(dic): """ @@ -45,6 +48,7 @@ def getws(dic): aka = getencoder('rot-13')(str((aka), 'utf-8'))[0] dic.update({'apikey': aka}) + def parse_mpd_host(value): passwd = host = None # If password is set: MPD_HOST=pass@host @@ -87,6 +91,8 @@ def exception_log(): log = logging.getLogger(__name__) log.error('Unhandled Exception!!!') log.error(''.join(traceback.format_exc())) + log.info('musicpd python module version: %s', mversion) + log.info('MPD_sima version: %s', sversion) log.info('Please report the previous message' ' along with some log entries right before the crash.') log.info('thanks for your help :)') @@ -94,10 +100,6 @@ def exception_log(): sys.exit(1) -class SigHup(Exception): - """SIGHUP raises this Exception""" - - # ArgParse Callbacks class Obsolete(Action): # pylint: disable=R0903 @@ -110,7 +112,7 @@ class Obsolete(Action): class FileAction(Action): """Generic class to inherit from for ArgParse action on file/dir """ - # pylint: disable=R0903 + # pylint: disable=R0903,W0201 def __call__(self, parser, namespace, values, option_string=None): self._file = normalize_path(values) self._dir = dirname(self._file) @@ -131,7 +133,6 @@ class Wfile(FileAction): if isdir(self._file): self.parser.error('need a file not a directory: {}'.format(self._file)) if not exists(self._dir): - #raise ArgumentError(self, '"{0}" does not exist'.format(self._dir)) self.parser.error('directory does not exist: {0}'.format(self._dir)) if not exists(self._file): # Is parent directory writable then @@ -170,6 +171,7 @@ class Wdir(FileAction): class Throttle: """throttle decorator""" + # pylint: disable=R0903 def __init__(self, wait): self.wait = wait self.last_called = datetime.now() @@ -188,6 +190,10 @@ class MPDSimaException(Exception): """Generic MPD_sima Exception""" +class SigHup(MPDSimaException): + """SIGHUP raises this Exception""" + + # http client exceptions (for webservices) class WSError(MPDSimaException): pass