Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7426 : unused *_init.jpg are created in the narrated website.

Browse Source
This commit is contained in:
SNoiraud 2015-11-27 21:19:33 +01:00
parent e278b66a62
commit d8e7b6f801
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gramps/plugins/webreport/narrativeweb.py
View File

@ -4616,7 +4616,6 @@ class MediaPages(BasePage):
if width != 0 and height != 0: if width != 0 and height != 0:
scale_w = (float(max_width)/width) or 1 # the 'or 1' is so that scale_w = (float(max_width)/width) or 1 # the 'or 1' is so that
# a max of zero is ignored # a max of zero is ignored
scale_h = (float(max_height)/height) or 1 scale_h = (float(max_height)/height) or 1
else: else:
scale_w = 1.0 scale_w = 1.0
@ -4624,32 +4623,9 @@ class MediaPages(BasePage):
scale = min(scale_w, scale_h, 1.0) scale = min(scale_w, scale_h, 1.0)
new_width = int(width*scale) new_width = int(width*scale)
new_height = int(height*scale) new_height = int(height*scale)
if scale < 0.8:
# scale factor is significant enough to warrant making a smaller image
initial_image_path = '%s_init.jpg' % os.path.splitext(newpath)[0]
size = [new_width, new_height]
initial_image_data = resize_to_jpeg_buffer(orig_image_path, size)
new_width = size[0] # In case it changed because of keeping the ratio
new_height = size[1]
if self.report.archive:
filed, dest = tempfile.mkstemp()
os.write(filed, initial_image_data)
os.close(filed)
os.utime(dest, (mtime, mtime))
self.report.archive.add(dest, initial_image_path)
os.unlink(dest)
else:
file_path_init = os.path.join(self.html_dir, initial_image_path)
filed = open(file_path_init, 'wb')
filed.write(initial_image_data)
filed.close()
os.utime(file_path_init, (mtime, mtime))
else:
# not worth actually making a smaller image
initial_image_path = newpath
# TODO. Convert disk path to URL. # TODO. Convert disk path to URL.
url = self.report.build_url_fname(initial_image_path, None, self.up) url = self.report.build_url_fname(orig_image_path, None, self.up)
with Html("div", id="GalleryDisplay", style = 'width: %dpx; height: %dpx' % (new_width, with Html("div", id="GalleryDisplay", style = 'width: %dpx; height: %dpx' % (new_width,
new_height)) as mediadisplay: new_height)) as mediadisplay:
summaryarea += mediadisplay summaryarea += mediadisplay
@ -4668,7 +4644,7 @@ class MediaPages(BasePage):
) )
# display the image # display the image
if initial_image_path != newpath: if orig_image_path != newpath:
url = self.report.build_url_fname(newpath, url = self.report.build_url_fname(newpath,
None, self.up) None, self.up)
mediadisplay += Html("a", href = url) + ( mediadisplay += Html("a", href = url) + (