Mercurial Repository: p/roundup/code: roundup/cgi/form

comparison roundup/cgi/form_parser.py @ 5065:47ab150b7325

Allow multiple file uploads If the html template specifies multiple="multiple" for a file upload the user can attach multiple files and the form parser now handles this.

author	Ralf Schlatterbeck <rsc@runtux.com>
date	Mon, 30 May 2016 17:23:35 +0200
parents	9792b18e0b19
children	d2256fcfd81f

comparison

equal deleted inserted replaced

-:46da0db55545
+:47ab150b7325
 @link@files=file-1
 file-1@content=value
 The String content value is handled as described above for
 file uploads.
+If "multiple" is turned on for file uploads in the html
+template, multiple links are generated::
+@link@files=file-2
+file-2@content=value
+...
+depending on how many files the user has attached.
 If both the "@note" and "@file" form variables are
 specified, the action::
 @link@msg-1@files=file-1
-is also performed.
+is also performed. If "multiple" is specified this is
+carried out for each of the attached files.
 We also check that FileClass items have a "content" property with
 actual content, otherwise we remove them from all_props before
 returning.
 all_links.append((default_cn, default_nodeid, 'messages',
 [('msg', '-1')]))
 have_note = 1
 elif d['file']:
 # the special file field
-cn = 'file'
+cn = default_cn
-cl = self.db.classes[cn]
+cl = default_cl
-nodeid = '-1'
+nodeid = default_nodeid
-propname = 'content'
+propname = 'files'
-all_links.append((default_cn, default_nodeid, 'files',
-[('file', '-1')]))
-have_file = 1
 else:
 # default
 cn = default_cn
 cl = default_cl
 nodeid = default_nodeid
 if d['link']:
 value = []
 for entry in self.extractFormList(form[key]):
 m = self.FV_DESIGNATOR.match(entry)
 if not m:
-raise FormError, self._('link "%(key)s" '
+raise FormError (self._('link "%(key)s" '
-'value "%(entry)s" not a designator') % locals()
+'value "%(entry)s" not a designator') % locals())
 value.append((m.group(1), m.group(2)))
 # get details of linked class
 lcn = m.group(1)
 lcl = self.db.classes[lcn]
 got_props[(lcn, lnodeid)] = {}
 # make sure the link property is valid
 if (not isinstance(propdef[propname], hyperdb.Multilink) and
 not isinstance(propdef[propname], hyperdb.Link)):
-raise FormError, self._('%(class)s %(property)s '
+raise FormError (self._('%(class)s %(property)s '
 'is not a link or multilink property') % {
-'class':cn, 'property':propname}
+'class':cn, 'property':propname})
 all_links.append((cn, nodeid, propname, value))
 continue
 # detect the special ":required" variable
 if d['required']:
 for entry in self.extractFormList(form[key]):
 m = self.FV_SPECIAL.match(entry)
 if not m:
-raise FormError, self._('The form action claims to '
+raise FormError (self._('The form action claims to '
 'require property "%(property)s" '
 'which doesn\'t exist') % {
-'property':propname}
+'property':propname})
 if m.group('classname'):
 this = (m.group('classname'), m.group('id'))
 entry = m.group('propname')
 if not all_required.has_key(this):
 all_required[this] = []
 mlaction = 'add'
 # does the property exist?
 if not propdef.has_key(propname):
 if mlaction != 'set':
-raise FormError, self._('You have submitted a %(action)s '
+raise FormError (self._('You have submitted a %(action)s '
 'action for the property "%(property)s" '
 'which doesn\'t exist') % {
-'action': mlaction, 'property':propname}
+'action': mlaction, 'property':propname})
 # the form element is probably just something we don't care
 # about - ignore it
 continue
 proptype = propdef[propname]
 # Get the form value. This value may be a MiniFieldStorage
 # or a list of MiniFieldStorages.
 value = form[key]
 # handle unpacking of the MiniFieldStorage / list form value
-if isinstance(proptype, hyperdb.Multilink):
+if d['file']:
+assert isinstance(proptype, hyperdb.Multilink)
+# value is a file upload... we *always* handle multiple
+# files here (html5)
+if not isinstance(value, type([])):
+value = [value]
+elif isinstance(proptype, hyperdb.Multilink):
 value = self.extractFormList(value)
 else:
 # multiple values are not OK
 if isinstance(value, type([])):
-raise FormError, self._('You have submitted more than one '
+raise FormError (self._('You have submitted more than one '
-'value for the %s property') % propname
+'value for the %s property') % propname)
-# value might be a file upload...
+# value might be a single file upload
-if not hasattr(value, 'filename') or value.filename is None:
+if not getattr(value, 'filename', None):
-# nope, pull out the value and strip it
 value = value.value.strip()
 # now that we have the props field, we need a teensy little
 # extra bit of help for the old :note field...
 if d['note'] and value:
 for key, d in matches:
 if d['confirm'] and d['propname'] == propname:
 confirm = form[key]
 break
 else:
-raise FormError, self._('Password and confirmation text '
+raise FormError (self._('Password and confirmation text '
-'do not match')
+'do not match'))
 if isinstance(confirm, type([])):
-raise FormError, self._('You have submitted more than one '
+raise FormError (self._('You have submitted more than one '
-'value for the %s property') % propname
+'value for the %s property') % propname)
 if value != confirm.value:
