From 92708e722f9f2706f8503cc998032ddc9daf445f Mon Sep 17 00:00:00 2001
From: GabbeHags <38500419+GabbeHags@users.noreply.github.com>
Date: Mon, 2 Sep 2024 11:19:52 +0200
Subject: [PATCH] Made all subf2m test pass (#2645)

---
 .../subliminal_patch/providers/subf2m.py      |  4 +--
 .../subliminal_patch/providers/utils.py       |  8 +++--
 custom_libs/subliminal_patch/subtitle.py      |  2 +-
 tests/subliminal_patch/test_subf2m.py         | 33 +++++++++++++++----
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/custom_libs/subliminal_patch/providers/subf2m.py b/custom_libs/subliminal_patch/providers/subf2m.py
index 0ef39595d..1ac0b4048 100644
--- a/custom_libs/subliminal_patch/providers/subf2m.py
+++ b/custom_libs/subliminal_patch/providers/subf2m.py
@@ -132,9 +132,9 @@ _DEFAULT_HEADERS = {
 class Subf2mProvider(Provider):
     provider_name = "subf2m"
 
-    _movie_title_regex = re.compile(r"^(.+?)( \((\d{4})\))?$")
+    _movie_title_regex = re.compile(r"^(.+?)(\s+\((\d{4})\))?$")
     _tv_show_title_regex = re.compile(
-        r"^(.+?) [-\(]\s?(.*?) (season|series)\)?( \((\d{4})\))?$"
+        r"^(.+?)\s+[-\(]\s?(.*?)\s+(season|series)\)?(\s+\((\d{4})\))?$"
     )
     _tv_show_title_alt_regex = re.compile(r"(.+)\s(\d{1,2})(?:\s|$)")
     _supported_languages = {}
diff --git a/custom_libs/subliminal_patch/providers/utils.py b/custom_libs/subliminal_patch/providers/utils.py
index 86fee237f..206334462 100644
--- a/custom_libs/subliminal_patch/providers/utils.py
+++ b/custom_libs/subliminal_patch/providers/utils.py
@@ -86,11 +86,13 @@ def _get_matching_sub(
         return None
 
 
-def _analize_sub_name(sub_name: str, title_):
-    titles = re.split(r"[.-]", os.path.splitext(sub_name)[0])
+def _analize_sub_name(sub_name: str, title_: str):
+    titles = re.split(r"[\s_\.\+]?[.-][\s_\.\+]?", os.path.splitext(sub_name)[0])
+
     for title in titles:
         title = title.strip()
-        ratio = SequenceMatcher(None, title, title_).ratio()
+        ratio = SequenceMatcher(None, title.lower(), title_.lower()).ratio()
+
         if ratio > 0.85:
             logger.debug(
                 "Episode title matched: '%s' -> '%s' [%s]", title, sub_name, ratio
diff --git a/custom_libs/subliminal_patch/subtitle.py b/custom_libs/subliminal_patch/subtitle.py
index 06a491be7..c65f8cdd2 100644
--- a/custom_libs/subliminal_patch/subtitle.py
+++ b/custom_libs/subliminal_patch/subtitle.py
@@ -281,7 +281,7 @@ class Subtitle(Subtitle_):
         return encoding
 
     def is_valid(self):
-        """Check if a :attr:`text` is a valid SubRip format. Note that orignal format will pypass the checking
+        """Check if a :attr:`text` is a valid SubRip format. Note that original format will bypass the checking
 
         :return: whether or not the subtitle is valid.
         :rtype: bool
diff --git a/tests/subliminal_patch/test_subf2m.py b/tests/subliminal_patch/test_subf2m.py
index e8369d2fa..b8901179b 100644
--- a/tests/subliminal_patch/test_subf2m.py
+++ b/tests/subliminal_patch/test_subf2m.py
@@ -184,15 +184,36 @@ def test_download_subtitle_episode(provider, subtitle_episode):
     assert subtitle_episode.is_valid()
 
 
-def test_download_subtitle_episode_with_title(provider):
+@pytest.mark.parametrize(
+    "language,page_link,release_info,episode_number,episode_title",
+    [
+        (
+            "en",
+            "https://subf2m.co/subtitles/courage-the-cowardly-dog/english/2232402",
+            "Season 3 complete.",
+            13,
+            "Feast of the Bullfrogs",
+        ),
+        (
+            "en",
+            "https://subf2m.co/subtitles/rick-and-morty-sixth-season/english/3060783",
+            "Used Subtitle Tools to convert from SUP to SRT, then ran the cleaner to remove HI. Grabbed subs from Rick.and.Morty.S06.1080p.BluRay.x264-STORiES.",
+            7,
+            "Full Meta Jackrick",
+        ),
+    ],
+)
+def test_download_subtitle_episode_with_title(
+    provider, language, page_link, release_info, episode_number, episode_title
+):
     sub = Subf2mSubtitle(
-        Language.fromalpha2("en"),
-        "https://subf2m.co/subtitles/courage-the-cowardly-dog/english/2232402",
-        "Season 3 complete.",
-        13,
+        Language.fromalpha2(language),
+        page_link,
+        release_info,
+        episode_number,
     )
 
-    sub.episode_title = "Feast of the Bullfrogs"
+    sub.episode_title = episode_title
     provider.download_subtitle(sub)
     assert sub.is_valid()