wi1-bot 1.4.9__tar.gz → 1.4.11__tar.gz

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.1
 Name: wi1-bot
-Version: 1.4.9
+Version: 1.4.11
 Summary: Discord bot for Radarr/Sonarr integration
-Home-page: https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>
 License: MIT License
         
@@ -27,7 +26,6 @@ License: MIT License
         SOFTWARE.
         
 Project-URL: Homepage, https://github.com/wthueb/wi1-bot
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
@@ -57,6 +55,11 @@ Requires Python >=3.10.
 
 ### TODO
 
+- https://github.com/kkroening/ffmpeg-python
+  - `ffmpeg -codecs`, `ffmpeg -hwaccels`
+- ffmpeg filters for deinterlacing, scaling
+  - https://docs.nvidia.com/video-technologies/video-codec-sdk/12.0/ffmpeg-with-nvidia-gpu/index.html#hwaccel-transcode-with-scaling
+- ffmpeg remove bad subtitle streams
 - use sqlite
 - have config.discord.users be a dict with 'quotas' and 'name' for *arr tags
 - Better pushover notifications
@@ -87,5 +90,3 @@ Requires Python >=3.10.
   - Tautulli API (get_history) to show who has already seen the movie
 - User leaderboard
   - movies/shows added, Tautulli watch counts
-
-

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/README.md

@@ -19,6 +19,11 @@ Requires Python >=3.10.
 
 ### TODO
 
+- https://github.com/kkroening/ffmpeg-python
+  - `ffmpeg -codecs`, `ffmpeg -hwaccels`
+- ffmpeg filters for deinterlacing, scaling
+  - https://docs.nvidia.com/video-technologies/video-codec-sdk/12.0/ffmpeg-with-nvidia-gpu/index.html#hwaccel-transcode-with-scaling
+- ffmpeg remove bad subtitle streams
 - use sqlite
 - have config.discord.users be a dict with 'quotas' and 'name' for *arr tags
 - Better pushover notifications

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/pyproject.toml

