wi1-bot 1.3.15__py3-none-any.whl → 1.4.0__py3-none-any.whl

wi1_bot/_version.py

@@ -1,4 +1,16 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '1.3.15'
-__version_tuple__ = version_tuple = (1, 3, 15)
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple, Union
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+else:
+    VERSION_TUPLE = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+
+__version__ = version = '1.4.0'
+__version_tuple__ = version_tuple = (1, 4, 0)

wi1_bot/scripts/transcode_item.py

@@ -29,7 +29,7 @@ def main() -> None:
     queue.add(
         path=str(path),
         copy_all_streams=get_key(qp, "copy_all_streams"),
-        subtitle_languages=get_key(qp, "subtitle_languages"),
+        languages=get_key(qp, "languages"),
         video_codec=get_key(qp, "video_codec"),
         video_bitrate=get_key(qp, "video_bitrate"),
         audio_codec=get_key(qp, "audio_codec"),

wi1_bot/transcoder/transcode_queue.py

@@ -10,7 +10,7 @@ class TranscodeItem(Document):
     path = StringField(required=True)
 
     copy_all_streams = BooleanField(required=False)
-    subtitle_languages = StringField(required=False)
+    languages = StringField(required=False)
 
     video_codec = StringField(required=False)
     video_bitrate = IntField(required=False)
@@ -29,7 +29,7 @@ class TranscodeQueue:
         self,
         path: str,
         copy_all_streams: bool | None = None,
-        subtitle_languages: str | None = None,
+        languages: str | None = None,
         video_codec: str | None = None,
         video_bitrate: int | None = None,
         audio_codec: str | None = None,
@@ -40,7 +40,7 @@ class TranscodeQueue:
         TranscodeItem(
             path=path,
             copy_all_streams=copy_all_streams,
-            subtitle_languages=subtitle_languages,
+            languages=languages,
             video_codec=video_codec,
             video_bitrate=video_bitrate,
             audio_codec=audio_codec,

wi1_bot/transcoder/transcoder.py

@@ -6,6 +6,7 @@ import subprocess
 import threading
 from datetime import timedelta
 from time import sleep
+from typing import Any
 
 from wi1_bot import push
 from wi1_bot.arr import Radarr, Sonarr
@@ -196,7 +197,7 @@ class Transcoder:
     def _build_ffmpeg_command(
         self, item: TranscodeItem, transcode_to: pathlib.Path
     ) -> list[str]:
-        command = [
+        command: list[Any] = [
             "ffmpeg",
             "-hide_banner",
             "-y",
@@ -213,21 +214,21 @@ class Transcoder:
 
         command.extend(["-i", item.path])
 
+        langs: list[str] = []
+
+        if item.languages:
+            langs = item.languages.split(",")
+
         if item.copy_all_streams:
             command.extend(["-map", "0"])
         else:
             command.extend(["-map", "0:v:0"])
-            command.extend(["-map", "0:a:0?"])
 
-        subs_map = ["0:s?"]
-
-        if item.subtitle_languages:
-            subs_map = [
-                f"0:s:m:language:{lang}?" for lang in item.subtitle_languages.split(",")
-            ]
+            command.extend(["-map", "0:a:0?"])
+            command.extend(["-map", f"0:a:m:language:{lang}?"] for lang in langs)
 
-        for sub_map in subs_map:
-            command.extend(["-map", sub_map])
+            command.extend(["-map", "0:s?"])
+            command.extend(["-map", f"0:s:m:language:{lang}?"] for lang in langs)
 
         if item.video_codec:
             command.extend(["-vcodec", item.video_codec])
@@ -237,9 +238,9 @@ class Transcoder:
             command.extend(["-vcodec", "copy"])
 
         if item.video_bitrate:
-            command.extend(["-b:v", str(item.video_bitrate)])
-            command.extend(["-maxrate", str(item.video_bitrate * 2)])
-            command.extend(["-bufsize", str(item.video_bitrate * 2)])
+            command.extend(["-b:v", item.video_bitrate])
+            command.extend(["-maxrate", item.video_bitrate * 2])
+            command.extend(["-bufsize", item.video_bitrate * 2])
 
         if item.audio_codec:
             command.extend(["-acodec", item.audio_codec])
@@ -247,14 +248,18 @@ class Transcoder:
             command.extend(["-acodec", "copy"])
 
         if item.audio_channels:
-            command.extend(["-ac", str(item.audio_channels)])
+            command.extend(["-ac", item.audio_channels])
 
         if item.audio_bitrate:
-            command.extend(["-b:a", str(item.audio_bitrate)])
+            command.extend(["-b:a", item.audio_bitrate])
+
+        # TODO: use ffprobe to figure out if we can copy subs,
+        # or implement some form of retry functionality if ffmpeg errors out
+        command.extend(["-scodec", "copy"])
 
-        command.extend(["-scodec", "copy", str(transcode_to)])
+        command.extend([transcode_to])
 
-        return command
+        return [str(arg) for arg in command]
 
 
 if __name__ == "__main__":

wi1_bot/webhook.py

@@ -78,7 +78,7 @@ def on_download(req: dict[str, Any]) -> None:
             return None
 
     copy_all_streams = get_key(quality_options, "copy_all_streams")
-    subtitle_languages = get_key(quality_options, "subtitle_languages")
+    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")
@@ -89,7 +89,7 @@ def on_download(req: dict[str, Any]) -> None:
         path=str(path),
         content_id=content_id,
         copy_all_streams=copy_all_streams,
-        subtitle_languages=subtitle_languages,
+        languages=languages,
         video_codec=video_codec,
         video_bitrate=video_bitrate,
         audio_codec=audio_codec,
@@ -104,11 +104,9 @@ def index() -> Any:
         if request.json is None or "eventType" not in request.json:
             return "", 400
 
-        logger.debug(f"got request: {json.dumps(request.json, indent=4)}")
+        logger.debug(f"got request: {json.dumps(request.json)}")
 
-        if request.json["eventType"] == "Grab":
-            on_grab(request.json)
-        elif request.json["eventType"] == "Download":
+        if request.json["eventType"] == "Download":
             on_download(request.json)
     except Exception:
         logger.warning(

{wi1_bot-1.3.15.dist-info → wi1_bot-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wi1-bot
-Version: 1.3.15
+Version: 1.4.0
 Summary: Discord bot for Radarr/Sonarr integration
 Home-page: https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>

{wi1_bot-1.3.15.dist-info → wi1_bot-1.4.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 wi1_bot/__init__.py,sha256=11ozJKiUsqDCZ3_mcAHhGYUyGK_Unl54djVSBBExFB4,59
-wi1_bot/_version.py,sha256=EtRked8rU5xk8O8146KvLIleCzA3WplU_OyqyXNsIKI,162
+wi1_bot/_version.py,sha256=R8-T9fmURjcuoxYpHTAjyNAhgJPDtI2jogCjqYYkfCU,411
 wi1_bot/config.py,sha256=cWgpI7GUwqUed43RZhD1ruZT0A5RoN8VESbSo8uwr5A,2797
 wi1_bot/push.py,sha256=-Az8c21R3IZAkJVRQmWsbNXMfvBzzpc9pFTWsDy1mJE,789
-wi1_bot/webhook.py,sha256=UIvikJlimbBEkoYiSgAHnErOKy2PUIQesNmkU068i10,3815
+wi1_bot/webhook.py,sha256=SEKd11Hkcewf9Y_DvMKfo2TEP6wgqAGWUlGls7t0gso,3685
 wi1_bot/arr/__init__.py,sha256=ZIgkW24GBdS4sJmaiEIhueHOB6s2L8y2s9ahgp1USRI,86
 wi1_bot/arr/download.py,sha256=02AYFglnFdWSG8xj_TaJc6l2wjybyhUW6F97CnoyUFw,1381
 wi1_bot/arr/episode.py,sha256=j25ljy9hyTXFAEBeUQ4iozKP2YXpZyzauphaXa2oqh8,1057
@@ -18,13 +18,13 @@ wi1_bot/discord/cogs/series.py,sha256=AfUfWuU-vUlID-gW7GWu9w-GiwWzZ4Cxm49_FjgvJi
 wi1_bot/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wi1_bot/scripts/add_tag.py,sha256=mWwo8egk2Y5XRiQCpfkA11-3rcxZoD0JOJKxV0LguLk,586
 wi1_bot/scripts/start.py,sha256=vNa_iHkx10D5YWonyRW0f5nG8uE3_JtwJ-XZ-c0hWCs,2477
-wi1_bot/scripts/transcode_item.py,sha256=9b77OPGpCLIgQZZyp6TW53XtP4v5iGZqr8wpNuakUmY,1173
+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=2OhQpg__KklgXuZbKoYvzeMRgOWCBVsrqhXMLXerA00,1892
-wi1_bot/transcoder/transcoder.py,sha256=68zqf_hrJtcOmf4XfhSxlXfUE5DatvrnUr5TPBWwmQ4,8237
-wi1_bot-1.3.15.dist-info/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
-wi1_bot-1.3.15.dist-info/METADATA,sha256=iRFDEAEIUhnKo4ZET6M3e_fJPwBZhTaLCWvobyvT6jo,4613
-wi1_bot-1.3.15.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-wi1_bot-1.3.15.dist-info/entry_points.txt,sha256=G_NEW2uMHHw4pbmVwGZ6cZaBwGpdkv741jNYtuX-1vM,147
-wi1_bot-1.3.15.dist-info/top_level.txt,sha256=Q7mTnPLk80Td82YbjlBMO5tvXJoTFHhheHdmwc-c-7I,8
-wi1_bot-1.3.15.dist-info/RECORD,,
+wi1_bot/transcoder/transcode_queue.py,sha256=W7r2I7OD8QuxseCEb7_ddOvYXiBBLmKLvCs2IgJJ92I,1856
+wi1_bot/transcoder/transcoder.py,sha256=qPFXo9p2NS7gWrBNav8u9QBGE-QU-wiiUSvOefFozyw,8471
+wi1_bot-1.4.0.dist-info/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
+wi1_bot-1.4.0.dist-info/METADATA,sha256=Qf2WEeXsOS-2vCAbH_vx5wIPxa7zGSzmY82PQDSDdvY,4612
+wi1_bot-1.4.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+wi1_bot-1.4.0.dist-info/entry_points.txt,sha256=G_NEW2uMHHw4pbmVwGZ6cZaBwGpdkv741jNYtuX-1vM,147
+wi1_bot-1.4.0.dist-info/top_level.txt,sha256=Q7mTnPLk80Td82YbjlBMO5tvXJoTFHhheHdmwc-c-7I,8
+wi1_bot-1.4.0.dist-info/RECORD,,