From: Benoît Pin Date: Thu, 10 Apr 2014 13:16:06 +0000 (+0200) Subject: Utilisation des blobs pour les fichiers attachés (à l'instar des photos). X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/commitdiff_plain/0e070b0d583a3c482f7f72bbd6f2d7c333582965?hp=--cc Utilisation des blobs pour les fichiers attachés (à l'instar des photos). Nettoyage automatique des pièces jointes non utilisées. --- 0e070b0d583a3c482f7f72bbd6f2d7c333582965 diff --git a/AttachmentTool.py b/AttachmentTool.py index 979148d..87535c7 100644 --- a/AttachmentTool.py +++ b/AttachmentTool.py @@ -28,7 +28,8 @@ from Acquisition import aq_base from Globals import InitializeClass from OFS.SimpleItem import SimpleItem from OFS.Folder import Folder -from OFS.Image import File, cookId +from OFS.Image import cookId +from Products.Photo.blobbases import File from zExceptions import Unauthorized from zExceptions import BadRequest from Products.Photo import Photo @@ -45,7 +46,9 @@ from webdav.common import Locked from webdav.common import PreconditionFailed from zope.contenttype import guess_content_type - +from libxml2 import HTML_PARSE_RECOVER, HTML_PARSE_NOERROR, HTML_PARSE_NOWARNING +from libxml2 import htmlReadDoc +PARSE_OPTIONS = HTML_PARSE_RECOVER + HTML_PARSE_NOERROR + HTML_PARSE_NOWARNING class AttachmentTool( UniqueObject, SimpleItem): """ Links attachment objects to contents. @@ -185,7 +188,7 @@ class AttachmentContainer (Folder): ob.PUT(REQUEST, RESPONSE) RESPONSE.setStatus(httpRespCode) RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8') - if ob.meta_type == 'File' : + if ob.meta_type == 'Blob File' : return '' % (ob.getId(), escape(ob.title_or_id())) elif ob.meta_type == 'Photo' : width, height = ob.getResizedImageSize(size=(310, 310)) @@ -195,6 +198,27 @@ class AttachmentContainer (Folder): 'width' : width, 'height' : height } - + + security.declareProtected(ModifyPortalContent, 'removeUnusedAttachments') + def removeUnusedAttachments(self, html) : + html = '
%s
' % html + doc = htmlReadDoc(html, '', None, PARSE_OPTIONS) + used = {} + + hrefs = doc.xpathEval('//a/@href') + for href in [a.get_content() for a in hrefs] : + if href.startswith('attachments/') : + used[href[len('attachments/'):]] = True + + srcs = doc.xpathEval('//img/@src') + for src in [a.get_content() for a in srcs] : + if src.startswith('attachments/') : + parts = src.split('/') + if len(parts) >=2 : + used[parts[1]] = True + + unused = [id for id in self.objectIds() if not used.has_key(id)] + if unused : + self.manage_delObjects(unused) InitializeClass(AttachmentContainer) \ No newline at end of file diff --git a/skins/custom_content/document_edit_form.py b/skins/custom_content/document_edit_form.py index d439bd7..8dffe34 100644 --- a/skins/custom_content/document_edit_form.py +++ b/skins/custom_content/document_edit_form.py @@ -20,9 +20,9 @@ if change and \ elif change_and_view and \ context.validateTextFile(**form) and \ context.validateHTML(**form) and \ - context.document_edit_control(text=form.get('text'), text_format='html') and \ - context.setRedirect(context, 'object/view', **{'ajax':ajax}): - return + context.document_edit_control(text=form.get('text'), text_format='html') : + attachments.removeUnusedAttachments(context.EditableBody()) + return context.setRedirect(context, 'object/view', **{'ajax':ajax}) options = {}