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

media asset: take modification date from file for versions

Browse source
This commit is contained in:
Helmut Merz 2014-10-02 07:57:38 +02:00
parent e4df135f5c
commit 13f80f2093
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
media/asset.py
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2009 Helmut Merz helmutm@cy55.de # Copyright (c) 2014 Helmut Merz helmutm@cy55.de
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -20,8 +20,6 @@
Media asset file adapter. Media asset file adapter.
Original authors: Johann Schimpf, Erich Seifert. Original authors: Johann Schimpf, Erich Seifert.
$Id$
""" """
from datetime import datetime from datetime import datetime
@ -35,9 +33,11 @@ from zope.interface import implements
from cybertools.media.asset import MediaAssetFile from cybertools.media.asset import MediaAssetFile
from cybertools.storage.interfaces import IExternalStorage from cybertools.storage.interfaces import IExternalStorage
import cybertools.util.date import cybertools.util.date
from loops.common import adapted
from loops.media.interfaces import IMediaAsset from loops.media.interfaces import IMediaAsset
from loops.resource import ExternalFileAdapter from loops.resource import ExternalFileAdapter
from loops.type import TypeInterfaceSourceList from loops.type import TypeInterfaceSourceList
from loops.versioning.interfaces import IVersionable
transformPrefix = 'asset_transform.' transformPrefix = 'asset_transform.'
@ -95,8 +95,9 @@ class MediaAsset(MediaAssetFile, ExternalFileAdapter):
return ExternalFileAdapter.getData(self) return ExternalFileAdapter.getData(self)
def getModified(self): def getModified(self):
master = adapted(IVersionable(self.context).master)
d = getattr(self.context, '_modified', None) d = getattr(self.context, '_modified', None)
if not d: if not d or self != master:
dp = self.getDataPath() dp = self.getDataPath()
if dp is not None: if dp is not None:
name, ext = os.path.splitext(os.path.basename(dp)) name, ext = os.path.splitext(os.path.basename(dp))