avoid subtitle duplicates

Diaoul · Jul 9, 2024 · 600d68d · 600d68d
1 parent cf06887
commit 600d68d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/changelog.d/1146.provider.rst b/changelog.d/1146.provider.rst
@@ -0,0 +1 @@
+[OpenSubtitlesCom] Avoid duplicate subtitles
diff --git a/subliminal/providers/__init__.py b/subliminal/providers/__init__.py
@@ -186,10 +186,7 @@ def check(cls, video: Video) -> bool:
         """
         if not cls.check_types(video):
             return False
-        if cls.required_hash is not None and cls.required_hash not in video.hashes:
-            return False
-
-        return True
+        return cls.required_hash is None or cls.required_hash in video.hashes
 
     @classmethod
     def check_types(cls, video: Video) -> bool:

diff --git a/subliminal/providers/opensubtitlescom.py b/subliminal/providers/opensubtitlescom.py
@@ -675,7 +675,7 @@ def query(
         # fill the search criteria
         criteria = self._make_query(**kwargs)
 
-        subtitles = []
+        subtitles: list[OpenSubtitlesComSubtitle] = []
 
         for criterion in criteria:
             # add the language and query the server
@@ -695,8 +695,12 @@ def query(
                     imdb_match=imdb_match,
                     tmdb_match=tmdb_match,
                 )
-                logger.debug('Found subtitle %r', subtitle)
-                subtitles.append(subtitle)
+
+                # Some criteria are redundant, so skip duplicates
+                unique_ids = [s.id for s in subtitles]
+                if subtitle.id not in unique_ids:
+                    logger.debug('Found subtitle %r', subtitle)
+                    subtitles.append(subtitle)
 
         # filter out the machine translated subtitles
         if not allow_machine_translated: