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

handle extension more gracefully for better finding existing files

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@3471 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2009-07-22 08:17:43 +00:00
parent bfb2fff330
commit 78404c45a8
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
media/asset.py
View file

@ -70,8 +70,8 @@ class MediaAssetFile(object):
return self.getOriginalData() return self.getOriginalData()
path = self.getPath(variant) path = self.getPath(variant)
if not os.path.exists(path): if not os.path.exists(path):
getLogger('Asset Manager').warn( getLogger('cybertools.media.asset.MediaAssetFile').warn(
'Media asset directory for transformation %r not found.' % variant) 'Media asset directory %r not found.' % path)
return self.getOriginalData() return self.getOriginalData()
f = open(path, 'rb') f = open(path, 'rb')
data =f.read() data =f.read()
@ -150,8 +150,12 @@ class MediaAssetFile(object):
dirOrig, fileOrig = os.path.split(pathOrig) dirOrig, fileOrig = os.path.split(pathOrig)
pathTx = os.path.join(dirOrig, variant, self.getName()) pathTx = os.path.join(dirOrig, variant, self.getName())
outputFormat = self.getContentType(variant) outputFormat = self.getContentType(variant)
outputExt = getMimetypeExt(outputFormat) #outputExt = getMimetypeExt(outputFormat)
pathTx = os.path.splitext(pathTx)[0] + outputExt basePath = os.path.splitext(pathTx)[0]
for ext in mimetypes.guess_all_extensions(outputFormat):
pathTx = basePath + ext
if os.path.exists(pathTx):
return pathTx
return pathTx return pathTx
def getMimeType(self): def getMimeType(self):