update

biezhihua · Jan 26, 2024 · f1534d0 · f1534d0
1 parent 7da1016
commit f1534d0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/soda_resource_tools_lib/config/mt_strong_match_regex_rules.json b/soda_resource_tools_lib/config/mt_strong_match_regex_rules.json
@@ -4,12 +4,14 @@
     "Repack\\.H",
     "Directors\\.Cut\\.REMUX",
     "Directors\\.Cut",
+    "Director's\\.Cut",
     "Extended\\.Cut",
     "EXTENDED\\.ALTERNATE\\.CUT",
     "internal\\.multi",
     "EXTENDED\\.REMASTERED",
     "Remastered",
     "REMASTERED",
+    "UNCUT",
     "HYBRID",
     "MULTi",
     "SP",
@@ -251,6 +253,7 @@
     "HHWEB",
     "LoliHouse",
     "Nekomoe kissaten",
+    "cXcY@FRDS",
     "HDFans",
     "BluEvo",
     "CNts",

diff --git a/soda_resource_tools_lib/config/mt_strong_match_rules_movie.json b/soda_resource_tools_lib/config/mt_strong_match_rules_movie.json
@@ -371,8 +371,12 @@
       "rule": "$title_en$.$year$.$source$.$resolution$.$audio_codec$.$video_codec$.$source$.$extension$"
     },
     {
-      "example": "Terminator.2.Judgment.Day.1991.1080p.Blu-ray.x265.DTS-HD.mk",
+      "example": "Terminator.2.Judgment.Day.1991.1080p.Blu-ray.x265.DTS-HD.mkv",
       "rule": "$title_number_en$.$year$.$resolution$.$source$.$video_codec$.$audio_codec$.$extension$"
+    },
+    {
+      "example": "The.Bourne.Identity.2002.1080p.Blu-ray.x265.10bit.DTS￡cXcY@FRDS(1.58.17).mkv",
+      "rule": "$title_en$.$year$.$resolution$.$source$.$video_codec$.$audio_codec$-$release_group$($mix_numbers_letters$).$extension$"
     }
   ]
 }
diff --git a/soda_resource_tools_lib/src/soda/meta/strong_match_token.rs b/soda_resource_tools_lib/src/soda/meta/strong_match_token.rs
@@ -441,7 +441,7 @@ fn regex_item_extension() -> &'static str {
 /// 匹配数字字母混合
 /// 例如：4ABDCA70
 fn regex_item_mix_numbers_letters() -> &'static str {
-    r"(?P<mix_numbers_letters>[0-9A-Za-z]+)"
+    r"(?P<mix_numbers_letters>[\\.0-9A-Za-z]+)"
 }
 
 /// 匹配单个数字

diff --git a/soda_resource_tools_lib/tests/movie_and_tv_metadata.json b/soda_resource_tools_lib/tests/movie_and_tv_metadata.json
@@ -6230,6 +6230,34 @@
         "release_group": "cXcY@FRDS",
         "container": "mkv"
       }
+    },
+    {
+      "title": "Malena.2000.UNCUT.BluRay.1080p.x265.10bit.MNHD-FRDS.mkv",
+      "metadata": {
+        "cn_name": "",
+        "en_name": "Malena",
+        "year": "2000",
+        "resolution": "1080p",
+        "source": "BluRay",
+        "video_codec": "H.265",
+        "audio_codec": "",
+        "release_group": "MNHD-FRDS",
+        "container": "mkv"
+      }
+    },
+    {
+      "title": "The.Bourne.Identity.2002.1080p.Blu-ray.x265.10bit.DTS￡cXcY@FRDS(1.58.17).mkv",
+      "metadata": {
+        "cn_name": "",
+        "en_name": "The Bourne Identity",
+        "year": "2002",
+        "resolution": "1080p",
+        "source": "BluRay",
+        "video_codec": "H.265",
+        "audio_codec": "DTS",
+        "release_group": "cXcY@FRDS",
+        "container": "mkv"
+      }
     }
   ]
 }