Merge 6f3ac6ad6e into 86b889d3b6

bazarr/subtitles/refiners/anidb.py

@@ -53,7 +53,7 @@ class AniDBClient(object):
         ]
 
         if not animes:
-            return None
+            return None, None
 
         # Sort the anime by offset in ascending order
         animes.sort(key=lambda a: a.episode_offset)

custom_libs/libfilebot/main.py

@@ -50,7 +50,7 @@ def default_xattr(fn):
 XATTR_MAP = {
     "default": (
         default_xattr,
-        lambda result: re.search('(?um)(net\.filebot\.filename(?=="|: )[=:" ]+|Attribute.+:\s)([^"\n\r\0]+)',
+        lambda result: re.search(r'(?um)(net\.filebot\.filename(?=="|: )[=:" ]+|Attribute.+:\s)([^"\n\r\0]+)',
                                  result).group(2)
     ),
     # "darwin": (
@@ -60,7 +60,7 @@ XATTR_MAP = {
     # ),
     "darwin": (
         lambda fn: ["filebot", "-script", "fn:xattr", fn],
-        lambda result: re.search('(?um)(net\.filebot\.filename(?=="|: )[=:" ]+|Attribute.+:\s)([^"\n\r\0]+)',
+        lambda result: re.search(r'(?um)(net\.filebot\.filename(?=="|: )[=:" ]+|Attribute.+:\s)([^"\n\r\0]+)',
                                  result).group(2)
     ),
     "win32": (

custom_libs/subliminal/extensions.py

@@ -6,7 +6,7 @@ from stevedore import ExtensionManager
 
 
 class RegistrableExtensionManager(ExtensionManager):
-    """:class:~stevedore.extensions.ExtensionManager` with support for registration.
+    r""":class:~stevedore.extensions.ExtensionManager` with support for registration.
 
     It allows loading of internal extensions without setup and registering/unregistering additional extensions.
 

custom_libs/subliminal/refiners/__init__.py

@@ -1,4 +1,4 @@
-"""
+r"""
 Refiners enrich a :class:`~subliminal.video.Video` object by adding information to it.
 
 A refiner is a simple function:

custom_libs/subliminal/video.py

@@ -115,7 +115,7 @@ class Video(object):
 
 
 class Episode(Video):
-    """Episode :class:`Video`.
+    r"""Episode :class:`Video`.
 
     :param str series: series of the episode.
     :param int season: season number of the episode.
@@ -202,7 +202,7 @@ class Episode(Video):
 
 
 class Movie(Video):
-    """Movie :class:`Video`.
+    r"""Movie :class:`Video`.
 
     :param str title: title of the movie.
     :param int year: year of the movie.

custom_libs/subliminal_patch/core.py

@@ -1057,7 +1057,7 @@ def list_supported_video_types(pool_class, **kwargs):
 
 
 def download_subtitles(subtitles, pool_class=ProviderPool, **kwargs):
-    """Download :attr:`~subliminal.subtitle.Subtitle.content` of `subtitles`.
+    r"""Download :attr:`~subliminal.subtitle.Subtitle.content` of `subtitles`.
 
     :param subtitles: subtitles to download.
     :type subtitles: list of :class:`~subliminal.subtitle.Subtitle`
@@ -1074,7 +1074,7 @@ def download_subtitles(subtitles, pool_class=ProviderPool, **kwargs):
 
 def download_best_subtitles(videos, languages, min_score=0, hearing_impaired=False, only_one=False, compute_score=None,
                             pool_class=ProviderPool, throttle_time=0, **kwargs):
-    """List and download the best matching subtitles.
+    r"""List and download the best matching subtitles.
 
     The `videos` must pass the `languages` and `undefined` (`only_one`) checks of :func:`check_video`.
 
@@ -1245,7 +1245,7 @@ def save_subtitles(file_path, subtitles, single=False, directory=None, chmod=Non
 
 
 def refine(video, episode_refiners=None, movie_refiners=None, **kwargs):
-    """Refine a video using :ref:`refiners`.
+    r"""Refine a video using :ref:`refiners`.
 
     patch: add traceback logging
 

custom_libs/subliminal_patch/providers/animetosho.py

@@ -141,8 +141,9 @@ class AnimeToshoProvider(Provider, ProviderSubtitleArchiveMixin):
                     lang = Language.fromalpha3b(subtitle_file['info']['lang'])
 
                     # For Portuguese and Portuguese Brazilian they both share the same code, the name is the only
-                    # identifier AnimeTosho provides.
-                    if lang.alpha3 == 'por' and subtitle_file['info']['name'].lower().find('brazil'):
+                    # identifier AnimeTosho provides. Also, some subtitles does not have name, in this case it could
+                    # be a false negative but there is nothing we can use to guarantee it is PT-BR, we rather skip it.
+                    if lang.alpha3 == 'por' and subtitle_file['info'].get('name', '').lower().find('brazil'):
                         lang = Language('por', 'BR')
 
                     subtitle = self.subtitle_class(

custom_libs/subliminal_patch/providers/embeddedsubtitles.py

@@ -208,8 +208,11 @@ class EmbeddedSubtitlesProvider(Provider):
             except Exception as error:
                 logger.debug("'%s' raised running modifier", error)
 
-        with open(path, "rb") as sub:
-            subtitle.content = sub.read()
+        if os.path.exists(path):
+            with open(path, "rb") as sub:
+                subtitle.content = sub.read()
+        else:
+            logger.error("%s not found in filesystem", path)
 
     def _get_subtitle_path(self, subtitle: EmbeddedSubtitle):
         container = subtitle.container

frontend/src/components/forms/ProfileEditForm.tsx

@@ -82,7 +82,12 @@ const ProfileEditForm: FunctionComponent<Props> = ({
 
   const itemCutoffOptions = useSelectorOptions(
     form.values.items,
-    (v) => v.language,
+    (v) => {
+      const suffix =
+        v.hi === "True" ? ":hi" : v.forced === "True" ? ":forced" : "";
+
+      return v.language + suffix;
+    },
     (v) => String(v.id),
   );