Merge pull request #211 from aahnik/misc-patch

Enhanced logging and other minor fixes

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tgcf"
-version = "0.2.5.post0"
+version = "0.2.6"
 description = "The ultimate tool to automate custom telegram message forwarding."
 authors = ["aahnik <[email protected]>"]
 license = "MIT"
@@ -23,6 +23,9 @@ aiohttp = "^3.7.4"
 tg-login = "^0.0.2"
 "watermark.py" = "^0.0.3"
 pytesseract = "^0.3.7"
+rich = "^10.3.0"
+pyfiglet = "^0.8.post1"
+verlat = "^0.1.0"
 
 [tool.poetry.dev-dependencies]
 typer-cli = "^0.0.11"

tgcf/bot/__init__.py

@@ -1,3 +1,3 @@
 """The subpackage for interative bot for tgcf."""
 
-from .live_bot import BOT_EVENTS
+from .live_bot import get_events

tgcf/bot/live_bot.py

@@ -1,10 +1,18 @@
 """A bot to controll settings for tgcf live mode."""
 
+import logging
+
 import yaml
 from telethon import events
 
 from tgcf import config, const, plugins
-from tgcf.bot.utils import admin_protect, display_forwards, get_args, remove_source
+from tgcf.bot.utils import (
+    admin_protect,
+    display_forwards,
+    get_args,
+    get_command_prefix,
+    remove_source,
+)
 
 
 @admin_protect
@@ -30,9 +38,7 @@ async def forward_command_handler(event):
             raise ValueError(f"{notes}\n{display_forwards(config.CONFIG.forwards)}")
 
         parsed_args = yaml.safe_load(args)
-        print(parsed_args)
         forward = config.Forward(**parsed_args)
-        print(forward)
         try:
             remove_source(forward.source, config.CONFIG.forwards)
         except:
@@ -43,7 +49,7 @@ async def forward_command_handler(event):
         await event.respond("Success")
         config.write_config(config.CONFIG)
     except ValueError as err:
-        print(err)
+        logging.error(err)
         await event.respond(str(err))
 
     finally:
@@ -68,17 +74,14 @@ async def remove_command_handler(event):
             raise ValueError(f"{notes}\n{display_forwards(config.CONFIG.forwards)}")
 
         parsed_args = yaml.safe_load(args)
-        print(parsed_args)
         source_to_remove = parsed_args.get("source")
-        print(source_to_remove)
         config.CONFIG.forwards = remove_source(source_to_remove, config.CONFIG.forwards)
-        print(config.CONFIG.forwards)
         config.from_to = config.load_from_to(event.client, config.CONFIG.forwards)
 
         await event.respond("Success")
         config.write_config(config.CONFIG)
     except ValueError as err:
-        print(err)
+        logging.error(err)
         await event.respond(str(err))
 
     finally:
@@ -111,7 +114,7 @@ async def style_command_handler(event):
 
         config.write_config(config.CONFIG)
     except ValueError as err:
-        print(err)
+        logging.error(err)
         await event.respond(str(err))
 
     finally:
@@ -128,10 +131,15 @@ async def help_command_handler(event):
     await event.respond(const.BotMessages.bot_help)
 
 
-BOT_EVENTS = {
-    "bot_start": (start_command_handler, events.NewMessage(pattern="/start")),
-    "bot_forward": (forward_command_handler, events.NewMessage(pattern="/forward")),
-    "bot_remove": (remove_command_handler, events.NewMessage(pattern="/remove")),
-    "bot_style": (style_command_handler, events.NewMessage(pattern="/style")),
-    "bot_help": (help_command_handler, events.NewMessage(pattern="/help")),
-}
+def get_events():
+    _ = get_command_prefix()
+
+    command_events = {
+        "start": (start_command_handler, events.NewMessage(pattern=f"{_}start")),
+        "forward": (forward_command_handler, events.NewMessage(pattern=f"{_}forward")),
+        "remove": (remove_command_handler, events.NewMessage(pattern=f"{_}remove")),
+        "style": (style_command_handler, events.NewMessage(pattern=f"{_}style")),
+        "help": (help_command_handler, events.NewMessage(pattern=f"{_}help")),
+    }
+
+    return command_events

tgcf/bot/utils.py

@@ -1,4 +1,5 @@
 """helper functions for the bot."""
+import logging
 from typing import List
 
 from telethon import events
@@ -32,9 +33,8 @@ def get_args(text: str) -> str:
             return ""
 
     prefix, args = splitted
-    print(prefix)
     args = args.strip()
-    print(args)
+    logging.info(f"Got command {prefix} with args {args}")
     return args
 
 
@@ -55,10 +55,13 @@ def display_forwards(forwards: List[Forward]) -> str:
 def remove_source(source, forwards: List[Forward]) -> List[Forward]:
     """Remove a source from forwards."""
     for i, forward in enumerate(forwards):
-        print(forward)
-        print(type(forward.source))
-        print(type(source))
         if forward.source == source:
             del forwards[i]
             return forwards
     raise ValueError("The source does not exist")
+
+
+def get_command_prefix():
+    if config.is_bot is None:
+        raise ValueError("config.is_bot is not set!")
+    return "/" if config.is_bot else "."