wi1-bot 1.4.4__tar.gz → 1.4.5__tar.gz

{wi1-bot-1.4.4 → wi1-bot-1.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wi1-bot
-Version: 1.4.4
+Version: 1.4.5
 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.4 → wi1-bot-1.4.5}/pyproject.toml

@@ -27,6 +27,7 @@ Homepage = "https://github.com/wthueb/wi1-bot"
 wi1-bot = "wi1_bot.scripts.start:main"
 transcode-item = "wi1_bot.scripts.transcode_item:main"
 add-tag = "wi1_bot.scripts.add_tag:main"
+rescan = "wi1_bot.scripts.rescan:main"
 
 [project.optional-dependencies]
 dev = [

{wi1-bot-1.4.4 → wi1-bot-1.4.5}/wi1_bot/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.4'
-__version_tuple__ = version_tuple = (1, 4, 4)
+__version__ = version = '1.4.5'
+__version_tuple__ = version_tuple = (1, 4, 5)

{wi1-bot-1.4.4 → wi1-bot-1.4.5}/wi1_bot/arr/radarr.py

@@ -149,10 +149,10 @@ class Radarr:
         raise ValueError(f"no quality profile with the id {profile_id}")
 
     def rescan_movie(self, movie_id: int) -> None:
-        self._radarr.post_command("RescanMovie", movieId=movie_id)  # type: ignore
+        self._radarr.post_command("RescanMovie", movieId=movie_id)
 
     def refresh_movie(self, movie_id: int) -> None:
-        self._radarr.post_command("RefreshMovie", movieIds=[movie_id])  # type: ignore
+        self._radarr.post_command("RefreshMovie", movieIds=[movie_id])
 
     def search_missing(self) -> None:
         self._radarr.post_command(name="MissingMoviesSearch")

wi1-bot-1.4.5/wi1_bot/scripts/rescan.py

@@ -0,0 +1,57 @@
+import argparse
+from time import sleep
+from typing import cast
+
+from wi1_bot.arr.radarr import Radarr
+from wi1_bot.arr.sonarr import Sonarr
+from wi1_bot.config import config
+
+
+def rescan_radarr() -> None:
+    radarr = Radarr(config["radarr"]["url"], config["radarr"]["api_key"])
+
+    all_movies = radarr._radarr.get_movie()
+    assert isinstance(all_movies, list)
+    all_movies.sort(key=lambda m: cast(str, m["title"]))
+
+    for movie in all_movies:
+        assert isinstance(movie, dict)
+        print(f"Rescanning {movie['title']}...")
+        radarr.refresh_movie(movie["id"])
+        sleep(3)
+
+
+def rescan_sonarr() -> None:
+    sonarr = Sonarr(config["sonarr"]["url"], config["sonarr"]["api_key"])
+
+    all_series = sonarr._sonarr.get_series()
+    assert isinstance(all_series, list)
+    all_series.sort(key=lambda s: cast(str, s["title"]))
+
+    for series in all_series:
+        assert isinstance(series, dict)
+        print(f"Rescanning {series['title']}...")
+        sonarr.rescan_series(series["id"])
+        sleep(5)
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Rescan all movies/shows")
+
+    parser.add_argument(
+        "service", nargs="?", choices=["radarr", "sonarr"], help="radarr or sonarr"
+    )
+
+    args = parser.parse_args()
+
+    if args.service == "radarr":
+        rescan_radarr()
+    elif args.service == "sonarr":
+        rescan_sonarr()
+    else:
+        rescan_radarr()
+        rescan_sonarr()
+
+
+if __name__ == "__main__":
+    main()

{wi1-bot-1.4.4 → wi1-bot-1.4.5}/wi1_bot/transcoder/transcoder.py

@@ -46,17 +46,10 @@ class Transcoder:
                 continue
 
             try:
-                self._do_transcode(item)
-                queue.remove(item)
-            except SignalInterrupt:
-                # retry when restarted
-                pass
-            except FileNotFoundError:
-                # don't retry
-                queue.remove(item)
-            except UnknownError:
-                # don't retry
-                queue.remove(item)
+                remove = self._do_transcode(item)
+
+                if remove:
+                    queue.remove(item)
             except Exception:
                 self.logger.warning(
                     "got exception when trying to transcode", exc_info=True
@@ -64,14 +57,14 @@ class Transcoder:
 
             sleep(3)
 
-    def _do_transcode(self, item: TranscodeItem) -> None:
+    def _do_transcode(self, item: TranscodeItem) -> bool:
         path = pathlib.Path(item.path)
 
-        self.logger.debug(f"attempting to transcode {path.name}")
+        self.logger.info(f"attempting to transcode {path.name}")
 
         if path.suffix == ".avi":
-            self.logger.debug(f"cannot transcode {path.name}: .avi not supported")
-            return
+            self.logger.info(f"cannot transcode {path.name}: .avi not supported")
+            return True
 
         # push.send(f"{basename}", title="starting transcode")
 
@@ -103,29 +96,32 @@ class Transcoder:
             tmp_log_path = tmp_folder / "wi1_bot.transcoder.log"
 
             with open(tmp_log_path, "w") as ffmpeg_log_file:
-                for line in proc.stdout:  # type: ignore
+                assert proc.stdout is not None
+                for line in proc.stdout:
                     ffmpeg_log_file.write(line)
                     last_output = line.strip()
 
             status = proc.wait()
 
             if status != 0:
-                self.logger.error(f"ffmpeg failed (status {status}): {last_output}")
-
-                if (
-                    "No such file or directory" in last_output
-                    and "shared object file" not in last_output
-                ):
-                    self.logger.debug(
+                if "Error opening input files" in last_output:
+                    self.logger.info(
                         f"file does not exist: {path}, skipping transcoding"
                     )
-                    raise FileNotFoundError
+                    return True
 
                 if "received signal 15" in last_output:
-                    self.logger.debug(
+                    self.logger.info(
                         f"transcoding interrupted by signal: {path}, will retry"
                     )
-                    raise SignalInterrupt
+                    return False
+
+                if "cannot open shared object file" in last_output:
+                    self.logger.error(
+                        "ffmpeg error: missing shared object file, will retry"
+                    )
+                    push.send(f"ffmpeg error: {last_output}", title="ffmpeg error")
+                    return False
 
                 perm_log_path = tmp_folder / f"{path.stem}.log"
 
@@ -136,6 +132,8 @@ class Transcoder:
                     perm_log_path.parent.mkdir(parents=True, exist_ok=True)
 
                 shutil.copy(tmp_log_path, perm_log_path)
+
+                self.logger.error(f"ffmpeg failed (status {status}): {last_output}")
                 self.logger.error(f"log file: {perm_log_path}")
 
                 push.send(
@@ -143,7 +141,7 @@ class Transcoder:
                     title="transcoding error",
                 )
 
-                raise UnknownError
+                return True
 
         new_path = path.parent / transcode_to.name
 
@@ -153,7 +151,7 @@ class Transcoder:
             )
 
             transcode_to.unlink()
-            return
+            return True
 
         shutil.move(transcode_to, new_path)
         path.unlink()
@@ -163,8 +161,9 @@ class Transcoder:
         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:
-        # FIXME: don't hardcode library paths (config)
         if item.content_id is not None:
             if new_path.startswith(config["radarr"]["root_folder"]):
                 self.radarr.rescan_movie(item.content_id)

{wi1-bot-1.4.4 → wi1-bot-1.4.5}/wi1_bot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wi1-bot
-Version: 1.4.4
+Version: 1.4.5
 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.4 → wi1-bot-1.4.5}/wi1_bot.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ wi1_bot/discord/cogs/movie.py
 wi1_bot/discord/cogs/series.py
 wi1_bot/scripts/__init__.py
 wi1_bot/scripts/add_tag.py
+wi1_bot/scripts/rescan.py
 wi1_bot/scripts/start.py
 wi1_bot/scripts/transcode_item.py
 wi1_bot/transcoder/__init__.py

{wi1-bot-1.4.4 → wi1-bot-1.4.5}/wi1_bot.egg-info/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
 add-tag = wi1_bot.scripts.add_tag:main
+rescan = wi1_bot.scripts.rescan:main
 transcode-item = wi1_bot.scripts.transcode_item:main
 wi1-bot = wi1_bot.scripts.start:main