From 813133ac4ae4cbc2e3b259301cfbfe64df23c802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 1 Dec 2022 13:10:57 +0100
Subject: Create settings file.

---
 instance/settings.py | 11 +++++++++++
 mu4web/main.py       | 20 +++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 instance/settings.py

diff --git a/instance/settings.py b/instance/settings.py
new file mode 100644
index 0000000..627b6a6
--- /dev/null
+++ b/instance/settings.py
@@ -0,0 +1,11 @@
+
+# ['from', 'to', 'subject', 'date']
+DEFAULT_SORT_COLUMN = 'date'
+
+# 'rising' or 'falling'
+DEFAULT_DIRECTION = 'falling'
+
+# Change this to something random, e.g. the output of
+# >>> os.urandom(24)
+SECRET_KEY = b"\x13\xbd\xaa'\x9d\xe9P\x83\xf1h\xd0\xc7\x893@\x80\xd3fP\x83\x8bMt\x8d"
+
diff --git a/mu4web/main.py b/mu4web/main.py
index 24e4c39..9786070 100644
--- a/mu4web/main.py
+++ b/mu4web/main.py
@@ -262,9 +262,8 @@ def search_result(q: str, by: Optional[str], direction: str) -> HTML:
 
     # keys = ['from', 'to', 'subject', 'date', 'size', 'maildir', 'msgid']
     keys = ['from', 'to', 'subject', 'date']
-    DEFAULT_SORT_COLUMN = 'date'
     if not by:
-        by = DEFAULT_SORT_COLUMN
+        by = app.config['DEFAULT_SORT_COLUMN']
 
     rows = mu.search(q, by, direction == 'falling')
     body: list[tuple] = []
@@ -336,9 +335,17 @@ def index_page():
                                      body=body))
 
 
-app = Flask(__name__)
+app = Flask(__name__, instance_relative_config=True)
+
+# Default configuration values
+app.config.update(
+    DEFAULT_DIRECTION = 'falling',
+    DEFAULT_SORT_COLUMN = 'date',
+)
+
+app.config.from_pyfile('settings.py')
+
 login_manager.init_app(app)
-app.secret_key = 'THIS IS A RANDOM STRING'
 
 
 @login_manager.user_loader
@@ -361,10 +368,9 @@ def index():
 @app.route('/search')
 @login_required
 def search_page_():
-    DEFAULT_DIRECTION = 'falling'
-    direction = request.args.get('direction', DEFAULT_DIRECTION)
+    direction = request.args.get('direction', app.config['DEFAULT_DIRECTION'])
     if direction not in ('rising', 'falling'):
-        direction = DEFAULT_DIRECTION
+        direction = app.config['DEFAULT_DIRECTION']
     return search_page(request.args.get('q', ''),
                        request.args.get('by', None),
                        direction)
-- 
cgit v1.2.3