From e23f6d78209e49efd817327db836f424fa84e543 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Tue, 16 May 2023 19:55:08 +0800 Subject: [PATCH] Fix parser --- src/module/parser/analyser/torrent_parser.py | 3 +-- src/test/test_torrent_parser.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/module/parser/analyser/torrent_parser.py b/src/module/parser/analyser/torrent_parser.py index 83900ae9..987a78b7 100644 --- a/src/module/parser/analyser/torrent_parser.py +++ b/src/module/parser/analyser/torrent_parser.py @@ -10,7 +10,7 @@ logger = logging.getLogger(__name__) PLATFORM = "Unix" RULES = [ - r"(.*) - (\d{1,4}|\d{1,4}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)?(.*)", + r"(.*) - (\d{1,4}|\d{1,4}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)? (.*)", r"(.*)[\[\ E](\d{1,4}|\d{1,4}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)?[\]\ ](.*)", r"(.*)\[(?:第)?(\d*\.*\d*)[话集話](?:END)?\](.*)", r"(.*)第(\d*\.*\d*)[话話集](?:END)?(.*)", @@ -98,4 +98,3 @@ def torrent_parser( episode=episode, suffix=suffix ) - diff --git a/src/test/test_torrent_parser.py b/src/test/test_torrent_parser.py index 7462e8ca..8b0dbdb4 100644 --- a/src/test/test_torrent_parser.py +++ b/src/test/test_torrent_parser.py @@ -56,3 +56,16 @@ def test_torrent_parser(): assert sf.episode == 1 assert sf.language == "zh" + file_name = "水星的魔女(2022) S00E19.mp4" + bf = torrent_parser(file_name, season=0) + assert bf.title == "水星的魔女(2022)" + assert bf.season == 0 + assert bf.episode == 19 + + file_name = "【失眠搬运组】放学后失眠的你-Kimi wa Houkago Insomnia - 06 [bilibili - 1080p AVC1 CHS-JP].mp4" + bf = torrent_parser(file_name, season=1) + assert bf.title == "放学后失眠的你-Kimi wa Houkago Insomnia" + assert bf.season == 1 + assert bf.episode == 6 + +