wi1-bot 2.0.0__py3-none-any.whl → 2.0.2__py3-none-any.whl

wi1_bot/config.py

@@ -48,12 +48,13 @@ class DiscordConfig(TypedDict):
 
 
 class TranscodingProfile(TypedDict):
-    copy_all_streams: bool
     video_codec: NotRequired[str]
     video_bitrate: NotRequired[int]
     audio_codec: NotRequired[str]
     audio_channels: NotRequired[int]
     audio_bitrate: NotRequired[str]
+    copy_all_streams: NotRequired[bool]
+    languages: NotRequired[str]
 
 
 class TranscodingConfig(TypedDict):

wi1_bot/transcoder/transcoder.py

@@ -1,5 +1,6 @@
 import logging
 import pathlib
+import re
 import shlex
 import shutil
 import subprocess
@@ -14,6 +15,14 @@ from wi1_bot.config import config
 
 from .transcode_queue import TranscodeItem, queue
 
+# https://github.com/Radarr/Radarr/blob/e29be26fc9a5570bdf37a1b9504b3c0162be7715/src/NzbDrone.Core/Parser/Parser.cs#L134
+CLEAN_RELEASE_GROUP_REGEX = re.compile(
+    r"(-(RP|1|NZBGeek|Obfuscated|Obfuscation|Scrambled|sample|Pre|postbot|xpost|Rakuv[a-z0-9]*|WhiteRev|BUYMORE|AsRequested|AlternativeToRequested|GEROV|Z0iDS3N|Chamele0n|4P|4Planet|AlteZachen|RePACKPOST))+",
+    re.IGNORECASE,
+)
+# https://github.com/Radarr/Radarr/blob/e29be26fc9a5570bdf37a1b9504b3c0162be7715/src/NzbDrone.Core/Parser/Parser.cs#L138
+CLEAN_TORRENT_SUFFIX_REGEX = re.compile(r"\[(?:ettv|rartv|rarbg|cttv|publichd)\]", re.IGNORECASE)
+
 
 class SignalInterrupt(Exception):
     pass
@@ -76,7 +85,10 @@ class Transcoder:
         tmp_folder = pathlib.Path("/tmp/wi1-bot")
         tmp_folder.mkdir(exist_ok=True)
 
-        transcode_to = tmp_folder / f"{path.stem}-TRANSCODED.mkv"
+        filename = path.stem
+        filename = CLEAN_RELEASE_GROUP_REGEX.sub("", filename)
+        filename = CLEAN_TORRENT_SUFFIX_REGEX.sub("", filename)
+        transcode_to = tmp_folder / f"{filename}-TRANSCODED.mkv"
 
         command = self._build_ffmpeg_command(item, transcode_to)
 
@@ -273,4 +285,4 @@ class Transcoder:
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
     t = Transcoder()
-    t._worker()
+    t._worker()  # pyright: ignore[reportPrivateUsage]

wi1_bot/webhook.py

@@ -66,20 +66,13 @@ def on_download(req: dict[str, Any]) -> None:
 
     quality_options = config["transcoding"]["profiles"][quality_profile]
 
