1
0
mirror of https://github.com/gryf/urxvt-wrapper.git synced 2025-12-17 11:30:21 +01:00

Updated and simplified Logger class

This commit is contained in:
2021-02-19 18:33:11 +01:00
parent 613e733dd4
commit 2623229b3b

View File

@@ -15,9 +15,21 @@ import sys
import logging import logging
class Logger(object): SIZE = os.environ.get('URXVT_SIZE', 14)
FIXED_SIZE = os.environ.get('URXVT_FIXED_SIZE', 16)
ICON = os.environ.get('URXVT_ICON', 'tilda.png')
ICON_PATH = os.environ.get('URXVT_ICON_PATH',
os.path.expanduser('~/.urxvt/icons'))
DEFAULT_FONT = os.environ.get('URXVT_TTF', 'DejaVuSansMono Nerd Font Mono')
DEFAULT_BITMAP = os.environ.get('URXVT_BMP', 'Misc Fixed')
PERLEXT = os.environ.get('URXVT_PERL_EXT',
"url-select,keyboard-select,font-size,color-themes")
LOG = None
class Logger:
""" """
Logger class with output on console only Simple logger class with output on console only
""" """
def __init__(self, logger_name): def __init__(self, logger_name):
""" """
@@ -34,21 +46,16 @@ class Logger(object):
""" """
return self._log return self._log
def set_verbose(self, verbose_level, quiet_level): def set_verbose(self, verbose_level):
""" """
Change verbosity level. Default level is warning. Change verbosity level. Default level is warning.
""" """
self._log.setLevel(logging.WARNING) ver_map = {0: logging.CRITICAL,
1: logging.ERROR,
if quiet_level: 2: logging.WARNING,
self._log.setLevel(logging.ERROR) 3: logging.INFO,
if quiet_level > 1: 4: logging.DEBUG}
self._log.setLevel(logging.CRITICAL) self._log.setLevel(ver_map.get(verbose_level, ver_map[4]))
if verbose_level:
self._log.setLevel(logging.INFO)
if verbose_level > 1:
self._log.setLevel(logging.DEBUG)
def setup_logger(self): def setup_logger(self):
""" """
@@ -68,17 +75,6 @@ class Logger(object):
LOG = Logger(__name__)() LOG = Logger(__name__)()
SIZE = os.environ.get('URXVT_SIZE', 14)
FIXED_SIZE = os.environ.get('URXVT_FIXED_SIZE', 16)
ICON = os.environ.get('URXVT_ICON', 'tilda.png')
ICON_PATH = os.environ.get('URXVT_ICON_PATH',
os.path.expanduser('~/.urxvt/icons'))
DEFAULT_FONT = os.environ.get('URXVT_TTF', 'DejaVuSansMono Nerd Font Mono')
DEFAULT_BITMAP = os.environ.get('URXVT_BMP', 'Misc Fixed')
PERLEXT = os.environ.get('URXVT_PERL_EXT',
"url-select,keyboard-select,font-size,color-themes")
# Arbitrary added fonts, that provides symbols, icons, emoji (besides those in # Arbitrary added fonts, that provides symbols, icons, emoji (besides those in
# Nerd Font) # Nerd Font)
_ADDITIONAL_FONTS = ['Symbola', 'Unifont Upper', 'DejaVu Sans'] _ADDITIONAL_FONTS = ['Symbola', 'Unifont Upper', 'DejaVu Sans']
@@ -181,7 +177,7 @@ def _get_font_list(ff_list, size, bold=False):
def main(): def main():
parser = argparse.ArgumentParser(description=__doc__) parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('-d', '--default-font', default=DEFAULT_FONT, parser.add_argument('-f', '--default-font', default=DEFAULT_FONT,
help='use particular (comma separated) font face(s) ' help='use particular (comma separated) font face(s) '
'as default(s) one, should be provided by font name, ' 'as default(s) one, should be provided by font name, '
'not file name(s), default is "%s"' % DEFAULT_FONT) 'not file name(s), default is "%s"' % DEFAULT_FONT)
@@ -191,30 +187,23 @@ def main():
'%s, default "%s"' % (ICON_PATH, ICON)) '%s, default "%s"' % (ICON_PATH, ICON))
parser.add_argument('-t', '--tabbedalt', action='store_true', parser.add_argument('-t', '--tabbedalt', action='store_true',
help='activate tabbedalt extension') help='activate tabbedalt extension')
parser.add_argument('-s', '--size', default=SIZE, type=int,
help='set scalable forn size, default %s' % SIZE)
parser.add_argument('-e', '--exec', help='pass exec to urxvt')
parser.add_argument('-n', '--no-perl', action='store_true', parser.add_argument('-n', '--no-perl', action='store_true',
help='no perl extensions') help='no perl extensions')
group = parser.add_mutually_exclusive_group() parser.add_argument('-s', '--size', default=SIZE, type=int,
group.add_argument("-q", "--quiet", help='please, be quiet. Adding more ' help='set scalable forn size, default %s' % SIZE)
'"q" will decrease verbosity', action="count", parser.add_argument('-e', '--execute', default=None,
default=0) help='pass exec to urxvt')
group.add_argument("-v", "--verbose", help='be verbose. Adding more "v" ' parser.add_argument("-v", "--verbose", help='be verbose. Adding more "v" '
'will increase verbosity', action="count", default=0) 'will increase verbosity', action="count", default=0)
args = parser.parse_args() args = parser.parse_args()
LOG.set_verbose(args.verbose)
command = ['urxvt'] command = ['urxvt']
command.extend(['-icon', os.path.join(os.path.expanduser(ICON_PATH), command.extend(['-icon', os.path.join(os.path.expanduser(ICON_PATH),
args.icon)]) args.icon)])
global LOG
log = Logger(__name__)
log.set_verbose(args.verbose, args.quiet)
LOG = log()
if not args.no_perl: if not args.no_perl:
command.append('-pe') command.append('-pe')
if args.tabbedalt: if args.tabbedalt: