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

wi1_bot/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.0'
-__version_tuple__ = version_tuple = (1, 4, 0)
+__version__ = version = '1.4.2'
+__version_tuple__ = version_tuple = (1, 4, 2)

wi1_bot/config.py

@@ -99,8 +99,14 @@ class TranscodingConfig(TranscodingConfigOptional):
     profiles: dict[str, TranscodingProfile]
 
 
+class RemotePathMapping(TypedDict):
+    remote: str
+    local: str
+
+
 class GeneralConfigOptional(TypedDict, total=False):
     log_dir: str
+    remote_path_mappings: list[RemotePathMapping]
 
 
 class GeneralConfig(GeneralConfigOptional):

wi1_bot/transcoder/transcoder.py

@@ -219,16 +219,24 @@ class Transcoder:
         if item.languages:
             langs = item.languages.split(",")
 
+        # TODO: use ffprobe to figure out what streams we should copy
+        # always copy first video stream
+        # always copy first audio stream
+        # always copy all subtitle streams
+        # if languages is specified in the config:
+        #     copy all audio streams in one of those languages
+        # ffprobe -show_streams -print_format json {input_file} 2>/dev/null
         if item.copy_all_streams:
             command.extend(["-map", "0"])
         else:
             command.extend(["-map", "0:v:0"])
 
             command.extend(["-map", "0:a:0?"])
-            command.extend(["-map", f"0:a:m:language:{lang}?"] for lang in langs)
 
-            command.extend(["-map", "0:s?"])
-            command.extend(["-map", f"0:s:m:language:{lang}?"] for lang in langs)
+            if langs:
+                command.extend([["-map", f"0:s:m:language:{lang}?"] for lang in langs])
+            else:
+                command.extend(["-map", "0:s?"])
 
         if item.video_codec:
             command.extend(["-vcodec", item.video_codec])
@@ -253,8 +261,6 @@ class Transcoder:
         if 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([transcode_to])

wi1_bot/webhook.py

@@ -8,7 +8,7 @@ from flask import Flask, request
 
 from wi1_bot import push, transcoder
 from wi1_bot.arr import Radarr, Sonarr
-from wi1_bot.config import config
+from wi1_bot.config import RemotePathMapping, config
 
 app = Flask(__name__)
 
@@ -26,6 +26,37 @@ def on_grab(req: dict[str, Any]) -> None:
     )
 
 
+def replace_remote_paths(path: pathlib.Path) -> pathlib.Path:
+    if "general" not in config or "remote_path_mappings" not in config["general"]:
+        return path
+
+    mappings = config["general"]["remote_path_mappings"]
+
+    most_specific: RemotePathMapping | None = None
+
+    for mapping in mappings:
+        if path.is_relative_to(mapping["remote"]):
+            mapping_len = len(pathlib.Path(mapping["remote"]).parts)
+            most_specific_len = (
+                len(pathlib.Path(most_specific["remote"]).parts)
+                if most_specific is not None
+                else 0
+            )
+
+            if mapping_len > most_specific_len:
+                most_specific = mapping
+
+    if most_specific is not None:
+        remote_path = path
+        path = pathlib.Path(most_specific["local"]) / path.relative_to(
+            most_specific["remote"]
+        )
+
+        logger.debug(f"replaced remote path mapping: {remote_path} -> {path}")
+
+    return path
+
+
 def on_download(req: dict[str, Any]) -> None:
     path: pathlib.Path
     content_id: int
@@ -65,6 +96,8 @@ def on_download(req: dict[str, Any]) -> None:
     else:
         raise ValueError("unknown download request")
 
+    path = replace_remote_paths(path)
+
     try:
         quality_options = config["transcoding"]["profiles"][quality_profile]
     except KeyError:
@@ -119,10 +152,10 @@ def index() -> Any:
 def start() -> None:
     logger.info("starting webhook listener")
 
-    t = threading.Thread(target=app.run, kwargs={"host": "localhost", "port": 9000})
+    t = threading.Thread(target=app.run, kwargs={"host": "0.0.0.0", "port": 9000})
     t.daemon = True
     t.start()
 
 
 if __name__ == "__main__":
