cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add fill option to media asset resize function

Browse source
This commit is contained in:
hplattner 2015-09-29 11:42:42 +02:00
parent 81d17e8966
commit e5a09ed436
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
media/asset.py
View file

@ -29,11 +29,9 @@ from logging import getLogger
import mimetypes import mimetypes
import os, re, sys import os, re, sys
from zope import component
from zope.interface import implements from zope.interface import implements
from cybertools.media.interfaces import IMediaAsset, IFileTransform from cybertools.media.interfaces import IMediaAsset
from cybertools.media.piltransform import PILTransform from cybertools.media.piltransform import PILTransform
from cybertools.storage.filesystem import FileSystemStorage
TRANSFORM_STATEMENT = re.compile(r"\s*(\+?)([\w]+[\w\d]*)\(([^\)]*)\)\s*") TRANSFORM_STATEMENT = re.compile(r"\s*(\+?)([\w]+[\w\d]*)\(([^\)]*)\)\s*")
@ -41,13 +39,16 @@ DEFAULT_FORMATS = {
"image": "image/jpeg" "image": "image/jpeg"
} }
def parseTransformStatements(txStr): def parseTransformStatements(txStr):
""" Parse statements in transform chain strings.""" """ Parse statements in transform chain strings."""
statements = TRANSFORM_STATEMENT.findall(txStr) statements = TRANSFORM_STATEMENT.findall(txStr)
return statements return statements
def getMimeBasetype(mimetype): def getMimeBasetype(mimetype):
return mimetype.split("/",1)[0] return mimetype.split("/", 1)[0]
def getMimetypeExt(mimetype): def getMimetypeExt(mimetype):
exts = mimetypes.guess_all_extensions(mimetype) exts = mimetypes.guess_all_extensions(mimetype)
@ -74,9 +75,9 @@ class MediaAssetFile(object):
getLogger('cybertools.media.asset.MediaAssetFile').warn( getLogger('cybertools.media.asset.MediaAssetFile').warn(
'Media asset directory %r not found.' % path) 'Media asset directory %r not found.' % path)
self.transform() self.transform()
#return self.getOriginalData() # return self.getOriginalData()
f = open(path, 'rb') f = open(path, 'rb')
data =f.read() data = f.read()
f.close() f.close()
return data return data

12
media/piltransform.py
View file

@ -93,7 +93,7 @@ class PILTransform(object):
box = (left, upper, right, lower) box = (left, upper, right, lower)
self.im = self.im.crop(box) self.im = self.im.crop(box)
def resize(self, width, height=None): def resize(self, width, height=None, fill=False):
if self.im is None: if self.im is None:
return return
if not height: if not height:
@ -101,7 +101,15 @@ class PILTransform(object):
ratio = float(ow) / float(oh) ratio = float(ow) / float(oh)
height = int(round(float(width) / ratio)) height = int(round(float(width) / ratio))
dims = (width, height) dims = (width, height)
self.im.thumbnail(dims, Image.ANTIALIAS) if fill:
image = self.im
image.thumbnail(dims, Image.ANTIALIAS)
new = Image.new('RGBA', dims, (255, 255, 255, 0)) #with alpha
new.paste(image,((dims[0] - image.size[0]) / 2,
(dims[1] - image.size[1]) / 2))
self.im = new
return new
return self.im.thumbnail(dims, Image.ANTIALIAS)
def save(self, path, mimetype): def save(self, path, mimetype):
if self.im is None: if self.im is None: