Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development

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):