diff --git a/app/core/meta/metavideo.py b/app/core/meta/metavideo.py index aa9caa7d..5fa28102 100644 --- a/app/core/meta/metavideo.py +++ b/app/core/meta/metavideo.py @@ -595,7 +595,7 @@ class MetaVideo(MetaBase): if re_res.group(2): self.video_encode = re_res.group(2).upper() elif re_res.group(3): - self.video_encode = re_res.group(3).lower() + self.video_encode = re_res.group(3).upper() else: self.video_encode = re_res.group(1).upper() self._last_token = self.video_encode diff --git a/tests/cases/meta.py b/tests/cases/meta.py index 6df283c4..fd7ef153 100644 --- a/tests/cases/meta.py +++ b/tests/cases/meta.py @@ -668,7 +668,7 @@ meta_cases = [{ "restype": "UHD BluRay DoVi", "pix": "1080p", "video_codec": "X265", - "audio_codec": "DD 7.1" + "audio_codec": "DD+ 7.1" } }, { "title": "Childhood.In.A.Capsule.S01E16.2022.1080p.KKTV.WEB-DL.X264.AAC-ADWeb.mkv", @@ -968,7 +968,7 @@ meta_cases = [{ "year": "2023", "part": "", "season": "S02", - "episode": "E01-E08", + "episode": "", "restype": "WEB-DL", "pix": "2160p", "video_codec": "H265", @@ -1016,7 +1016,7 @@ meta_cases = [{ "year": "2019", "part": "", "season": "S01", - "episode": "E01-E36", + "episode": "", "restype": "WEB-DL", "pix": "2160p", "video_codec": "H265", diff --git a/tests/run.py b/tests/run.py index fd6d85b4..5aa65968 100644 --- a/tests/run.py +++ b/tests/run.py @@ -7,6 +7,7 @@ if __name__ == '__main__': # 测试名称识别 suite.addTest(MetaInfoTest('test_metainfo')) + suite.addTest(MetaInfoTest('test_emby_format_ids')) # 运行测试 runner = unittest.TextTestRunner() diff --git a/tests/test_metainfo.py b/tests/test_metainfo.py index ac464594..9e941066 100644 --- a/tests/test_metainfo.py +++ b/tests/test_metainfo.py @@ -32,11 +32,11 @@ class MetaInfoTest(TestCase): "video_codec": meta_info.video_encode or "", "audio_codec": meta_info.audio_encode or "" } - + # 检查tmdbid if info.get("target").get("tmdbid"): target["tmdbid"] = meta_info.tmdbid - + self.assertEqual(target, info.get("target")) def test_emby_format_ids(self): @@ -56,8 +56,8 @@ class MetaInfoTest(TestCase): # 测试{tmdb-xxx}格式 ("/movies/Avatar (2009) {tmdb-19995}/Avatar.2009.1080p.mkv", 19995), ] - + for path_str, expected_tmdbid in test_paths: meta = MetaInfoPath(Path(path_str)) - self.assertEqual(meta.tmdbid, expected_tmdbid, - f"路径 {path_str} 期望的tmdbid为 {expected_tmdbid},实际识别为 {meta.tmdbid}") + self.assertEqual(meta.tmdbid, expected_tmdbid, + f"路径 {path_str} 期望的tmdbid为 {expected_tmdbid},实际识别为 {meta.tmdbid}")