feat: add logging error sentry, version, fix torrent upload

conf/config.sample.yml

@@ -38,3 +38,7 @@ db:
 schedule:
   check_period: 10
   max_instances: 1
+
+sentry:
+  dsn: https://[email protected]/4504037633556480
+  environment: testing

pyproject.toml

@@ -12,7 +12,7 @@ python-telegram-bot = {extras = ["socks", "job-queue"], version = "^20.4"}
 PyYAML = "^6.0.1"
 aiosqlite = "^0.19.0"
 transmission-rpc = "^7.0.3"
-
+sentry-sdk = "^1.40.4"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.0.0"
@@ -30,7 +30,7 @@ line-length = 120
 select = ["F", "E", "W", "C90",
           "I", "N", "S", "B", "A",
           "ISC", "T20", "Q", "PTH"]
-ignore = ["A003"]
+ignore = ["A003", "C901", "E501"]
 
 
 [tool.black]
@@ -39,4 +39,6 @@ line-length = 120
 
 [tool.pyright]
 reportUnnecessaryTypeIgnoreComment="warning"
-exclude = ["docker"]
+exclude = ["docker"]
+
+[tool.poetry_bumpversion.file."transmission_telegram_bot/_version.py"]

transmission_telegram_bot/_version.py

@@ -0,0 +1 @@
+__version__ = "0.1.2"

transmission_telegram_bot/bot.py

@@ -1,12 +1,13 @@
 import argparse
 import sys
 import traceback
-from base64 import b64encode
+from base64 import b64decode, b64encode
 from functools import wraps
 from pathlib import Path
 from textwrap import dedent
 from typing import Coroutine
 
+import sentry_sdk
 from emoji import emojize
 from telegram import (
     InlineKeyboardButton,
@@ -23,6 +24,7 @@
 )
 
 import transmission_telegram_bot.tools as tools
+from transmission_telegram_bot import _version
 from transmission_telegram_bot.db import DB
 from transmission_telegram_bot.transmission import Transmission
 
@@ -147,7 +149,7 @@ async def download_torrent_logic(update, context):
     else:
         try:
             result = transmission.add_torrent(
-                torrent_data=context.user_data["torrent_data"],
+                torrent_data=b64decode(context.user_data["torrent_data"]),
                 download_dir=callback_data,
             )
         except Exception:
@@ -394,9 +396,7 @@ async def error_action(update, context):
         trace = "".join(traceback.format_tb(sys.exc_info()[2]))
         payload = ""
         if update.effective_user:
-            payload += f" with the user {(update.effective_user.id, update.effective_user.first_name)}"
-        if update.effective_chat:
-            payload += f" within the chat <i>{update.effective_chat.title}</i>"
+            payload += f" with the user {(update.effective_user.id, update.effective_user.first_name, update.effective_user.last_name)}"
         if update.effective_chat.username:
             payload += f" (@{update.effective_chat.username})"
         text = f"The error happened{payload}. The full traceback:\n\n{trace}"
@@ -487,6 +487,14 @@ def main():
         logger.error(f"Config file error: {exc}")
         sys.exit(1)
 
+    if "sentry" in cfg:
+        sentry_sdk.init(
+            dsn=cfg["sentry"]["dsn"],
+            environment=cfg["sentry"]["environment"],
+            release=_version.__version__,
+            attach_stacktrace=True,
+        )
+
     try:
         transmission = Transmission(
             address=cfg["transmission"]["address"],

transmission_telegram_bot/transmission.py

@@ -33,9 +33,10 @@ def remove_torrent(self, torrent_id: int, delete_data: bool = True):
         """Remove torrent by torrent id"""
         return self.tc.remove_torrent(ids=torrent_id, delete_data=delete_data)
 
-    def add_torrent(self, torrent_data: str = "", **kwargs) -> Torrent:
+    def add_torrent(self, torrent_data: bytes, **kwargs) -> Torrent:
         """Add torrent to transmission"""
         if "download_dir" in kwargs:
-            return self.tc.add_torrent(torrent=torrent_data, download_dir=kwargs.get("download_dir"))
+            torrent = self.tc.add_torrent(torrent=torrent_data, download_dir=kwargs.get("download_dir"))
+            return torrent
         else:
             return self.tc.add_torrent(torrent=torrent_data)