-    # python 3.11: TranscodingProfile and typing.LiteralString
-    def get_key(d: Any, k: str) -> Any:
-        try:
-            return d[k]
-        except KeyError:
-            return None
-
-    copy_all_streams = get_key(quality_options, "copy_all_streams")
-    languages = get_key(quality_options, "languages")
-    video_codec = get_key(quality_options, "video_codec")
-    video_bitrate = get_key(quality_options, "video_bitrate")
-    audio_codec = get_key(quality_options, "audio_codec")
-    audio_channels = get_key(quality_options, "audio_channels")
-    audio_bitrate = get_key(quality_options, "audio_bitrate")
+    copy_all_streams = quality_options.get("copy_all_streams", None)
+    languages = quality_options.get("languages", None)
+    video_codec = quality_options.get("video_codec", None)
+    video_bitrate = quality_options.get("video_bitrate", None)
+    audio_codec = quality_options.get("audio_codec", None)
+    audio_channels = quality_options.get("audio_channels", None)
+    audio_bitrate = quality_options.get("audio_bitrate", None)
 
     transcoder.queue.add(
         path=str(path),

{wi1_bot-2.0.0.dist-info → wi1_bot-2.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wi1-bot
-Version: 2.0.0
+Version: 2.0.2
 Summary: Discord bot for Radarr/Sonarr integration
 Project-URL: Homepage, https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>
@@ -39,6 +39,7 @@ Requires Python >=3.11.
 
 ### TODO
 
+- use overseerr for search/requests
 - use sqlite
 - dynamically copy streams
   - i.e. if mov_text in input, -c:s srt

{wi1_bot-2.0.0.dist-info → wi1_bot-2.0.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 wi1_bot/__init__.py,sha256=dYlvBffClqwInBRSxSAoJHuujuh4yuPderFR4n7Odko,161
-wi1_bot/config.py,sha256=2gN9Hx2-nl2L4n3tLlW-XmmKMxL6jOSGMD4Re9um0jI,2181
+wi1_bot/config.py,sha256=ndL3BxiOpXiDQGYNEIPtuusekS25miPFQrEphINxnsQ,2226
 wi1_bot/push.py,sha256=6EwQ1eXcJnQimAi0dOm1_t7Am056zob-1-EOkytGZWg,783
-wi1_bot/webhook.py,sha256=11rzmxhXnDeXWlgEnOLh26WP79rLeG71HaDvKUXuUcA,3665
+wi1_bot/webhook.py,sha256=xTN_-Ivdt1ANJFWkhF4W8csyqwfBNH33d-eWbsWOPS4,3482
 wi1_bot/arr/__init__.py,sha256=-6UE81yY6OhD6-nbLindChE_HlwsNRuL8JijUmo_Q6k,149
 wi1_bot/arr/download.py,sha256=02AYFglnFdWSG8xj_TaJc6l2wjybyhUW6F97CnoyUFw,1381
 wi1_bot/arr/episode.py,sha256=0K_auUYwkBBd_Ludc4-4z7lSW8HRQ3mchFQ7FR10JSU,1041
@@ -22,9 +22,9 @@ wi1_bot/scripts/start.py,sha256=TfEKCxS_95L5ZTi8OY45ywsgNnKlsqLDN6YesowifvM,2527
 wi1_bot/scripts/transcode_item.py,sha256=21MeeIZ9wIRhAY-FOEgOdPsg6YOLlSUj59r8NkTfixw,1155
 wi1_bot/transcoder/__init__.py,sha256=B4xr82UtIFc3tyy_MEZdZKMukYW0yejPnfsGowaTIM0,105
 wi1_bot/transcoder/transcode_queue.py,sha256=W7r2I7OD8QuxseCEb7_ddOvYXiBBLmKLvCs2IgJJ92I,1856
-wi1_bot/transcoder/transcoder.py,sha256=2wIgDPkrrXcrSjA1HpYGd0RX5wonw1zfltJqGzCaorM,9163
-wi1_bot-2.0.0.dist-info/METADATA,sha256=Bwt1ZBD6ZLxmbMt3rn5sU2yl-JMMxYlxYCAfeGnO4bY,3663
-wi1_bot-2.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wi1_bot-2.0.0.dist-info/entry_points.txt,sha256=pF5EawAQsUNMHs5exynpNdRq9g4dODg-RaPkx2MyYLU,184
-wi1_bot-2.0.0.dist-info/licenses/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
-wi1_bot-2.0.0.dist-info/RECORD,,
+wi1_bot/transcoder/transcoder.py,sha256=bU2oKQckBWWppJOH9W8vk_ql2uz3qs8O63wAYKH1bbk,9978
+wi1_bot-2.0.2.dist-info/METADATA,sha256=Oy614tRy_DoW7yAi7dKmIFtMFXP714GZ1iYm_Vr-P6U,3699
+wi1_bot-2.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wi1_bot-2.0.2.dist-info/entry_points.txt,sha256=pF5EawAQsUNMHs5exynpNdRq9g4dODg-RaPkx2MyYLU,184
+wi1_bot-2.0.2.dist-info/licenses/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
+wi1_bot-2.0.2.dist-info/RECORD,,