From 83b9e3fc8faf4d050c9f2de6c06ced16edfadc94 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 27 Jan 2022 21:09:22 -0700 Subject: [PATCH] Adding more video name parse tests. Using limiting match. --- modules/videos/lib.py | 2 +- modules/videos/test/test_lib.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/videos/lib.py b/modules/videos/lib.py index d39263d0..499bd484 100644 --- a/modules/videos/lib.py +++ b/modules/videos/lib.py @@ -391,7 +391,7 @@ async def get_statistics(): return ret -NAME_PARSER = re.compile(r'(.*?)_((?:\d+?)|(?:NA))_(?:(.+)_)?(.*)\.' +NAME_PARSER = re.compile(r'(.*?)_((?:\d+?)|(?:NA))_(?:(.{5,15})_)?(.*)\.' r'(jpg|webp|flv|mp4|part|info\.json|description|webm|..\.srt|..\.vtt)') diff --git a/modules/videos/test/test_lib.py b/modules/videos/test/test_lib.py index 84db1f38..694382bc 100644 --- a/modules/videos/test/test_lib.py +++ b/modules/videos/test/test_lib.py @@ -171,7 +171,11 @@ def test_validate_video_exception(test_session, simple_channel, video_factory): ('NA_20000303_vp91w5_Bob's Pancakes.mp4', (None, '20000303', 'vp91w5', 'Bob's Pancakes')), ('NA_NA_vp91w5_Bob's Pancakes.mp4', (None, None, 'vp91w5', 'Bob's Pancakes')), ('Learning Self-Reliance_20170529_p_MzsCFkUPU_Beekeeping 2017 Part 6 - Merging Hives.mp4', - ('Learning Self-Reliance', '20170529', 'p_MzsCFkUPU', 'Beekeeping 2017 Part 6 - Merging Hives')) + ('Learning Self-Reliance', '20170529', 'p_MzsCFkUPU', 'Beekeeping 2017 Part 6 - Merging Hives')), + ('Learning Self-Reliance_20170529_p_Mzs_Beekeeping 2017 Part 6 - Merging Hives.mp4', + ('Learning Self-Reliance', '20170529', 'p_Mzs', 'Beekeeping 2017 Part 6 - Merging Hives')), + ('Learning Self-Reliance_20170529_p_Beekeeping 2017 Part 6 - Merging Hives.mp4', + ('Learning Self-Reliance', '20170529', None, 'p_Beekeeping 2017 Part 6 - Merging Hives')), ]) def test_parse_video_file_name(file_name, expected): """