forks/sigal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More checks and logging for thumbnails (ref #71).

Browse Source
This commit is contained in:
Simon Conseil
2014-02-05 00:28:11 +01:00
parent 70332ec37f
commit 98f08ccfe3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sigal/gallery.py
View File

@@ -132,6 +132,7 @@ class PathsDb(object):
alb_thumb = self.db[path].setdefault('thumbnail', '')
if alb_thumb and os.path.isfile(join(self.basepath, path,
alb_thumb)):
self.logger.debug("Thumb for %s : %s", path, alb_thumb)
continue
for subdir in self.get_subdirs(path):
@@ -140,6 +141,8 @@ class PathsDb(object):
self.db[path]['thumbnail'] = join(
os.path.relpath(subdir, path),
self.db[subdir]['thumbnail'])
self.logger.debug("Found thumb for %s : %s", path,
self.db[path]['thumbnail'])
break
if not self.db[path].get('thumbnail', ''):

12
sigal/writer.py
View File

@@ -176,18 +176,22 @@ class Writer(object):
# generate the thumbnail if it is missing (if
# settings['make_thumbs'] is False)
if not os.path.exists(thumb_path):
if not os.path.isfile(thumb_path):
source = os.path.join(self.output_dir, dpath, alb_thumb)
ext = os.path.splitext(source)[1]
self.logger.debug("Generating thumbnail for %s", source)
if ext in self.settings['img_ext_list']:
generator = sigal.image.generate_thumbnail
else:
elif ext in self.settings['vid_ext_list']:
generator = sigal.video.generate_thumbnail
else:
generator = None
self.logger.error('Unsupported file type for %s', source)
generator(source, thumb_path, self.settings['thumb_size'],
fit=self.settings['thumb_fit'])
if generator:
generator(source, thumb_path, self.settings['thumb_size'],
fit=self.settings['thumb_fit'])
ctx['albums'].append({
'url': d + '/' + self.url_ext,