From ecd4e3778e9794fee8261519d5ca17dec13b860b Mon Sep 17 00:00:00 2001 From: Guillermo Date: Fri, 13 Sep 2024 05:25:33 +0200 Subject: [PATCH] limited logs --- bot.py | 3 --- main.py | 5 +++++ timezone.py | 20 -------------------- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 timezone.py diff --git a/bot.py b/bot.py index b55a71b..b145b8d 100644 --- a/bot.py +++ b/bot.py @@ -97,8 +97,5 @@ class Butler(object): def run(self) -> None: """Start the bot.""" - if self.whitelist: - self.logger.info("Current whitelist: {}".format(self.whitelist)) - # Run the bot until the user presses Ctrl-C self.application.run_polling(allowed_updates=Update.ALL_TYPES) diff --git a/main.py b/main.py index 8d4e4e7..6177c0c 100644 --- a/main.py +++ b/main.py @@ -17,11 +17,14 @@ def main(): parser = argparse.ArgumentParser(description='Vylion\'s butler bot.') parser.add_argument('token', metavar='TOKEN', help='The Bot Token to work with the Telegram Bot API') + parser.add_argument('-l', '--loglevel', default='INFO', metavar='LOG_LEVEL', + help='The level for logging.') parser.add_argument('-c', '--chats', nargs='*', default=[], metavar='[CHATS]', help='A whitelist of allowed chats. Empty enables all.') args = parser.parse_args() logger = logging.getLogger(__name__) + loglevel = logging.getLevelName(args.loglevel) bot = Butler(logger, args.token, args.chats) # Enable logging @@ -35,6 +38,8 @@ def main(): coloredlogs.install(level=logging.INFO, fmt=log_format) logger.info("Bot started up!") + logger.info("Current whitelist: {}".format(args.chats)) + logger.setLevel(loglevel) bot.run() diff --git a/timezone.py b/timezone.py deleted file mode 100644 index 74e6847..0000000 --- a/timezone.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python3 - -from datetime import datetime, tzinfo, timedelta - - -class TZMadrid(tzinfo): - def utcoffset(self, dt): - return timedelta(hours=1) + self.dst(dt) - - def dst(self, dt): - dston = datetime.date(dt.year, 4, 1) - dstoff = datetime.date(dt.year, 10, 27) - # Code to set dston and dstoff to the time zone's DST - # transition times based on the input dt.year, and expressed - # in standard local time. - - if dston <= dt.replace(tzinfo=None) < dstoff: - return timedelta(hours=1) - else: - return timedelta(0)