rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-26 02:48:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Removing for loop. Adding orphan meta file.

Browse source
This commit is contained in:
Roland 2019-10-14 16:59:53 -06:00
parent b4f031779d
commit ef4656aa65
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
wrolpi/plugins/videos/api.py
View file

@ -214,11 +214,10 @@ def refresh_channel_videos(db, channel):
# A set of absolute paths that exist in the file system
possible_new_paths = list(generate_video_paths(directory))
# make them relative to this channel
new_videos = []
for possible_new_path in possible_new_paths:
if possible_new_path.relative_to(directory) not in existing_paths:
new_videos.append(possible_new_path)
# Get the absolute paths who's path relative to the channel does't yet exist
# (paths in DB are relative, but we need to pass an absolute path)
new_videos = {p for p in possible_new_paths if p.relative_to(directory) not in existing_paths}
for video_path in new_videos:
logger.debug(f'{channel["name"]}: Added {video_path}')

16
wrolpi/plugins/videos/test/test_api.py
View file

@ -130,7 +130,7 @@ class TestAPI(unittest.TestCase):
vid2 = pathlib.Path(channel_path / 'channel name_20000102_bcdefghijkl_title.webm')
vid2.touch()
# These files are associated with the video files above, and should be found second
# These files are associated with the video files above, and should be found "near" them
poster1 = pathlib.Path(channel_path / 'channel name_20000101_abcdefghijk_title.jpg')
poster1.touch()
poster2 = pathlib.Path(channel_path / 'channel name_20000102_bcdefghijkl_title.jpg')
@ -158,16 +158,22 @@ class TestAPI(unittest.TestCase):
description3 = pathlib.Path(channel_path / 'channel name_20000103_cdefghijklm_title.description')
description3.touch()
# A orphan meta-file should be ignored. This shouldn't show up anywhere.
poster3 = pathlib.Path(channel_path / 'channel name_20000104_defghijklmn_title.jpg')
poster3.touch()
# Finally, call the refresh. Again, it should remove the "foo" video, then discover this 3rd video
# file and it's description.
refresh_videos(db)
# Bogus file was removed
self.assertNotIn('foo', {i['video_path'] for i in channel['videos']})
# Final structure we built
# Final channel video list we built
expected = {
(vid1.name, poster1.name, None),
(vid2.name, poster2.name, None),
(vid3.name, None, description3.name),
(vid1.name, poster1.name, None), # no description
(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']},