From 355480f408e88b69717b934bace4e5e69856ad23 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 29 Oct 2024 16:06:12 -0400 Subject: Cleanup, improve volume calculations Signed-off-by: Andrew Opalach --- src/portal/cpy/portal.pyx | 38 +++++++++++++++++++------------------- src/portal/py/log.py | 32 ++++++++++++++++---------------- src/portal/py/modules/youtube.py | 20 ++++++++++---------- src/portal/py/tests/logger.py | 6 +++--- 4 files changed, 48 insertions(+), 48 deletions(-) (limited to 'src/portal') diff --git a/src/portal/cpy/portal.pyx b/src/portal/cpy/portal.pyx index ec33ac6..28af444 100644 --- a/src/portal/cpy/portal.pyx +++ b/src/portal/cpy/portal.pyx @@ -6,17 +6,17 @@ cimport bridge import sys sys.path.append('./py') -cdef public int log_info(char *msg) except -1: - return lib.al_log_info("portal", "%s", msg) +cdef public int log_info(char *message) except -1: + return lib.al_log_info("portal", "%s", message) -cdef public int log_warn(char *msg) except -1: - return lib.al_log_warn("portal", "%s", msg) +cdef public int log_warn(char *message) except -1: + return lib.al_log_warn("portal", "%s", message) -cdef public int log_error(char *msg) except -1: - return lib.al_log_error("portal", "%s", msg) +cdef public int log_error(char *message) except -1: + return lib.al_log_error("portal", "%s", message) -cdef public int log_debug(char *msg) except -1: - return lib.al_log_debug("portal", "%s", msg) +cdef public int log_debug(char *message) except -1: + return lib.al_log_debug("portal", "%s", message) def encode_str(str): return str.encode('UTF-8') @@ -31,9 +31,9 @@ class OutputHook(object): def __getattr__(self, attr): return getattr(self.fd, attr) - def write(self, msg): - if len(msg) > 0 and msg != '\n': - log_info(encode_str(msg)) + def write(self, message): + if len(message) > 0 and message != '\n': + log_info(encode_str(message)) hook = OutputHook() sys.stdout = hook @@ -42,17 +42,17 @@ sys.stderr = hook import log class PortalLogger(): - def debug(self, msg): - log_debug(encode_str(msg)) + def debug(self, message): + log_debug(encode_str(message)) - def info(self, msg): - log_info(encode_str(msg)) + def info(self, message): + log_info(encode_str(message)) - def warn(self, msg): - log_warn(encode_str(msg)) + def warn(self, message): + log_warn(encode_str(message)) - def error(self, msg): - log_error(encode_str(msg)) + def error(self, message): + log_error(encode_str(message)) log.set_logger(PortalLogger()) diff --git a/src/portal/py/log.py b/src/portal/py/log.py index b693a4c..8d52d0e 100644 --- a/src/portal/py/log.py +++ b/src/portal/py/log.py @@ -1,15 +1,15 @@ class DefaultLogger(): - def debug(self, msg): - print(msg) + def debug(self, message): + print(message) - def info(self, msg): - print(msg) + def info(self, message): + print(message) - def warn(self, msg): - print(msg) + def warn(self, message): + print(message) - def error(self, msg): - print(msg) + def error(self, message): + print(message) LOGGER = DefaultLogger() @@ -17,18 +17,18 @@ def set_logger(logger): global LOGGER LOGGER = logger -def debug(msg): +def debug(message): global LOGGER - LOGGER.debug(msg) + LOGGER.debug(message) -def info(msg): +def info(message): global LOGGER - LOGGER.info(msg) + LOGGER.info(message) -def warn(msg): +def warn(message): global LOGGER - LOGGER.warn(msg) + LOGGER.warn(message) -def error(msg): +def error(message): global LOGGER - LOGGER.error(msg) + LOGGER.error(message) diff --git a/src/portal/py/modules/youtube.py b/src/portal/py/modules/youtube.py index f809ff6..9645ada 100644 --- a/src/portal/py/modules/youtube.py +++ b/src/portal/py/modules/youtube.py @@ -7,20 +7,20 @@ from query_parser import QueryParser from yt_dlp import YoutubeDL class YDLLogger(): - def debug(self, msg): - if msg.startswith('[debug] '): - log.debug(msg) + def debug(self, message): + if message.startswith('[debug] '): + log.debug(message) else: - log.info(msg) + log.info(message) - def info(self, msg): - log.info(msg) + def info(self, message): + log.info(message) - def warning(self, msg): - log.warn(msg) + def warning(self, message): + log.warn(message) - def error(self, msg): - log.error(msg) + def error(self, message): + log.error(message) ydl_opts = { 'quiet': False, diff --git a/src/portal/py/tests/logger.py b/src/portal/py/tests/logger.py index 80e22da..3adf792 100644 --- a/src/portal/py/tests/logger.py +++ b/src/portal/py/tests/logger.py @@ -5,10 +5,10 @@ class Logger(): self.file = open(path, 'a+') self.mutex = threading.Lock() - def write(self, msg): + def write(self, message): with self.mutex: - print(msg) - self.file.write(msg + '\n') + print(message) + self.file.write(message + '\n') self.file.flush() def close(self): -- cgit v1.2.3-101-g0448