Merge pull request #917 from taigaio/use-psd-tools-for-psd-resize

Using psd-tools for psd thumbnail
remotes/origin/github-import
David Barragán Merino 2017-01-12 21:36:25 +01:00 committed by GitHub
commit e12e210d2b
2 changed files with 11 additions and 2 deletions

View File

@ -33,3 +33,4 @@ pyjwkest==1.3.2
python-dateutil==2.6.0
netaddr==0.7.18
serpy==0.1.1
psd-tools==1.4

View File

@ -18,12 +18,22 @@
import os
from psd_tools import PSDImage
from django.db.models.fields.files import FieldFile
from taiga.base.utils.urls import get_absolute_url
from easy_thumbnails.files import get_thumbnailer
from easy_thumbnails.exceptions import InvalidImageFormatError
from PIL import Image
def psd_image_factory(data, *args):
return PSDImage.from_stream(data).as_PIL()
Image.init()
Image.register_open("PSD", psd_image_factory)
def get_thumbnail_url(file_obj, thumbnailer_size):
@ -35,8 +45,6 @@ def get_thumbnail_url(file_obj, thumbnailer_size):
source_extension = os.path.splitext(relative_name)[1][1:]
if source_extension == "tiff":
return None
if source_extension == "psd":
return None
try:
path_url = get_thumbnailer(file_obj)[thumbnailer_size].url