sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-03 20:02:47 +00:00
Code Issues Projects Releases Wiki Activity

Change nopaque upload forms. Add corpus file form has an upload progress bar now.

Browse Source
This commit is contained in:
Patrick Jentsch
2020-04-16 09:40:38 +02:00
parent 4992ac73a8
commit fede774196
7 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/corpora/forms.py
View File

@@ -30,10 +30,10 @@ class AddCorpusFileForm(FlaskForm):
if not field.data.filename.lower().endswith('.vrt'):
raise ValidationError('File does not have an approved extension: '
'.vrt')
filename = secure_filename(field.data.filename)
field.data.filename = secure_filename(field.data.filename)
for corpus_file in self.corpus.files:
if filename == corpus_file.filename:
raise ValidationError('File already registered to this corpus.')
if field.data.filename == corpus_file.filename:
raise ValidationError('File already registered to corpus.')
class EditCorpusFileForm(FlaskForm):

40
app/corpora/views.py
View File

@@ -93,30 +93,32 @@ def add_corpus_file(corpus_id):
corpus = Corpus.query.get_or_404(corpus_id)
if not (corpus.creator == current_user or current_user.is_administrator()):
abort(403)
add_corpus_file_form = AddCorpusFileForm(corpus, prefix='add-job-form')
add_corpus_file_form = AddCorpusFileForm(corpus,
prefix='add-corpus-file-form')
if add_corpus_file_form.is_submitted():
if not add_corpus_file_form.validate():
logger.warning(add_corpus_file_form.errors)
return make_response(add_corpus_file_form.errors, 400)
file = add_corpus_file_form.file.data
filename = secure_filename(file.filename)
# Save the file
dir = os.path.join(str(corpus.user_id), 'corpora', str(corpus.id))
file.save(os.path.join(current_app.config['NOPAQUE_STORAGE'],
dir, filename))
ids = [field.id for field in add_corpus_file_form if not
(field.id == 'submit'
or field.id == "csrf_token"
or field.id == "file")]
data = [field.data for field in add_corpus_file_form if not
(field.id == 'submit'
or field.id == "csrf_token"
or field.id == "file")]
field_dict = dict(zip(ids, data))
corpus_file = CorpusFile(**field_dict,
corpus=corpus,
dir=dir,
filename=filename)
add_corpus_file_form.file.data.save(
os.path.join(current_app.config['NOPAQUE_STORAGE'], dir,
add_corpus_file_form.file.data.filename))
corpus_file = CorpusFile(
address=add_corpus_file_form.address.data,
author=add_corpus_file_form.author.data,
booktitle=add_corpus_file_form.booktitle.data,
chapter=add_corpus_file_form.chapter.data,
corpus=corpus,
dir=dir,
editor=add_corpus_file_form.editor.data,
filename=add_corpus_file_form.file.data.filename,
institution=add_corpus_file_form.institution.data,
journal=add_corpus_file_form.journal.data,
pages=add_corpus_file_form.pages.data,
publisher=add_corpus_file_form.publisher.data,
publishing_year=add_corpus_file_form.publishing_year.data,
school=add_corpus_file_form.school.data,
title=add_corpus_file_form.title.data)
db.session.add(corpus_file)
db.session.commit()
thread = Thread(target=edit_corpus_file_,