diff --git a/app/core/meta/metavideo.py b/app/core/meta/metavideo.py index bd992c79..090a99a4 100644 --- a/app/core/meta/metavideo.py +++ b/app/core/meta/metavideo.py @@ -524,16 +524,7 @@ class MetaVideo(MetaBase): """ if not self.name: return - source_res = re.search(r"(%s)" % self._source_re, token, re.IGNORECASE) - if source_res: - self._last_token_type = "source" - self._continue_flag = False - self._stop_name_flag = True - if not self._source: - self._source = source_res.group(1) - self._last_token = self._source.upper() - return - elif token.upper() == "DL" \ + if token.upper() == "DL" \ and self._last_token_type == "source" \ and self._last_token == "WEB": self._source = "WEB-DL" @@ -553,7 +544,7 @@ class MetaVideo(MetaBase): self._source = "WEB-DL" self._continue_flag = False return - # UHD REMUX组合 + # UHD REMUX组合 if token.upper() == "REMUX" \ and self._source == "BluRay": self._source = "BluRay REMUX" @@ -562,7 +553,17 @@ class MetaVideo(MetaBase): elif token.upper() == "BLURAY" \ and self._source == "UHD": self._source = "UHD BluRay" - + self._continue_flag = False + return + source_res = re.search(r"(%s)" % self._source_re, token, re.IGNORECASE) + if source_res: + self._last_token_type = "source" + self._continue_flag = False + self._stop_name_flag = True + if not self._source: + self._source = source_res.group(1) + self._last_token = self._source.upper() + return effect_res = re.search(r"(%s)" % self._effect_re, token, re.IGNORECASE) if effect_res: self._last_token_type = "effect" diff --git a/tests/cases/meta.py b/tests/cases/meta.py index fbfb1cf1..be51a4ce 100644 --- a/tests/cases/meta.py +++ b/tests/cases/meta.py @@ -345,13 +345,13 @@ meta_cases = [{ "part": "", "season": "", "episode": "", - "restype": "BluRay Remux", + "restype": "BluRay REMUX", "pix": "1080p", "video_codec": "AVC", "audio_codec": "LPCM 7³" } }, { - "title": "30.Rock.S02E01.1080p.BluRay.X264-BORDURE.mkv", + "title": "30.Rock.S02E01.1080p.UHD.BluRay.X264-BORDURE.mkv", "subtitle": "", "target": { "type": "电视剧", @@ -361,7 +361,7 @@ meta_cases = [{ "part": "", "season": "S02", "episode": "E01", - "restype": "BluRay", + "restype": "UHD BluRay", "pix": "1080p", "video_codec": "X264", "audio_codec": "" @@ -611,7 +611,7 @@ meta_cases = [{ "subtitle": "", "target": { "type": "电视剧", - "cn_name": "处刑少女的生存之道", + "cn_name": "處刑少女的生存之道", "en_name": "", "year": "", "part": "", @@ -665,7 +665,7 @@ meta_cases = [{ "part": "", "season": "", "episode": "", - "restype": "BluRay DoVi UHD", + "restype": "UHD BluRay DoVi", "pix": "1080p", "video_codec": "X265", "audio_codec": "DD 7.1"