Přestáváme používat flaskovou instance_path

mo/web/__init__.py

@@ -62,7 +62,7 @@ mo.config.DATA_DIR = os.path.abspath(mo.config.DATA_DIR)
 static_dir = os.path.abspath('static')
 
 # Aplikační objekt
-app = Flask(__name__, instance_path=mo.config.DATA_DIR, static_folder=static_dir)
+app = Flask(__name__, static_folder=static_dir)
 app.config.from_object(config)
 app.request_class = Request
 db.flask_db = SQLAlchemy(app, metadata=db.metadata)

mo/web/util.py

@@ -9,8 +9,8 @@ import wtforms
 
 import mo.db as db
 import mo.jobs
+import mo.util
 from mo.util import logger
-from mo.web import app
 
 
 class PagerForm(FlaskForm):
@@ -41,7 +41,7 @@ class PagerForm(FlaskForm):
 
 def send_task_statement(round: db.Round) -> Response:
     assert round.tasks_file is not None
-    file = os.path.join(app.instance_path, 'statements', round.tasks_file)
+    file = os.path.join(mo.util.data_dir('statements'), round.tasks_file)
     if os.path.isfile(file):
         return send_file(file, mimetype='application/pdf')
     else:
@@ -64,7 +64,7 @@ def task_paper_filename(paper: db.Paper) -> str:
 
 
 def send_task_paper(paper: db.Paper) -> Response:
-    file = os.path.join(app.instance_path, 'submits', paper.file_name)
+    file = os.path.join(mo.util.data_dir('submits'), paper.file_name)
 
     if os.path.isfile(file):
         return send_file(file, mimetype='application/pdf')