diff --git a/web/app/models.py b/web/app/models.py index d23a25ff04098ab8996e2032820e8c5225846179..c3fe91d2512e6b4ca8d963fbe88e516431aa7266 100644 --- a/web/app/models.py +++ b/web/app/models.py @@ -504,13 +504,13 @@ class CorpusFile(db.Model): title = db.Column(db.String(255)) def delete(self): - corpus_file = os.path.join(current_app.config['NOPAQUE_STORAGE'], - str(self.corpus.user_id), - 'corpora', - str(self.corpus_id), - self.filename) + corpus_file_path = os.path.join(current_app.config['NOPAQUE_STORAGE'], + str(self.corpus.user_id), + 'corpora', + str(self.corpus_id), + self.filename) try: - os.remove(corpus_file) + os.remove(corpus_file_path) except OSError: pass db.session.delete(self) @@ -632,7 +632,10 @@ class Result(db.Model): def delete(self): result_file_path = os.path.join(current_app.config['NOPAQUE_STORAGE'], self.file[0].dir) - shutil.rmtree(result_file_path) + try: + os.remove(result_file_path) + except OSError: + pass db.session.delete(self) def __repr__(self):