create a single source of truth for paths to PDF uploads and DB

zesje/__init__.py

@@ -30,10 +30,12 @@ def setup():
     auth.init_app(app)
 
     data_dir = app.config['DATA_DIRECTORY']
+    app.config['PDF_DIRECTORY'] = os.path.join(data_dir, 'pdfs')
+    app.config['DB_PATH'] = os.path.join(data_dir, 'course.sqlite')
     os.makedirs(data_dir, exist_ok=True)
-    os.makedirs(os.path.join(data_dir, 'pdfs'), exist_ok=True)
+    os.makedirs(app.config['PDF_DIRECTORY'], exist_ok=True)
 
-    db.bind('sqlite', f"{app.config['DATA_DIRECTORY']}/course.sqlite", create_db=True)
+    db.bind('sqlite', app.config['DB_PATH'], create_db=True)
     db.generate_mapping(create_tables=True)
 
 

zesje/resources/pdfs.py

@@ -59,14 +59,18 @@ class Pdfs(Resource):
         if args['pdf'].mimetype != 'application/pdf':
             return dict(message='Uploaded file is not a PDF'), 400
 
-        pdf_path = os.path.join(app.config['DATA_DIRECTORY'], 'pdfs', f'{pdf.id}.pdf')
         with orm.db_session:
             pdf = PDF(exam=Exam[exam_id], name=args['pdf'].filename,
                       status='processing', message='importing PDF')
-            # if we fail to save the PDF then we rollback the DB transaction
-            args['pdf'].save(pdf_path)
 
         # TODO fire off subprocess
+        with orm.db_session:
+            try:
+                path = os.path.join(app.config['PDF_DIRECTORY'], f'{pdf.id}.pdf')
+                args['pdf'].save(path)
+            except Exception:
+                pdf.delete()
+                raise
 
         return {
             'id': pdf.id,