diff --git a/wrolpi/plugins/videos/downloader.py b/wrolpi/plugins/videos/downloader.py index 67e9549d..dbbc012c 100755 --- a/wrolpi/plugins/videos/downloader.py +++ b/wrolpi/plugins/videos/downloader.py @@ -1,7 +1,6 @@ #! /usr/bin/env python3 import glob import hashlib -import json import logging import pathlib import re @@ -166,7 +165,8 @@ def replace_extension(path: pathlib.Path, new_ext) -> pathlib.Path: return path -def find_meta_files(path: pathlib.Path, relative_to=None) -> Tuple[pathlib.Path, pathlib.Path, pathlib.Path, pathlib.Path]: +def find_meta_files(path: pathlib.Path, relative_to=None) -> Tuple[ + pathlib.Path, pathlib.Path, pathlib.Path, pathlib.Path]: """Find all files that share a file's full path, except their extensions. It is assumed that file with the same name, but different extension is related to that file. diff --git a/wrolpi/plugins/videos/test/test_api.py b/wrolpi/plugins/videos/test/test_api.py index 2fd855b0..16f5be69 100644 --- a/wrolpi/plugins/videos/test/test_api.py +++ b/wrolpi/plugins/videos/test/test_api.py @@ -177,8 +177,8 @@ class TestAPI(unittest.TestCase): # Final channel video list we built expected = { ('subdir/' + vid1.name, 'subdir/' + poster1.name, None), # in a subdirectory, no description - (vid2.name, poster2.name, None), # no description - (vid3.name, None, description3.name), # no poster + (vid2.name, poster2.name, None), # no description + (vid3.name, None, description3.name), # no poster } self.assertEqual( {(i['video_path'], i['poster_path'], i['description_path']) for i in channel['videos']},