X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/d98fa16ebe5bdb0cc200659ab01857f2d81deb29..5b1eddb70881d4dfd7a67c50b5b22e315927bf24:/Folder.py?ds=sidebyside diff --git a/Folder.py b/Folder.py index 9a992f9..8ed3cc3 100644 --- a/Folder.py +++ b/Folder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ####################################################################################### # Plinn - http://plinn.org # -# Copyright (C) 2005-2007 Benoît PIN # +# Copyright (C) 2005-2014 Benoît Pin # # # # This program is free software; you can redistribute it and/or # # modify it under the terms of the GNU General Public License # @@ -27,9 +27,11 @@ from OFS.CopySupport import CopyError, eNoData, _cb_decode, eInvalid, eNotFound, eNotSupported, sanity_check, cookie_path from App.Dialogs import MessageDialog from zExceptions import BadRequest +from zExceptions import Unauthorized import sys import warnings from cgi import escape +from urllib import unquote from OFS import Moniker from ZODB.POSException import ConflictError import OFS.subscribers @@ -56,6 +58,7 @@ from Products.CMFCore.utils import _checkPermission, getToolByName from Products.CMFCore.utils import getUtilityByInterfaceName from Products.CMFCore.CMFCatalogAware import CMFCatalogAware from Products.CMFCore.PortalFolder import PortalFolder, ContentFilter +from Products.CMFCore.interfaces import IDublinCore from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl from zope.interface import implements @@ -66,6 +69,11 @@ from utils import Message as _ from utils import makeValidId from Globals import InitializeClass from AccessControl import ClassSecurityInfo +from ZServer import LARGE_FILE_THRESHOLD +from webdav.interfaces import IWriteLock +from webdav.common import Locked +from webdav.common import PreconditionFailed +from zope.contenttype import guess_content_type class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : @@ -258,7 +266,9 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool') contentFilter['path'] = {'query':'/'.join(self.getPhysicalPath()), 'depth':1} - return ctool(sort_on='position', **contentFilter) + if not contentFilter.has_key('sort_on') : + contentFilter['sort_index'] = 'position' + return ctool(**contentFilter) security.declarePublic('synContentValues') def synContentValues(self): @@ -289,7 +299,73 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : The default behavior (NullRessource.PUT + PortalFolder.PUT_factory) disallow files names with '_' at the begining. """ - pass + + self.dav__init(REQUEST, RESPONSE) + fileName = unquote(REQUEST.getHeader('X-File-Name', '')) + validId = makeValidId(self, fileName, allow_dup=True) + + ifhdr = REQUEST.get_header('If', '') + if self.wl_isLocked(): + if ifhdr: + self.dav__simpleifhandler(REQUEST, RESPONSE, col=1) + else: + raise Locked + elif ifhdr: + raise PreconditionFailed + + if int(REQUEST.get('CONTENT_LENGTH') or 0) > LARGE_FILE_THRESHOLD: + file = REQUEST['BODYFILE'] + body = file.read(LARGE_FILE_THRESHOLD) + file.seek(0) + else: + body = REQUEST.get('BODY', '') + + typ=REQUEST.get_header('content-type', None) + if typ is None: + typ, enc=guess_content_type(validId, body) + + if self.checkIdAvailable(validId) : + try : + ob = self.PUT_factory(validId, typ, body) + self._setObject(validId, ob) + ob = self._getOb(validId) + except ValueError : # maybe "Disallowed subobject type". Fallback to file type. + validId = self.invokeFactory('File', validId) + ob = self._getOb(validId) + if IDublinCore.providedBy(ob) : + ob.editMetadata(title=fileName, + format=typ) + httpRespCode = 201 + else : + httpRespCode = 200 + ob = self._getOb(validId) + + # We call _verifyObjectPaste with verify_src=0, to see if the + # user can create this type of object (and we don't need to + # check the clipboard. + try: + self._verifyObjectPaste(ob.__of__(self), 0) + except CopyError: + sMsg = 'Unable to create object of class %s in %s: %s' % \ + (ob.__class__, repr(self), sys.exc_info()[1],) + raise Unauthorized, sMsg + + ob.PUT(REQUEST, RESPONSE) + ob.orig_name = fileName + + # get method from ob created / refreshed + ti = ob.getTypeInfo() + method_id = ti.queryMethodID('jsupload_snippet') + meth = getattr(ob, method_id) if method_id else None + if not meth : + # get method from container that receive uploaded content + ti = self.getTypeInfo() + method_id = ti.queryMethodID('jsupload_snippet') + meth = getattr(self, method_id) if method_id else lambda ob : 'Not implemented' + + RESPONSE.setStatus(httpRespCode) + RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8') + return '%s' % meth(ob).strip() # ## overload to maintain ownership if authenticated user has 'Manage portal' permission