From 3723049081704a4c9fd498a78ae528c64a4fcdf8 Mon Sep 17 00:00:00 2001 From: Igor Chubin Date: Mon, 3 Feb 2025 14:04:50 +0100 Subject: [PATCH] Fix formatting of lib/globals.py --- lib/globals.py | 95 ++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/lib/globals.py b/lib/globals.py index da52078..8cc306f 100644 --- a/lib/globals.py +++ b/lib/globals.py @@ -17,12 +17,12 @@ import logging import os import re -MYDIR = os.path.abspath(os.path.dirname(os.path.dirname('__file__'))) +MYDIR = os.path.abspath(os.path.dirname(os.path.dirname("__file__"))) if "WTTR_GEOLITE" in os.environ: GEOLITE = os.environ["WTTR_GEOLITE"] else: - GEOLITE = os.path.join(MYDIR, 'data', "GeoLite2-City.mmdb") + GEOLITE = os.path.join(MYDIR, "data", "GeoLite2-City.mmdb") WEGO = os.environ.get("WTTR_WEGO", "/home/igor/go/bin/we-lang") PYPHOON = "pyphoon-lolcat" @@ -34,36 +34,38 @@ IP2LCACHE = os.path.join(_DATADIR, "cache/ip2l/") PNG_CACHE = os.path.join(_DATADIR, "cache/png") LRU_CACHE = os.path.join(_DATADIR, "cache/lru") -LOG_FILE = os.path.join(_LOGDIR, 'main.log') +LOG_FILE = os.path.join(_LOGDIR, "main.log") -PROXY_LOG_ACCESS = os.path.join(_LOGDIR, 'proxy-access.log') -PROXY_LOG_ERRORS = os.path.join(_LOGDIR, 'proxy-errors.log') +PROXY_LOG_ACCESS = os.path.join(_LOGDIR, "proxy-access.log") +PROXY_LOG_ERRORS = os.path.join(_LOGDIR, "proxy-errors.log") -MISSING_TRANSLATION_LOG = os.path.join(_LOGDIR, 'missing-translation/%s.log') +MISSING_TRANSLATION_LOG = os.path.join(_LOGDIR, "missing-translation/%s.log") ALIASES = os.path.join(MYDIR, "share/aliases") ANSI2HTML = os.path.join(MYDIR, "share/ansi2html.sh") BLACKLIST = os.path.join(MYDIR, "share/blacklist") -HELP_FILE = os.path.join(MYDIR, 'share/help.txt') -BASH_FUNCTION_FILE = os.path.join(MYDIR, 'share/bash-function.txt') -TRANSLATION_FILE = os.path.join(MYDIR, 'share/translation.txt') +HELP_FILE = os.path.join(MYDIR, "share/help.txt") +BASH_FUNCTION_FILE = os.path.join(MYDIR, "share/bash-function.txt") +TRANSLATION_FILE = os.path.join(MYDIR, "share/translation.txt") -IATA_CODES_FILE = os.path.join(MYDIR, 'share/list-of-iata-codes.txt') +IATA_CODES_FILE = os.path.join(MYDIR, "share/list-of-iata-codes.txt") -TEMPLATES = os.path.join(MYDIR, 'share/templates') -STATIC = os.path.join(MYDIR, 'share/static') +TEMPLATES = os.path.join(MYDIR, "share/templates") +STATIC = os.path.join(MYDIR, "share/static") NOT_FOUND_LOCATION = "not found" DEFAULT_LOCATION = "oymyakon" -MALFORMED_RESPONSE_HTML_PAGE = open(os.path.join(STATIC, 'malformed-response.html')).read() +MALFORMED_RESPONSE_HTML_PAGE = open( + os.path.join(STATIC, "malformed-response.html") +).read() -GEOLOCATOR_SERVICE = 'http://localhost:8004' +GEOLOCATOR_SERVICE = "http://localhost:8004" # number of queries from the same IP address is limited # (minute, hour, day) limitations: -QUERY_LIMITS = (300, 3600, 24*3600) +QUERY_LIMITS = (300, 3600, 24 * 3600) LISTEN_HOST = os.environ.get("WTTR_LISTEN_HOST", "") try: @@ -75,7 +77,7 @@ PROXY_HOST = "127.0.0.1" PROXY_PORT = 5001 PROXY_CACHEDIR = os.path.join(_DATADIR, "cache/proxy-wwo/") -MY_EXTERNAL_IP = '5.9.243.187' +MY_EXTERNAL_IP = "5.9.243.187" PLAIN_TEXT_AGENTS = [ "curl", @@ -94,76 +96,79 @@ PLAIN_TEXT_AGENTS = [ "zig", ] -PLAIN_TEXT_PAGES = [':help', ':bash.function', ':translation', ':iterm2'] +PLAIN_TEXT_PAGES = [":help", ":bash.function", ":translation", ":iterm2"] -TRANSLATION_TABLE = str.maketrans({ - '\u2196': '\u256E', # '↖' -> '╮' - '\u2197': '\u256D', # '↗' -> '╭' - '\u2198': '\u2570', # '↘' -> '╰' - '\u2199': '\u256F', # '↙' -> '╯' - '\u26A1': '\u250C\u2518' -}) +TRANSLATION_TABLE = str.maketrans( + { + "\u2196": "\u256E", # '↖' -> '╮' + "\u2197": "\u256D", # '↗' -> '╭' + "\u2198": "\u2570", # '↘' -> '╰' + "\u2199": "\u256F", # '↙' -> '╯' + "\u26A1": "\u250C\u2518", + } +) -_IPLOCATION_ORDER = os.environ.get( - "WTTR_IPLOCATION_ORDER", - 'geoip,ip2location,ipinfo') -IPLOCATION_ORDER = _IPLOCATION_ORDER.split(',') +_IPLOCATION_ORDER = os.environ.get("WTTR_IPLOCATION_ORDER", "geoip,ip2location,ipinfo") +IPLOCATION_ORDER = _IPLOCATION_ORDER.split(",") _IP2LOCATION_KEY_FILE = os.environ.get( - "WTTR_IP2LOCATION_KEY_FILE", - os.environ['HOME'] + '/.ip2location.key') + "WTTR_IP2LOCATION_KEY_FILE", os.environ["HOME"] + "/.ip2location.key" +) IP2LOCATION_KEY = None if os.path.exists(_IP2LOCATION_KEY_FILE): - IP2LOCATION_KEY = open(_IP2LOCATION_KEY_FILE, 'r').read().strip() + IP2LOCATION_KEY = open(_IP2LOCATION_KEY_FILE, "r").read().strip() _IPINFO_KEY_FILE = os.environ.get( - "WTTR_IPINFO_KEY_FILE", - os.environ['HOME'] + '/.ipinfo.key') + "WTTR_IPINFO_KEY_FILE", os.environ["HOME"] + "/.ipinfo.key" +) IPINFO_TOKEN = None if os.path.exists(_IPINFO_KEY_FILE): - IPINFO_TOKEN = open(_IPINFO_KEY_FILE, 'r').read().strip() + IPINFO_TOKEN = open(_IPINFO_KEY_FILE, "r").read().strip() -_WWO_KEY_FILE = os.environ.get( - "WTTR_WWO_KEY_FILE", - os.environ['HOME'] + '/.wwo.key') +_WWO_KEY_FILE = os.environ.get("WTTR_WWO_KEY_FILE", os.environ["HOME"] + "/.wwo.key") WWO_KEY = "key-is-not-specified" USE_METNO = True USER_AGENT = os.environ.get("WTTR_USER_AGENT", "") if os.path.exists(_WWO_KEY_FILE): - WWO_KEY = open(_WWO_KEY_FILE, 'r').read().strip() + WWO_KEY = open(_WWO_KEY_FILE, "r").read().strip() USE_METNO = False + def error(text): "log error `text` and raise a RuntimeError exception" - if not text.startswith('Too many queries'): + if not text.startswith("Too many queries"): print(text) logging.error("ERROR %s", text) raise RuntimeError(text) + def log(text): "log error `text` and do not raise any exceptions" - if not text.startswith('Too many queries'): + if not text.startswith("Too many queries"): print(text) logging.info(text) + def debug_log(text): """ Write `text` to the debug log """ - with open('/tmp/wttr.in-debug.log', 'a') as f_debug: - f_debug.write(text+'\n') + with open("/tmp/wttr.in-debug.log", "a") as f_debug: + f_debug.write(text + "\n") + def get_help_file(lang): "Return help file for `lang`" - help_file = os.path.join(MYDIR, 'share/translations/%s-help.txt' % lang) + help_file = os.path.join(MYDIR, "share/translations/%s-help.txt" % lang) if os.path.exists(help_file): return help_file return HELP_FILE + def remove_ansi(sometext): - ansi_escape = re.compile(r'(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]') - return ansi_escape.sub('', sometext) + ansi_escape = re.compile(r"(\x9B|\x1B\[)[0-?]*[ -\/]*[@-~]") + return ansi_escape.sub("", sometext)