wi1-bot 1.4.0__tar.gz → 1.4.2__tar.gz

wi1-bot-1.4.2/.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+fail_fast: false
+
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.0
+    hooks:
+      - id: ruff
+        args: [ --fix ]
+      - id: ruff-format
+
+  - repo: local
+    hooks:
+      - id: mypy
+        name: mypy
+        language: system
+        entry: mypy
+        pass_filenames: false
+        types: [python]

{wi1-bot-1.4.0 → wi1-bot-1.4.2}/PKG-INFO

@@ -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>

{wi1-bot-1.4.0 → wi1-bot-1.4.2}/config.yaml.template

@@ -2,6 +2,10 @@
 general:
   # log file directory, optional
   log_dir: /var/log/wi1-bot
+  # remote path mappings, optional
+  remote_path_mappings:
+    - remote: /data
+      local: /mnt/plex
 
 radarr:
   # radarr url you use to get to the dashboard
@@ -49,14 +53,13 @@ pushover:
 transcoding:
   # -hwaccel in ffmpeg, optional
   hwaccel: cuda
-  
   profiles:
     # name of profile must match name in radarr/sonarr
     good:
       # copy all video and audio streams
-      # default is only to copy the first stream and any streams with the languages listed below
       copy_all_streams: false
       # comma separated ISO 639-2 codes, optional
+      # currently only applies to choosing which subtitle streams to copy
       languages: eng,spa
       # -c:v in ffmpeg, optional
       video_codec: hevc_nvenc

{wi1-bot-1.4.0 → wi1-bot-1.4.2}/pyproject.toml

@@ -1,7 +1,3 @@
-[build-system]
-requires = ["setuptools==61.*", "setuptools-scm"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "wi1-bot"
 description = "Discord bot for Radarr/Sonarr integration"
@@ -16,25 +12,14 @@ classifiers = [
 dynamic = ["version"]
 requires-python = ">=3.10"
 dependencies = [
-    "discord.py==2.3.1",
-    "Flask==2.3.2",
-    "mongoengine==0.27.0",
+    "discord.py==2.3.2",
+    "Flask==3.0.2",
+    "mongoengine==0.28.0",
     "pyarr==5.2.0",
     "PyYAML==6.0.1",
     "requests==2.31.0"
 ]
 
-[project.optional-dependencies]
-dev = [
-    "black==23.3.0",
-    "flake8==6.0.0",
-    "isort==5.12.0",
-    "mongo-types==0.15.1",
-    "mypy==1.2.0",
-    "pre-commit==3.2.2",
-    "types-PyYAML==6.0.12.9",
-]
-
 [project.urls]
 Homepage = "https://github.com/wthueb/wi1-bot"
 
@@ -43,27 +28,28 @@ wi1-bot = "wi1_bot.scripts.start:main"
 transcode-item = "wi1_bot.scripts.transcode_item:main"
 add-tag = "wi1_bot.scripts.add_tag:main"
 
+[project.optional-dependencies]
+dev = [
+    "mongo-types==0.15.1",
+    "mypy==1.3.0",
+    "pre-commit==3.6.2",
+    "ruff==0.3.0",
+    "types-PyYAML==6.0.12.12",
+]
+
+[build-system]
+requires = ["setuptools==61.*", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
 [tool.setuptools]
 packages = ["wi1_bot"]
 
 [tool.setuptools_scm]
 write_to = "wi1_bot/_version.py"
 
+[tool.ruff.lint]
+select = ["E", "F", "I"]
+
 [tool.mypy]
 packages = "wi1_bot"
 strict = true
-
-[[tool.mypy.overrides]]
-module = [
-    "pushover",
-    "pyarr",
-]
-ignore_missing_imports = true
-
-[tool.black]
-line-length = 88
-target-version = ["py310"]
-
-[tool.isort]
-profile = "black"
-known_first_party = ["wi1_bot"]

{wi1-bot-1.4.0 → wi1-bot-1.4.2}/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-1.4.0 → wi1-bot-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-1.4.0 → wi1-bot-1.4.2}/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-1.4.0 → wi1-bot-1.4.2}/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 → wi1-bot-1.4.2}/wi1_bot.egg-info/PKG-INFO

@@ -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>

{wi1-bot-1.4.0 → wi1-bot-1.4.2}/wi1_bot.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.flake8
 .gitignore
 .pre-commit-config.yaml
 LICENSE

wi1-bot-1.4.2/wi1_bot.egg-info/requires.txt

@@ -0,0 +1,13 @@
+discord.py==2.3.2
+Flask==3.0.2
+mongoengine==0.28.0
+pyarr==5.2.0
+PyYAML==6.0.1
+requests==2.31.0
+
+[dev]
+mongo-types==0.15.1
+mypy==1.3.0
+pre-commit==3.6.2
+ruff==0.3.0
+types-PyYAML==6.0.12.12

wi1-bot-1.4.0/.flake8

@@ -1,4 +0,0 @@
-[flake8]
-max-line-length = 88
-extend-ignore = E203
-max-complexity = 12

wi1-bot-1.4.0/.pre-commit-config.yaml

@@ -1,29 +0,0 @@
-fail_fast: false
-
-repos:
-  - repo: local
-    hooks:
-      - id: isort
-        name: isort
-        language: system
-        entry: isort
-        types: [python]
-
-      - id: black
-        name: black
-        language: system
-        entry: black
-        types: [python]
-
-      - id: flake8
-        name: flake8
-        language: system
-        entry: flake8
-        types: [python]
-
-      - id: mypy
-        name: mypy
-        language: system
-        entry: mypy
-        pass_filenames: false
-        types: [python]

wi1-bot-1.4.0/wi1_bot.egg-info/requires.txt

@@ -1,15 +0,0 @@
-discord.py==2.3.1
-Flask==2.3.2
-mongoengine==0.27.0
-pyarr==5.2.0
-PyYAML==6.0.1
-requests==2.31.0
-
-[dev]
-black==23.3.0
-flake8==6.0.0
-isort==5.12.0
-mongo-types==0.15.1
-mypy==1.2.0
-pre-commit==3.2.2
-types-PyYAML==6.0.12.9