Subtitle Post-Processing Fix (#552)

vagabondHustler · Dec 1, 2023 · bd8885d · bd8885d
2 parents 86d1897 + 4f758eb
commit bd8885d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/src/subsearch/core.py b/src/subsearch/core.py
@@ -34,6 +34,7 @@ def __init__(self, pref_counter: float) -> None:
         self.system_tray.start()
 
         if self.file_exist:
+            VIDEO_FILE.file_hash = io_file_system.get_file_hash(VIDEO_FILE.file_path)
             io_log.stdout_dataclass(VIDEO_FILE, level="debug", print_allowed=False)
             io_file_system.create_directory(VIDEO_FILE.file_directory)
 
@@ -173,23 +174,23 @@ def subtitle_post_processing(self):
     @decorators.call_conditions
     def subtitle_rename(self) -> None:
         io_log.stdout_in_brackets("Renaming best match")
-        self.core_state.set_state(self.core_state.state.AUTOLOAD_RENAME)
+        self.core_state.set_state(self.core_state.state.SUBTITLE_RENAME)
         new_name = io_file_system.autoload_rename(VIDEO_FILE.filename, ".srt")
         self.autoload_src = new_name
         io_log.stdout("Done with task", level="info", end_new_line=True)
 
     @decorators.call_conditions
     def subtitle_move_best(self, target: Path) -> None:
         io_log.stdout_in_brackets("Move best match")
-        self.core_state.set_state(self.core_state.state.AUTOLOAD_MOVE)
+        self.core_state.set_state(self.core_state.state.SUBTITLE_MOVE)
 
         io_file_system.move_and_replace(self.autoload_src, target)
         io_log.stdout("Done with task", level="info", end_new_line=True)
 
     @decorators.call_conditions
     def subtitle_move_all(self, target: Path) -> None:
         io_log.stdout_in_brackets("Move all")
-        self.core_state.set_state(self.core_state.state.AUTOLOAD_MOVE_ALL)
+        self.core_state.set_state(self.core_state.state.SUBTITLE_MOVE_ALL)
         io_file_system.move_all(VIDEO_FILE.subs_dir, target)
         io_log.stdout("Done with task", level="info", end_new_line=True)
 

diff --git a/src/subsearch/utils/decorators.py b/src/subsearch/utils/decorators.py
@@ -125,10 +125,10 @@ def conditions(cls: Union["core.SubsearchCore", "core.Initializer"], *args, **kw
             ],
             "extract_files": [len(cls.accepted_subtitles) >= 1],
             "subtitle_post_processing": [],
-            "subtitle_rename": [cls.app_config.subtitle_post_processing["rename"], cls.subtitles_found > 1],
+            "subtitle_rename": [cls.app_config.subtitle_post_processing["rename"], cls.subtitles_found >= 1],
             "subtitle_move_best": [
                 cls.app_config.subtitle_post_processing["move_best"],
-                cls.subtitles_found > 1,
+                cls.subtitles_found >= 1,
                 not cls.app_config.subtitle_post_processing["move_all"],
             ],
             "subtitle_move_all": [cls.app_config.subtitle_post_processing["move_all"], cls.subtitles_found > 1],

diff --git a/src/subsearch/utils/imdb_lookup.py b/src/subsearch/utils/imdb_lookup.py
@@ -43,28 +43,20 @@ def __init__(self, title: str, year: int):
 
         url = adv_search.get_url()
         tree = core_provider.get_html_parser(url)
-        product = tree.select("div.lister-item-content")
 
-        for item in product.matches:
-            self.data = item.css_first("h3.lister-item-header")
+        product = tree.css("a.ipc-title-link-wrapper h3.ipc-title__text")
 
-            if self.title != self.find_imdb_title():
+        for item in product:
+            href_ = item.parent.attrs["href"]
+            imdb_id = href_.split("/")[2]
+            title_ = item.text().split(". ")[-1]
+            year_ = int(item.parent.parent.next.child.child.html)
+
+            if self.title != title_.lower():
                 continue
 
-            if self.year != self.find_imdb_year() and (self.year - 1) != self.find_imdb_year():
+            if self.year != year_ and (self.year - 1) != year_:
                 continue
 
-            self.id = self.get_imdb_id()
+            self.id = imdb_id
             break
-
-    def find_imdb_title(self) -> str:
-        title = self.data.css_first("a").text()
-        return title.lower()
-
-    def find_imdb_year(self) -> int:
-        year = self.data.css_first("span.lister-item-year").child.text_content
-        return int(re.findall("[0-9]+", year)[0])
-
-    def get_imdb_id(self) -> str:
-        href = self.data.css_first("a")
-        return re.findall("tt[0-9]+", href.attributes["href"])[0]
diff --git a/src/subsearch/utils/state_manager.py b/src/subsearch/utils/state_manager.py
@@ -23,9 +23,9 @@ class CoreState(Enum):
     CALL_YIFYSUBTITLES = auto()
     DOWNLOAD_FILES = auto()
     MANUAL_DOWNLOAD = auto()
-    AUTOLOAD_RENAME = auto()
-    AUTOLOAD_MOVE = auto()
-    AUTOLOAD_MOVE_ALL = auto()
+    SUBTITLE_RENAME = auto()
+    SUBTITLE_MOVE = auto()
+    SUBTITLE_MOVE_ALL = auto()
     EXTRACT_FILES = auto()
     SUMMARY_TOAST = auto()
     CLEAN_UP = auto()