From 27f0f29eef6079c29d1f661a78d9738ae0e57433 Mon Sep 17 00:00:00 2001 From: Miralia Date: Fri, 16 May 2025 20:49:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(meta):=20=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=A0=BC=E5=BC=8F=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/meta/metavideo.py | 12 ++++++------ app/utils/tokens.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/core/meta/metavideo.py b/app/core/meta/metavideo.py index 6f0306a2..aa9caa7d 100644 --- a/app/core/meta/metavideo.py +++ b/app/core/meta/metavideo.py @@ -31,7 +31,7 @@ class MetaVideo(MetaBase): _part_re = r"(^PART[0-9ABI]{0,2}$|^CD[0-9]{0,2}$|^DVD[0-9]{0,2}$|^DISK[0-9]{0,2}$|^DISC[0-9]{0,2}$)" _roman_numerals = r"^(?=[MDCLXVI])M*(C[MD]|D?C{0,3})(X[CL]|L?X{0,3})(I[XV]|V?I{0,3})$" _source_re = r"^BLURAY$|^HDTV$|^UHDTV$|^HDDVD$|^WEBRIP$|^DVDRIP$|^BDRIP$|^BLU$|^WEB$|^BD$|^HDRip$|^REMUX$|^UHD$" - _effect_re = r"^SDR$|^HDR\d*$|^DOLBY$|^DOVI$|^DV$|^3D$|^REPACK$|^HLG$" + _effect_re = r"^SDR$|^HDR\d*$|^DOLBY$|^DOVI$|^DV$|^3D$|^REPACK$|^HLG$|^HDR10(\+|Plus)$" _resources_type_re = r"%s|%s" % (_source_re, _effect_re) _name_no_begin_re = r"^[\[【].+?[\]】]" _name_no_chinese_re = r".*版|.*字幕" @@ -592,12 +592,12 @@ class MetaVideo(MetaBase): self._stop_name_flag = True self._last_token_type = "videoencode" if not self.video_encode: - if re_res.group(1): - self.video_encode = re_res.group(1).upper() - elif re_res.group(2): - self.video_encode = re_res.group(2).lower() + 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() else: - self.video_encode = re_res.group(0).upper() + self.video_encode = re_res.group(1).upper() self._last_token = self.video_encode elif self.video_encode == "10bit": self.video_encode = f"{re_res.group(1).upper()} 10bit" diff --git a/app/utils/tokens.py b/app/utils/tokens.py index e9500010..2e5c2af2 100644 --- a/app/utils/tokens.py +++ b/app/utils/tokens.py @@ -12,7 +12,7 @@ class Tokens: self.load_text(text) def load_text(self, text): - splitted_text = re.split(r"\.|\s+|\(|\)|\[|]|-|\+|【|】|/|～|;|&|\||#|_|「|」|~", text) + splitted_text = re.split(r"\.|\s+|\(|\)|\[|]|-|【|】|/|～|;|&|\||#|_|「|」|~", text) for sub_text in splitted_text: if sub_text: self._tokens.append(sub_text)