markus/photofloat
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix caching of top-level items

Browse Source
This commit is contained in:
Jerome Charaoui
2014-02-13 23:28:59 -05:00
parent ecbd6d5552
commit 52667388e9
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scanner/PhotoAlbum.py
View File

@ -356,7 +356,7 @@ class Photo(object):
os.unlink(tfn)
def _video_transcode(self, transcode_path, original_path):
transcode_path = os.path.join(transcode_path, cache_base(self._path) + '.webm')
transcode_path = os.path.join(transcode_path, video_cache(self._path))
transcode_cmd = ['-i', original_path, '-c:v', 'libvpx', '-crf', '10', '-b:v', '800k', '-c:a', 'libvorbis', '-f', 'webm', '-threads', '2', '-loglevel', '0', '-y']
filters = []
info_string = "%s -> webm" % (os.path.basename(original_path))
@ -403,7 +403,7 @@ class Photo(object):
for size in Photo.thumb_sizes:
if size[1]:
caches.append(image_cache(self._path, size[0], size[1]))
caches.append(cache_base(self._path) + '.webm')
caches.append(video_cache(self._path))
else:
caches = [image_cache(self._path, size[0], size[1]) for size in Photo.thumb_sizes]
return caches