-    app.run(host="localhost", port=9000)
+    app.run(host="0.0.0.0", port=9000)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wi1-bot
-Version: 1.4.0
+Version: 1.4.2
 Summary: Discord bot for Radarr/Sonarr integration
 Home-page: https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>
@@ -34,20 +34,18 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: discord.py ==2.3.1
-Requires-Dist: Flask ==2.3.2
-Requires-Dist: mongoengine ==0.27.0
+Requires-Dist: discord.py ==2.3.2
+Requires-Dist: Flask ==3.0.2
+Requires-Dist: mongoengine ==0.28.0
 Requires-Dist: pyarr ==5.2.0
 Requires-Dist: PyYAML ==6.0.1
 Requires-Dist: requests ==2.31.0
 Provides-Extra: dev
-Requires-Dist: black ==23.3.0 ; extra == 'dev'
-Requires-Dist: flake8 ==6.0.0 ; extra == 'dev'
-Requires-Dist: isort ==5.12.0 ; extra == 'dev'
 Requires-Dist: mongo-types ==0.15.1 ; extra == 'dev'
-Requires-Dist: mypy ==1.2.0 ; extra == 'dev'
-Requires-Dist: pre-commit ==3.2.2 ; extra == 'dev'
-Requires-Dist: types-PyYAML ==6.0.12.9 ; extra == 'dev'
+Requires-Dist: mypy ==1.3.0 ; extra == 'dev'
+Requires-Dist: pre-commit ==3.6.2 ; extra == 'dev'
+Requires-Dist: ruff ==0.3.0 ; extra == 'dev'
+Requires-Dist: types-PyYAML ==6.0.12.12 ; extra == 'dev'
 
 # wi1-bot
 

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

@@ -1,8 +1,8 @@
 wi1_bot/__init__.py,sha256=11ozJKiUsqDCZ3_mcAHhGYUyGK_Unl54djVSBBExFB4,59
-wi1_bot/_version.py,sha256=R8-T9fmURjcuoxYpHTAjyNAhgJPDtI2jogCjqYYkfCU,411
-wi1_bot/config.py,sha256=cWgpI7GUwqUed43RZhD1ruZT0A5RoN8VESbSo8uwr5A,2797
+wi1_bot/_version.py,sha256=tX44urJsC0QN5SJ51xsM0HeojA_8Xx7NXFEGAkYlNE4,411
+wi1_bot/config.py,sha256=YmO_wLHMBm0PmFEeRru4Y3H4B1a2heDbSHU_sEcgfHs,2916
 wi1_bot/push.py,sha256=-Az8c21R3IZAkJVRQmWsbNXMfvBzzpc9pFTWsDy1mJE,789
-wi1_bot/webhook.py,sha256=SEKd11Hkcewf9Y_DvMKfo2TEP6wgqAGWUlGls7t0gso,3685
+wi1_bot/webhook.py,sha256=cVp6USg1vbfL05TPQSDIUUYPHWDjuPGb1IGsqImao6s,4713
 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
@@ -21,10 +21,10 @@ wi1_bot/scripts/start.py,sha256=vNa_iHkx10D5YWonyRW0f5nG8uE3_JtwJ-XZ-c0hWCs,2477
 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=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,,
+wi1_bot/transcoder/transcoder.py,sha256=3MiOnQaXHmS6oQsNEygd9-SeGH7nIipnTK2f7BJFB6Q,8684
+wi1_bot-1.4.2.dist-info/LICENSE,sha256=6V4_mQoPoLJl77_WMsQRQMDG2mnIhDUdfCmMkqM9Qwc,1072
+wi1_bot-1.4.2.dist-info/METADATA,sha256=6LkLpNIuvRfDesYyFwIgc-Bc3_SonPsSfB3NMlnG4Og,4517
+wi1_bot-1.4.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wi1_bot-1.4.2.dist-info/entry_points.txt,sha256=G_NEW2uMHHw4pbmVwGZ6cZaBwGpdkv741jNYtuX-1vM,147
+wi1_bot-1.4.2.dist-info/top_level.txt,sha256=Q7mTnPLk80Td82YbjlBMO5tvXJoTFHhheHdmwc-c-7I,8
+wi1_bot-1.4.2.dist-info/RECORD,,

{wi1_bot-1.4.0.dist-info → wi1_bot-1.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any