-raise FormError, self._('Password and confirmation text '
+raise FormError (self._('Password and confirmation text '
-'do not match')
+'do not match'))
 try:
 value = password.Password(value, scheme = proptype.scheme,
 config=self.db.config)
 except hyperdb.HyperdbValueError, msg:
-raise FormError, msg
+raise FormError (msg)
+if d['file']:
+# This needs to be a Multilink and is checked above
+fcn = 'file'
+fcl = self.db.classes[fcn]
+fpropname = 'content'
+if not all_propdef.has_key(fcn):
+all_propdef[fcn] = fcl.getprops()
+fpropdef = all_propdef[fcn]
+have_file = []
+for n, v in enumerate(value):
+if not hasattr(v, 'filename'):
+raise FormError (self._('Not a file attachment'))
+# skip if the upload is empty
+if not v.filename:
+continue
+fnodeid = str (-(n+1))
+have_file.append(fnodeid)
+fthis = (fcn, fnodeid)
+if fthis not in all_props:
+all_props[fthis] = {}
+fprops = all_props[fthis]
+all_links.append((cn, nodeid, 'files', [('file', fnodeid)]))
+fprops['content'] = self.parse_file(fpropdef, fprops, v)
+value = None
+nodeid = None
 elif isinstance(proptype, hyperdb.Multilink):
 # convert input to list of ids
 try:
 l = hyperdb.rawToHyperdb(self.db, cl, nodeid,
 propname, value)
 except hyperdb.HyperdbValueError, msg:
-raise FormError, msg
+raise FormError (msg)
 # now use that list of ids to modify the multilink
 if mlaction == 'set':
 value = l
 else:
 # the list
 for entry in l:
 try:
 existing.remove(entry)
 except ValueError:
-raise FormError, self._('property '
+raise FormError (self._('property '
 '"%(propname)s": "%(value)s" '
 'not currently in list') % {
-'propname': propname, 'value': entry}
+'propname': propname, 'value': entry})
 else:
 # add - easy, just don't dupe
 for entry in l:
 if entry not in existing:
 existing.append(entry)
 # other types should be None'd if there's no value
 value = None
 else:
 # handle all other types
 try:
-if isinstance(proptype, hyperdb.String):
+# Try handling file upload
-if (hasattr(value, 'filename') and
+if (isinstance(proptype, hyperdb.String) and
-value.filename is not None):
+hasattr(value, 'filename') and
-# skip if the upload is empty
+value.filename is not None):
-if not value.filename:
+value = self.parse_file(propdef, props, value)
-continue
-# this String is actually a _file_
-# try to determine the file content-type
-fn = value.filename.split('\\')[-1]
-if propdef.has_key('name'):
-props['name'] = fn
-# use this info as the type/filename properties
-if propdef.has_key('type'):
-if hasattr(value, 'type') and value.type:
-props['type'] = value.type
-elif mimetypes.guess_type(fn)[0]:
-props['type'] = mimetypes.guess_type(fn)[0]
-else:
-props['type'] = "application/octet-stream"
-# finally, read the content RAW
-value = value.value
-else:
-value = hyperdb.rawToHyperdb(self.db, cl,
-nodeid, propname, value)
 else:
 value = hyperdb.rawToHyperdb(self.db, cl, nodeid,
 propname, value)
 except hyperdb.HyperdbValueError, msg:
-raise FormError, msg
+raise FormError (msg)
 # register that we got this property
 if isinstance(proptype, hyperdb.Multilink):
 if value != []:
 got_props[this][propname] = 1
 elif isinstance(proptype, hyperdb.String) and value == '':
 continue
 props[propname] = value
-# check to see if we need to specially link a file to the note
+# check to see if we need to specially link files to the note
 if have_note and have_file:
-all_links.append(('msg', '-1', 'files', [('file', '-1')]))
+for fid in have_file:
+all_links.append(('msg', '-1', 'files', [('file', fid)]))
 # see if all the required properties have been supplied
 s = []
 for thing, required in all_required.items():
 # register the values we got
 ) % {
 'class': self._(thing[0]),
 'property': ', '.join(map(self.gettext, required))
 })
 if s:
-raise FormError, '\n'.join(s)
+raise FormError ('\n'.join(s))
 # When creating a FileClass node, it should have a non-empty content
 # property to be created. When editing a FileClass node, it should
 # either have a non-empty content property or no property at all. In
 # the latter case, nothing will change.
 elif isinstance(self.db.classes[cn], hyperdb.FileClass):
 if id is not None and id.startswith('-'):
 if not props.get('content', ''):
 del all_props[(cn, id)]
 elif props.has_key('content') and not props['content']:
-raise FormError, self._('File is empty')
+raise FormError (self._('File is empty'))
 return all_props, all_links
+def parse_file(self, fpropdef, fprops, v):
+# try to determine the file content-type
+fn = v.filename.split('\\')[-1]
+if fpropdef.has_key('name'):
+fprops['name'] = fn
+# use this info as the type/filename properties
+if fpropdef.has_key('type'):
+if hasattr(v, 'type') and v.type:
+fprops['type'] = v.type
+elif mimetypes.guess_type(fn)[0]:
+fprops['type'] = mimetypes.guess_type(fn)[0]
+else:
+fprops['type'] = "application/octet-stream"
+# finally, read the content RAW
+return v.value
 def extractFormList(self, value):
 ''' Extract a list of values from the form value.
 It may be one of:

Mercurial > p > roundup > code

comparison roundup/cgi/form_parser.py @ 5065:47ab150b7325