@@ -14,7 +14,7 @@ requires-python = ">=3.10"
 dependencies = [
     "discord.py==2.3.2",
     "Flask==3.0.2",
-    "mongoengine==0.28.1",
+    "mongoengine==0.29.1",
     "pyarr==5.2.0",
     "PyYAML==6.0.1",
     "requests==2.31.0"
@@ -39,7 +39,7 @@ dev = [
 ]
 
 [build-system]
-requires = ["setuptools==61.*", "setuptools-scm"]
+requires = ["setuptools==64.*", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
@@ -48,6 +48,9 @@ packages = ["wi1_bot"]
 [tool.setuptools_scm]
 write_to = "wi1_bot/_version.py"
 
+[tool.ruff]
+line-length = 100
+
 [tool.ruff.lint]
 select = ["E", "F", "I"]
 

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.9'
-__version_tuple__ = version_tuple = (1, 4, 9)
+__version__ = version = '1.4.11'
+__version_tuple__ = version_tuple = (1, 4, 11)

wi1-bot-1.4.11/wi1_bot/arr/__init__.py

@@ -0,0 +1,5 @@
+from .radarr import Radarr
+from .sonarr import Sonarr
+from .util import replace_remote_paths
+
+__all__ = ["Radarr", "Sonarr", "replace_remote_paths"]

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/arr/episode.py

@@ -21,8 +21,7 @@ class Episode:
         self.imdb_id: str = series_imdb_id
 
         self.full_title: str = (
-            f"{self.series_title} S{self.season_num:02d}E{self.ep_num:02d} -"
-            f" {self.ep_title}"
+            f"{self.series_title} S{self.season_num:02d}E{self.ep_num:02d} - {self.ep_title}"
         )
 
         if self.imdb_id:

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/arr/radarr.py

@@ -33,9 +33,7 @@ class Radarr:
 
         user_movie_ids = tag_detail["movieIds"]
 
-        return [
-            Movie(m) for m in possible_movies if "id" in m and m["id"] in user_movie_ids
-        ]
+        return [Movie(m) for m in possible_movies if "id" in m and m["id"] in user_movie_ids]
 
     def add_movie(self, movie: Movie, profile: str = "good") -> bool:
         if self._radarr.get_movie(movie.tmdb_id, tmdb=True):

wi1-bot-1.4.11/wi1_bot/arr/util.py

@@ -0,0 +1,31 @@
+import logging
+import pathlib
+
+from wi1_bot.config import RemotePathMapping, config
+
+
+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"])
+
+        logging.getLogger(__name__).debug(f"replaced remote path mapping: {remote_path} -> {path}")
+
+    return path

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/discord/bot.py

@@ -26,9 +26,7 @@ async def check_channel(ctx: commands.Context[Any]) -> bool:
 
 
 @bot.event
-async def on_command_error(
-    ctx: commands.Context[Any], error: commands.CommandError
-) -> None:
+async def on_command_error(ctx: commands.Context[Any], error: commands.CommandError) -> None:
     match error:
         case commands.CommandNotFound() | commands.CheckFailure():
             pass
@@ -42,9 +40,7 @@ async def on_command_error(
             await reply(ctx.message, str(error))
         case _:
             logger.error(
-                "".join(
-                    traceback.format_exception(type(error), error, error.__traceback__)
-                )
+                "".join(traceback.format_exception(type(error), error, error.__traceback__))
             )
 
             await reply(
@@ -71,10 +67,10 @@ async def before_invoke(ctx: commands.Context[Any]) -> None:
     logger.info(f"got command from {ctx.message.author}: {ctx.message.content}")
 
 
-@commands.cooldown(1, 10)  # type: ignore
-@bot.command(
+@bot.command(  # type: ignore[arg-type]
     name="downloads", aliases=["queue", "q"], help="see the status of movie downloads"
 )
+@commands.cooldown(1, 10)
 async def downloads_cmd(ctx: commands.Context[Any]) -> None:
     async with ctx.typing():
         queue = radarr.get_downloads() + sonarr.get_downloads()
@@ -88,8 +84,8 @@ async def downloads_cmd(ctx: commands.Context[Any]) -> None:
     await reply(ctx.message, "\n\n".join(map(str, queue)), title="download progress")
 
 
-@commands.cooldown(1, 60, commands.BucketType.user)  # type: ignore
-@bot.command(name="quota", help="see your used space on the plex")
+@bot.command(name="quota", help="see your used space on the plex")  # type: ignore[arg-type]
+@commands.cooldown(1, 60, commands.BucketType.user)
 async def quota_cmd(ctx: commands.Context[Any]) -> None:
     async with ctx.typing():
         used = (
@@ -99,10 +95,8 @@ async def quota_cmd(ctx: commands.Context[Any]) -> None:
 
         maximum: float = 0
 
-        try:
+        if "quotas" in config["discord"]:
             maximum = config["discord"]["quotas"][ctx.message.author.id]
-        except KeyError:
-            pass
 
         pct = used / maximum * 100 if maximum != 0 else 100
 
@@ -114,15 +108,15 @@ async def quota_cmd(ctx: commands.Context[Any]) -> None:
     await reply(ctx.message, msg)
 
 
-@commands.cooldown(1, 60)  # type: ignore
-@bot.command(name="quotas", help="see everyone's used space on the plex")
+@bot.command(name="quotas", help="see everyone's used space on the plex")  # type: ignore[arg-type]
+@commands.cooldown(1, 60)
 async def quotas_cmd(ctx: commands.Context[Any]) -> None:
-    try:
-        quotas = config["discord"]["quotas"]
-    except ValueError:
+    if "quotas" not in config["discord"]:
         await reply(ctx.message, "quotas are not implemented here")
         return
 
+    quotas = config["discord"]["quotas"]
+
     if not quotas:
         await reply(ctx.message, "quotas are not implemented here")
 
@@ -130,9 +124,7 @@ async def quotas_cmd(ctx: commands.Context[Any]) -> None:
         msg = []
 
         for user_id, total in quotas.items():
-            used = (
-                radarr.get_quota_amount(user_id) + sonarr.get_quota_amount(user_id)
-            ) / 1024**3
+            used = (radarr.get_quota_amount(user_id) + sonarr.get_quota_amount(user_id)) / 1024**3
 
             pct = used / total * 100 if total != 0 else 100
 
@@ -147,11 +139,9 @@ async def quotas_cmd(ctx: commands.Context[Any]) -> None:
     )
 
 
-@bot.command(name="addtag", help="add a user tag")  # type: ignore
+@bot.command(name="addtag", help="add a user tag")  # type: ignore[arg-type]
 @commands.has_role("plex-admin")
-async def addtag_cmd(
-    ctx: commands.Context[Any], name: str, user: discord.Member
-) -> None:
+async def addtag_cmd(ctx: commands.Context[Any], name: str, user: discord.Member) -> None:
     tag = f"{name}: {user.id}"
 
     radarr.create_tag(tag)

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/discord/cogs/movie.py

@@ -18,9 +18,7 @@ class MovieCog(commands.Cog):
         self.radarr = Radarr(config["radarr"]["url"], config["radarr"]["api_key"])
 
     @commands.command(name="addmovie", help="add a movie to the plex")
-    async def addmovie_cmd(
-        self, ctx: commands.Context[Any], *, query: str = ""
-    ) -> None:
+    async def addmovie_cmd(self, ctx: commands.Context[Any], *, query: str = "") -> None:
         if not query:
             await reply(ctx.message, "usage: !addmovie KEYWORDS...")
             return
@@ -36,9 +34,7 @@ class MovieCog(commands.Cog):
                 )
                 return
 
-        resp, to_add = await select_from_list(
-            self.bot, ctx.message, "addmovie", potential
-        )
+        resp, to_add = await select_from_list(self.bot, ctx.message, "addmovie", potential)
 
         if not to_add:
             return
@@ -48,16 +44,12 @@ class MovieCog(commands.Cog):
         for movie in to_add:
             if not self.radarr.add_movie(movie):
                 if self.radarr.movie_downloaded(movie):
-                    await reply(
-                        resp, f"{movie} is already DOWNLOADED on the plex (idiot)"
-                    )
+                    await reply(resp, f"{movie} is already DOWNLOADED on the plex (idiot)")
                 else:
                     await reply(resp, f"{movie} is already on the plex (idiot)")
                 continue
 
-            self.logger.info(
-                f"{ctx.message.author.name} has added the movie {movie.full_title}"
-            )
+            self.logger.info(f"{ctx.message.author.name} has added the movie {movie.full_title}")
 
             push.send(
                 f"{ctx.message.author.name} has added the movie {movie.full_title}",
@@ -74,18 +66,12 @@ class MovieCog(commands.Cog):
         await asyncio.sleep(10)
 
         if not self.radarr.add_tag(added, ctx.message.author.id):
-            push.send(
-                f"get {ctx.message.author.name} a tag", title="tag needed", priority=1
-            )
+            push.send(f"get {ctx.message.author.name} a tag", title="tag needed", priority=1)
 
-            await ctx.send(
-                f"hey <@!{config['discord']['admin_id']}> get this guy a tag"
-            )
+            await ctx.send(f"hey <@!{config['discord']['admin_id']}> get this guy a tag")
 
     @commands.command(name="delmovie", help="delete a movie from the plex")
-    async def delmovie_cmd(
-        self, ctx: commands.Context[Any], *, query: str = ""
-    ) -> None:
+    async def delmovie_cmd(self, ctx: commands.Context[Any], *, query: str = "") -> None:
         if not query:
             await reply(ctx.message, "usage: !delmovie KEYWORDS...")
             return
@@ -102,9 +88,7 @@ class MovieCog(commands.Cog):
                     )
                     return
             else:
-                potential = self.radarr.lookup_user_library(
-                    query, ctx.message.author.id
-                )[:50]
+                potential = self.radarr.lookup_user_library(query, ctx.message.author.id)[:50]
 
                 if not potential:
                     await reply(
@@ -114,9 +98,7 @@ class MovieCog(commands.Cog):
                     )
                     return
 
-        resp, to_delete = await select_from_list(
-            self.bot, ctx.message, "delmovie", potential
-        )
+        resp, to_delete = await select_from_list(self.bot, ctx.message, "delmovie", potential)
 
         if not to_delete:
             return
@@ -124,9 +106,7 @@ class MovieCog(commands.Cog):
         for movie in to_delete:
             self.radarr.del_movie(movie)
 
-            self.logger.info(
-                f"{ctx.message.author.name} has deleted the movie {movie.full_title}"
-            )
+            self.logger.info(f"{ctx.message.author.name} has deleted the movie {movie.full_title}")
 
             push.send(
                 f"{ctx.message.author.name} has deleted the movie {movie.full_title}",

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/discord/cogs/series.py

@@ -46,9 +46,7 @@ class SeriesCog(commands.Cog):
                 )
                 return
 
-        resp, to_add = await select_from_list(
-            self.bot, ctx.message, "addshow", potential
-        )
+        resp, to_add = await select_from_list(self.bot, ctx.message, "addshow", potential)
 
         if not to_add:
             return
@@ -58,16 +56,12 @@ class SeriesCog(commands.Cog):
         for series in to_add:
             if not self.sonarr.add_series(series):
                 if self.sonarr.series_downloaded(series):
-                    await reply(
-                        resp, f"{series} is already DOWNLOADED on the plex (idiot)"
-                    )
+                    await reply(resp, f"{series} is already DOWNLOADED on the plex (idiot)")
                 else:
                     await reply(resp, f"{series} is already on the plex (idiot)")
                 continue
 
-            self.logger.info(
-                f"{ctx.message.author.name} has added the show {series.full_title}"
-            )
+            self.logger.info(f"{ctx.message.author.name} has added the show {series.full_title}")
 
             push.send(
                 f"{ctx.message.author.name} has added the show {series.full_title}",
@@ -91,17 +85,13 @@ class SeriesCog(commands.Cog):
                     priority=1,
                 )
 
-                await ctx.send(
-                    f"hey <@!{config['discord']['admin_id']}> get this guy a tag"
-                )
+                await ctx.send(f"hey <@!{config['discord']['admin_id']}> get this guy a tag")
 
                 return
 
     @commands.command(name="delshow", help="delete a show from the plex")
     @commands.has_any_role("plex-admin", "plex-shows")
-    async def delshow_command(
-        self, ctx: commands.Context[Any], *, query: str = ""
-    ) -> None:
+    async def delshow_command(self, ctx: commands.Context[Any], *, query: str = "") -> None:
         if not query:
             await reply(ctx.message, "usage: !delshow KEYWORDS...")
             return
@@ -118,9 +108,7 @@ class SeriesCog(commands.Cog):
                     )
                     return
             else:
-                potential = self.sonarr.lookup_user_library(
-                    query, ctx.message.author.id
-                )[:50]
+                potential = self.sonarr.lookup_user_library(query, ctx.message.author.id)[:50]
 
                 if not potential:
                     await reply(
@@ -130,9 +118,7 @@ class SeriesCog(commands.Cog):
                     )
                     return
 
-        resp, to_delete = await select_from_list(
-            self.bot, ctx.message, "delshow", potential
-        )
+        resp, to_delete = await select_from_list(self.bot, ctx.message, "delshow", potential)
 
         if not to_delete:
             return
@@ -140,9 +126,7 @@ class SeriesCog(commands.Cog):
         for series in to_delete:
             self.sonarr.del_series(series)
 
-            self.logger.info(
-                f"{ctx.message.author.name} has deleted the show {series.full_title}"
-            )
+            self.logger.info(f"{ctx.message.author.name} has deleted the show {series.full_title}")
 
             push.send(
                 f"{ctx.message.author.name} has deleted the show {series.full_title}",

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/discord/helpers.py

@@ -13,9 +13,7 @@ async def member_has_role(member: discord.Member | discord.User, role: str) -> b
     return False
 
 
-async def reply(
-    msg: discord.Message, content: str, title: str = "", error: bool = False
-) -> None:
+async def reply(msg: discord.Message, content: str, title: str = "", error: bool = False) -> None:
     if len(content) > 2048:
         while len(content) > 2048 - len("\n..."):
             content = content[: content.rfind("\n")].rstrip()

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/push.py

@@ -3,9 +3,7 @@ import requests
 from wi1_bot.config import config
 
 
-def send(
-    msg: str, title: str | None = None, url: str | None = None, priority: int = 0
-) -> None:
+def send(msg: str, title: str | None = None, url: str | None = None, priority: int = 0) -> None:
     if "pushover" not in config:
         return
 

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/scripts/rescan.py

@@ -38,9 +38,7 @@ def rescan_sonarr() -> None:
 def main() -> None:
     parser = argparse.ArgumentParser(description="Rescan all movies/shows")
 
-    parser.add_argument(
-        "service", nargs="?", choices=["radarr", "sonarr"], help="radarr or sonarr"
-    )
+    parser.add_argument("service", nargs="?", choices=["radarr", "sonarr"], help="radarr or sonarr")
 
     args = parser.parse_args()
 

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/scripts/start.py

@@ -25,8 +25,7 @@ def main() -> None:
             "detailed": {
                 "class": "logging.Formatter",
                 "format": (
-                    "[%(asctime)s] %(levelname)s [%(name)s.%(funcName)s:%(lineno)d]"
-                    " %(message)s"
+                    "[%(asctime)s] %(levelname)s [%(name)s.%(funcName)s:%(lineno)d] %(message)s"
                 ),
             },
         },

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/transcoder/transcoder.py

@@ -9,7 +9,7 @@ from time import sleep
 from typing import Any
 
 from wi1_bot import push
-from wi1_bot.arr import Radarr, Sonarr
+from wi1_bot.arr import Radarr, Sonarr, replace_remote_paths
 from wi1_bot.config import config
 
 from .transcode_queue import TranscodeItem, queue
@@ -51,9 +51,7 @@ class Transcoder:
                 if remove:
                     queue.remove(item)
             except Exception:
-                self.logger.warning(
-                    "got exception when trying to transcode", exc_info=True
-                )
+                self.logger.warning("got exception when trying to transcode", exc_info=True)
 
             sleep(3)
 
@@ -96,6 +94,7 @@ class Transcoder:
             tmp_log_path = tmp_folder / "wi1_bot.transcoder.log"
 
             with open(tmp_log_path, "w") as ffmpeg_log_file:
+                ffmpeg_log_file.write(f"ffmpeg command: {shlex.join(command)}\n")
                 assert proc.stdout is not None
                 for line in proc.stdout:
                     ffmpeg_log_file.write(line)
@@ -107,35 +106,25 @@ class Transcoder:
                 try:
                     transcode_to.unlink(missing_ok=True)
                 except Exception:
-                    self.logger.debug(
-                        f"failed to delete transcoded file: {transcode_to}"
-                    )
+                    self.logger.debug(f"failed to delete transcoded file: {transcode_to}")
 
                 if (
                     "Error opening input files" in last_output
                     or "No such file or directory" in last_output
                 ):
-                    self.logger.info(
-                        f"file does not exist: {path}, skipping transcoding"
-                    )
+                    self.logger.info(f"file does not exist: {path}, skipping transcoding")
                     return True
 
                 if "File name too long" in last_output:
-                    self.logger.info(
-                        f"file name is too long: {path}, skipping transcoding"
-                    )
+                    self.logger.info(f"file name is too long: {path}, skipping transcoding")
                     return True
 
                 if "received signal 15" in last_output:
-                    self.logger.info(
-                        f"transcoding interrupted by signal: {path}, will retry"
-                    )
+                    self.logger.info(f"transcoding interrupted by signal: {path}, will retry")
                     return False
 
                 if "cannot open shared object file" in last_output:
-                    self.logger.error(
-                        "ffmpeg error: missing shared object file, will retry"
-                    )
+                    self.logger.error("ffmpeg error: missing shared object file, will retry")
                     push.send(f"ffmpeg error: {last_output}", title="ffmpeg error")
                     return False
 
@@ -160,9 +149,7 @@ class Transcoder:
                 return True
 
         if not path.exists():
-            self.logger.debug(
-                f"file doesn't exist: {item.path}, deleting transcoded file"
-            )
+            self.logger.debug(f"file doesn't exist: {item.path}, deleting transcoded file")
 
             transcode_to.unlink(missing_ok=True)
             return True
@@ -171,24 +158,26 @@ class Transcoder:
         shutil.move(transcode_to, new_path)
         path.unlink()
 
-        self._rescan_content(item, str(new_path))
+        self._rescan_content(item, new_path)
 
         self.logger.info(f"transcoded: {path.name} -> {new_path.name}")
         # push.send(f"{path.name} -> {new_path.name}", title="file transcoded")
 
         return True
 
-    def _rescan_content(self, item: TranscodeItem, new_path: str) -> None:
+    def _rescan_content(self, item: TranscodeItem, new_path: pathlib.Path) -> None:
         if item.content_id is not None:
-            if new_path.startswith(config["radarr"]["root_folder"]):
+            if new_path.is_relative_to(
+                replace_remote_paths(pathlib.Path(config["radarr"]["root_folder"]))
+            ):
+                # have to rescan the movie twice: Radarr/Radarr#7668
+                # TODO: create function that waits for comand to finish
                 self.radarr.rescan_movie(item.content_id)
-                # radarr bug that it doesn't see the deleted file and the new file
-                # in one rescan?
-                # have to sleep in between to ensure initial command finishes
-                # or use pyarr.get_command() to see command status
                 sleep(5)
                 self.radarr.rescan_movie(item.content_id)
-            elif new_path.startswith(config["sonarr"]["root_folder"]):
+            elif new_path.is_relative_to(
+                replace_remote_paths(pathlib.Path(config["sonarr"]["root_folder"]))
+            ):
                 self.sonarr.rescan_series(item.content_id)
 
     def _get_duration(self, path: str) -> timedelta:
@@ -211,20 +200,16 @@ class Transcoder:
 
         return duration
 
-    def _build_ffmpeg_command(
-        self, item: TranscodeItem, transcode_to: pathlib.Path
-    ) -> list[str]:
+    def _build_ffmpeg_command(self, item: TranscodeItem, transcode_to: pathlib.Path) -> list[str]:
         command: list[Any] = [
             "ffmpeg",
             "-hide_banner",
             "-y",
         ]
 
-        try:
+        if "transcoding" in config and "hwaccel" in config["transcoding"]:
             command.extend(["-hwaccel", config["transcoding"]["hwaccel"]])
             command.extend(["-hwaccel_output_format", config["transcoding"]["hwaccel"]])
-        except KeyError:
-            pass
 
         command.extend(["-probesize", "100M"])
         command.extend(["-analyzeduration", "250M"])

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot/webhook.py

@@ -7,8 +7,8 @@ from typing import Any
 from flask import Flask, request
 
 from wi1_bot import push, transcoder
-from wi1_bot.arr import Radarr, Sonarr
-from wi1_bot.config import RemotePathMapping, config
+from wi1_bot.arr import Radarr, Sonarr, replace_remote_paths
+from wi1_bot.config import config
 
 app = Flask(__name__)
 
@@ -21,40 +21,7 @@ sonarr = Sonarr(config["sonarr"]["url"], config["sonarr"]["api_key"])
 
 
 def on_grab(req: dict[str, Any]) -> None:
-    push.send(
-        req["release"]["releaseTitle"], title=f"file grabbed ({req['downloadClient']})"
-    )
-
-
-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
+    push.send(req["release"]["releaseTitle"], title=f"file grabbed ({req['downloadClient']})")
 
 
 def on_download(req: dict[str, Any]) -> None:
@@ -66,9 +33,7 @@ def on_download(req: dict[str, Any]) -> None:
         movie_json = radarr._radarr.get_movie(content_id)
         assert isinstance(movie_json, dict)
 
-        quality_profile = radarr.get_quality_profile_name(
-            movie_json["qualityProfileId"]
-        )
+        quality_profile = radarr.get_quality_profile_name(movie_json["qualityProfileId"])
 
         movie_folder = req["movie"]["folderPath"]
         relative_path = req["movieFile"]["relativePath"]
@@ -82,9 +47,7 @@ def on_download(req: dict[str, Any]) -> None:
         series_json = sonarr._sonarr.get_series(content_id)
         assert isinstance(series_json, dict)
 
-        quality_profile = sonarr.get_quality_profile_name(
-            series_json["qualityProfileId"]
-        )
+        quality_profile = sonarr.get_quality_profile_name(series_json["qualityProfileId"])
 
         series_folder = req["series"]["path"]
         relative_path = req["episodeFile"]["relativePath"]
@@ -96,12 +59,12 @@ def on_download(req: dict[str, Any]) -> None:
     else:
         raise ValueError("unknown download request")
 
+    if "transcoding" not in config:
+        return
+
     path = replace_remote_paths(path)
 
-    try:
-        quality_options = config["transcoding"]["profiles"][quality_profile]
-    except KeyError:
-        return
+    quality_options = config["transcoding"]["profiles"][quality_profile]
 
     # python 3.11: TranscodingProfile and typing.LiteralString
     def get_key(d: Any, k: str) -> Any:
@@ -142,9 +105,7 @@ def index() -> Any:
         if request.json["eventType"] == "Download":
             on_download(request.json)
     except Exception:
-        logger.warning(
-            f"error handling request: {request.data.decode()}", exc_info=True
-        )
+        logger.warning(f"error handling request: {request.data.decode()}", exc_info=True)
 
     return "", 200
 

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot.egg-info/PKG-INFO

@@ -1,8 +1,7 @@
 Metadata-Version: 2.1
 Name: wi1-bot
-Version: 1.4.9
+Version: 1.4.11
 Summary: Discord bot for Radarr/Sonarr integration
-Home-page: https://github.com/wthueb/wi1-bot
 Author-email: William Huebner <wilhueb@gmail.com>
 License: MIT License
         
@@ -27,7 +26,6 @@ License: MIT License
         SOFTWARE.
         
 Project-URL: Homepage, https://github.com/wthueb/wi1-bot
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
@@ -57,6 +55,11 @@ Requires Python >=3.10.
 
 ### TODO
 
+- https://github.com/kkroening/ffmpeg-python
+  - `ffmpeg -codecs`, `ffmpeg -hwaccels`
+- ffmpeg filters for deinterlacing, scaling
+  - https://docs.nvidia.com/video-technologies/video-codec-sdk/12.0/ffmpeg-with-nvidia-gpu/index.html#hwaccel-transcode-with-scaling
+- ffmpeg remove bad subtitle streams
 - use sqlite
 - have config.discord.users be a dict with 'quotas' and 'name' for *arr tags
 - Better pushover notifications
@@ -87,5 +90,3 @@ Requires Python >=3.10.
   - Tautulli API (get_history) to show who has already seen the movie
 - User leaderboard
   - movies/shows added, Tautulli watch counts
-
-

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ wi1_bot/arr/episode.py
 wi1_bot/arr/movie.py
 wi1_bot/arr/radarr.py
 wi1_bot/arr/sonarr.py
+wi1_bot/arr/util.py
 wi1_bot/discord/__init__.py
 wi1_bot/discord/bot.py
 wi1_bot/discord/helpers.py

{wi1-bot-1.4.9 → wi1-bot-1.4.11}/wi1_bot.egg-info/requires.txt

@@ -1,6 +1,6 @@
 discord.py==2.3.2
 Flask==3.0.2
-mongoengine==0.28.1
+mongoengine==0.29.1
 pyarr==5.2.0
 PyYAML==6.0.1
 requests==2.31.0

wi1-bot-1.4.9/wi1_bot/arr/__init__.py

@@ -1,4 +0,0 @@
-from .radarr import Radarr
-from .sonarr import Sonarr
-
-__all__ = ["Radarr", "Sonarr"]