raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

asdf

Browse Source
This commit is contained in:
Andreas Preikschat 2011-06-12 17:59:46 +02:00
parent 1cc95fddb6
commit 900a817cbf
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openlp/core/lib/__init__.py
View File

@ -137,7 +137,7 @@ def image_to_byte(image):
# convert to base64 encoding so does not get missed! # convert to base64 encoding so does not get missed!
return byte_array.toBase64() return byte_array.toBase64()
def create_thumb(image_path, thumb_path, return_icon=True): def create_thumb(image_path, thumb_path, return_icon=True, size=None):
""" """
Create a thumbnail from the given image path and depending on Create a thumbnail from the given image path and depending on
``return_icon`` it returns an icon from this thumb. ``return_icon`` it returns an icon from this thumb.
@ -151,11 +151,17 @@ def create_thumb(image_path, thumb_path, return_icon=True):
``return_icon`` ``return_icon``
States if an icon should be build and returned from the thumb. Defaults States if an icon should be build and returned from the thumb. Defaults
to ``True``. to ``True``.
``size``
""" """
ext = os.path.splitext(thumb_path)[1].lower() ext = os.path.splitext(thumb_path)[1].lower()
reader = QtGui.QImageReader(image_path) reader = QtGui.QImageReader(image_path)
if size is None:
ratio = float(reader.size().width()) / float(reader.size().height()) ratio = float(reader.size().width()) / float(reader.size().height())
reader.setScaledSize(QtCore.QSize(int(ratio * 88), 88)) reader.setScaledSize(QtCore.QSize(int(ratio * 88), 88))
else:
reader.setScaledSize(size)
thumb = reader.read() thumb = reader.read()
thumb.save(thumb_path, ext[1:]) thumb.save(thumb_path, ext[1:])
if not return_icon: if not return_icon:
@ -165,21 +171,21 @@ def create_thumb(image_path, thumb_path, return_icon=True):
# Fallback for files with animation support. # Fallback for files with animation support.
return build_icon(unicode(image_path)) return build_icon(unicode(image_path))
def validate_thumb(image_path, thumb_path): def validate_thumb(file_path, thumb_path):
""" """
Validates whether an image's thumb still exists and if is up to date. Validates whether an file's thumb still exists and if is up to date.
**Note**, you must **not** call this function, before checking the **Note**, you must **not** call this function, before checking the
existence of the image. existence of the file.
``image_path`` ``file_path``
The path to the image. The path to the file. The file must exist!
``thumb_path`` ``thumb_path``
The path to the thumb. The path to the thumb.
""" """
if not os.path.exists(unicode(thumb_path)): if not os.path.exists(unicode(thumb_path)):
return False return False
image_date = os.stat(unicode(image_path)).st_mtime image_date = os.stat(unicode(file_path)).st_mtime
thumb_date = os.stat(unicode(thumb_path)).st_mtime thumb_date = os.stat(unicode(thumb_path)).st_mtime
return image_date <= thumb_date return image_date <= thumb_date

18
openlp/plugins/presentations/lib/presentationcontroller.py
View File

@ -31,7 +31,7 @@ import shutil
from PyQt4 import QtCore from PyQt4 import QtCore
from openlp.core.lib import Receiver, resize_image from openlp.core.lib import Receiver, create_thumb, resize_image, validate_thumb
from openlp.core.utils import AppLocation from openlp.core.utils import AppLocation
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -149,11 +149,15 @@ class PresentationDocument(object):
recent than the powerpoint recent than the powerpoint
""" """
lastimage = self.get_thumbnail_path(self.get_slide_count(), True) lastimage = self.get_thumbnail_path(self.get_slide_count(), True)
a = validate_thumb(self.filepath, lastimage)
if not (lastimage and os.path.isfile(lastimage)): if not (lastimage and os.path.isfile(lastimage)):
return False return False
imgdate = os.stat(lastimage).st_mtime imgdate = os.stat(lastimage).st_mtime
pptdate = os.stat(self.filepath).st_mtime pptdate = os.stat(self.filepath).st_mtime
return imgdate >= pptdate #return imgdate >= pptdate
d = imgdate >= pptdate
print a, d
return a
def close_presentation(self): def close_presentation(self):
""" """
@ -245,9 +249,15 @@ class PresentationDocument(object):
""" """
if self.check_thumbnails(): if self.check_thumbnails():
return return
import time
import datetime
start = time.time()
if os.path.isfile(file): if os.path.isfile(file):
img = resize_image(file, 320, 240) size = QtCore.QSize(320, 240)
img.save(self.get_thumbnail_path(idx, False)) create_thumb(file, self.get_thumbnail_path(idx, False), False, size)
# img = resize_image(file, 320, 240)
# img.save(self.get_thumbnail_path(idx, False))
print unicode(datetime.timedelta(seconds=time.time() - start))
def get_thumbnail_path(self, slide_no, check_exists): def get_thumbnail_path(self, slide_no, check_exists):
""" """