From 4930709c9d4724e03cd0418c69b2b142976f75d5 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 29 Oct 2019 13:47:25 +0100 Subject: [PATCH 1/3] Add corpus file upload --- app/main/forms.py | 34 +++++++++++------------ app/main/views.py | 25 ++++++++++++++++- app/templates/main/corpora/corpus.html.j2 | 18 +++++++++--- 3 files changed, 55 insertions(+), 22 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 20826e48..43b63275 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1,7 +1,21 @@ from flask_wtf import FlaskForm -from wtforms import (MultipleFileField, StringField, SubmitField, - ValidationError, IntegerField) -from wtforms.validators import DataRequired, Length, NumberRange +from wtforms import (FileField, IntegerField, StringField, SubmitField, + ValidationError) +from wtforms.validators import DataRequired, Length + + +class AddCorpusFileForm(FlaskForm): + author = StringField('Author', validators=[DataRequired(), Length(1, 64)]) + file = FileField('File', validators=[DataRequired()]) + publishing_year = IntegerField('Publishing year', + validators=[DataRequired()]) + submit = SubmitField() + title = StringField('Title', validators=[DataRequired(), Length(1, 64)]) + + def validate_file(form, field): + if not field.data.filename.lower().endswith('.vrt'): + raise ValidationError('File does not have an approved extension: ' + '.vrt') class CreateCorpusForm(FlaskForm): @@ -11,20 +25,6 @@ class CreateCorpusForm(FlaskForm): title = StringField('Title', validators=[DataRequired(), Length(1, 32)]) -class AddCorpusFileForm(FlaskForm): - author = StringField('Author', validators=[DataRequired(), Length(1, 64)]) - files = MultipleFileField('Files', validators=[DataRequired()]) - publishing_year = IntegerField('Publishing year', validators=[DataRequired()]) - submit = SubmitField() - title = StringField('Title', validators=[DataRequired(), Length(1, 64)]) - - def validate_files(form, field): - for file in field.data: - if not file.filename.lower().endswith('.vrt'): - raise ValidationError('File does not have an approved ' - 'extension: .vrt') - - class QueryForm(FlaskForm): query = StringField('CQP Query', validators=[DataRequired()]) # hits_per_page = IntegerField('Hits per page', diff --git a/app/main/views.py b/app/main/views.py index bff10de1..b5b71985 100644 --- a/app/main/views.py +++ b/app/main/views.py @@ -17,7 +17,7 @@ def index(): return render_template('main/index.html.j2', title='Opaque') -@main.route('/corpora/') +@main.route('/corpora/', methods=['GET', 'POST']) @login_required def corpus(corpus_id): corpus = Corpus.query.get_or_404(corpus_id) @@ -26,6 +26,29 @@ def corpus(corpus_id): abort(403) add_corpus_file_form = AddCorpusFileForm() if add_corpus_file_form.validate_on_submit(): + filename = secure_filename(add_corpus_file_form.file.data.filename) + for corpus_file in corpus.files: + if filename == corpus_file.filename: + flash('File already registered to this corpus.') + return redirect(url_for('main.corpus', corpus_id=corpus_id)) + # Gather information to create new corpus file database entry + author = add_corpus_file_form.author.data + dir = os.path.join(str(corpus.user_id), 'jobs', str(corpus.id)) + file = add_corpus_file_form.file.data + publishing_year = add_corpus_file_form.publishing_year.data + title = add_corpus_file_form.title.data + # Save the file + file_dir = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'], + dir) + file.save(os.path.join(file_dir, filename)) + corpus_file = CorpusFile(author=author, + corpus=corpus, + dir=dir, + filename=filename, + publishing_year=publishing_year, + title=title) + db.session.add(corpus_file) + db.session.commit() flash('Corpus file added!') return redirect(url_for('main.corpus', corpus_id=corpus_id)) return render_template('main/corpora/corpus.html.j2', diff --git a/app/templates/main/corpora/corpus.html.j2 b/app/templates/main/corpora/corpus.html.j2 index 5896af60..6a55167d 100644 --- a/app/templates/main/corpora/corpus.html.j2 +++ b/app/templates/main/corpora/corpus.html.j2 @@ -87,7 +87,7 @@
{{ add_corpus_file_form.hidden_tag() }}
-
+
person {{ add_corpus_file_form.author(data_length='64') }} @@ -107,16 +107,26 @@ {% endfor %}
+
+
+ access_time + {{ add_corpus_file_form.publishing_year() }} + {{ add_corpus_file_form.publishing_year.label }} + {% for error in add_corpus_file_form.publishing_year.errors %} + {{ error }} + {% endfor %} +
+
- {{ add_corpus_file_form.files.label.text }} - {{ add_corpus_file_form.files(accept='.vrt') }} + {{ add_corpus_file_form.file.label.text }} + {{ add_corpus_file_form.file(accept='.vrt') }}
- {% for error in add_corpus_file_form.files.errors %} + {% for error in add_corpus_file_form.file.errors %} {{ error }} {% endfor %}
From 0a8f6a5a44f42e8e88e992e831fb4cdeaeb72119 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 29 Oct 2019 13:56:32 +0100 Subject: [PATCH 2/3] Fix file save path --- app/main/views.py | 2 +- app/templates/main/corpora/corpus.html.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/main/views.py b/app/main/views.py index b5b71985..362332bc 100644 --- a/app/main/views.py +++ b/app/main/views.py @@ -33,7 +33,7 @@ def corpus(corpus_id): return redirect(url_for('main.corpus', corpus_id=corpus_id)) # Gather information to create new corpus file database entry author = add_corpus_file_form.author.data - dir = os.path.join(str(corpus.user_id), 'jobs', str(corpus.id)) + dir = os.path.join(str(corpus.user_id), 'corpora', str(corpus.id)) file = add_corpus_file_form.file.data publishing_year = add_corpus_file_form.publishing_year.data title = add_corpus_file_form.title.data diff --git a/app/templates/main/corpora/corpus.html.j2 b/app/templates/main/corpora/corpus.html.j2 index 6a55167d..df302548 100644 --- a/app/templates/main/corpora/corpus.html.j2 +++ b/app/templates/main/corpora/corpus.html.j2 @@ -69,7 +69,7 @@ {{ file.publishing_year }} edit - file_download + file_download delete From 7dcc8c48da7587da9f141b2f73e82d3955fed65f Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 29 Oct 2019 14:35:23 +0100 Subject: [PATCH 3/3] Also delete corpus files when a corpus gets deleted --- app/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/utils.py b/app/utils.py index e68d0682..2abecee2 100644 --- a/app/utils.py +++ b/app/utils.py @@ -63,5 +63,7 @@ def background_delete_corpus(app, corpus_id): logger.warning('Called by delete_thread.') logger.warning('Corpus id is: {}.'.format(corpus_id)) corpus = Corpus.query.filter_by(id=corpus_id).first() - logger.warning('Corpus object is: {}'.format(corpus)) + for corpus_file in corpus.files: + db.session.delete(corpus_file) + logger.warning('Corpus object is: {}'.format(corpus)) corpus.delete_corpus()