From 337e0c62f894722e9c268b14d02a85b84c96024d Mon Sep 17 00:00:00 2001 From: pukkandan Date: Sat, 29 May 2021 01:39:07 +0530 Subject: [embedthumbnail] Correctly escape filename Closes #352 The approach in [1] is faulty as can be seen in the test cases 1. https://github.com/ytdl-org/youtube-dl/commit/bff857a8af696e701482208617bf0b7564951326 --- test/test_postprocessors.py | 27 +++++++++++++++++++++++- test/testdata/thumbnails/foo %d bar/foo_%d.webp | Bin 0 -> 3928 bytes 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 test/testdata/thumbnails/foo %d bar/foo_%d.webp (limited to 'test') diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py index 7574a0b95..868bb25f9 100644 --- a/test/test_postprocessors.py +++ b/test/test_postprocessors.py @@ -8,7 +8,11 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from yt_dlp.postprocessor import MetadataFromFieldPP, MetadataFromTitlePP +from yt_dlp.postprocessor import ( + FFmpegThumbnailsConvertorPP, + MetadataFromFieldPP, + MetadataFromTitlePP, +) class TestMetadataFromField(unittest.TestCase): @@ -30,3 +34,24 @@ class TestMetadataFromTitle(unittest.TestCase): def test_format_to_regex(self): pp = MetadataFromTitlePP(None, '%(title)s - %(artist)s') self.assertEqual(pp._titleregex, r'(?P.+)\ \-\ (?P<artist>.+)') + + +class TestConvertThumbnail(unittest.TestCase): + def test_escaping(self): + pp = FFmpegThumbnailsConvertorPP() + if not pp.available: + print('Skipping: ffmpeg not found') + return + + file = 'test/testdata/thumbnails/foo %d bar/foo_%d.{}' + tests = (('webp', 'png'), ('png', 'jpg')) + + for inp, out in tests: + out_file = file.format(out) + if os.path.exists(out_file): + os.remove(out_file) + pp.convert_thumbnail(file.format(inp), out) + assert os.path.exists(out_file) + + for _, out in tests: + os.remove(file.format(out)) diff --git a/test/testdata/thumbnails/foo %d bar/foo_%d.webp b/test/testdata/thumbnails/foo %d bar/foo_%d.webp new file mode 100644 index 000000000..d64d0839f Binary files /dev/null and b/test/testdata/thumbnails/foo %d bar/foo_%d.webp differ -- cgit v1.2.3