From 30b235a04e87340ff3cef70bf36f49d4bb687ad8 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 27 Jan 2022 21:06:30 -0700 Subject: [PATCH] Using greedy regex match on source_id. --- modules/videos/lib.py | 2 +- modules/videos/test/test_lib.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/videos/lib.py b/modules/videos/lib.py index 053bf500..d39263d0 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))_(?:(.+)_)?(.*)\.' 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 bdf35d3b..84db1f38 100644 --- a/modules/videos/test/test_lib.py +++ b/modules/videos/test/test_lib.py @@ -170,6 +170,8 @@ def test_validate_video_exception(test_session, simple_channel, video_factory): ('foo .mp4', (None, None, None, 'foo')), ('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')) ]) def test_parse_video_file_name(file_name, expected): """