From 9712b269ff55bdbcbaedfd7a4c54ace74989bb7a Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 15 Oct 2018 17:49:27 +0200
Subject: [PATCH] More refactoring and some fixes

---
 digimarks.py        | 6 ------
 digimarks/models.py | 7 +++++++
 digimarks/themes.py | 2 +-
 digimarks/views.py  | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/digimarks.py b/digimarks.py
index c799292..9f19a6c 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -1,6 +1,5 @@
 from __future__ import print_function
 
-import binascii
 import datetime
 import gzip
 import hashlib
@@ -37,15 +36,10 @@ except ImportError:
 APP_ROOT = os.path.dirname(os.path.realpath(__file__))
 MEDIA_ROOT = os.path.join(APP_ROOT, 'static')
 MEDIA_URL = '/static/'
-DATABASE = {
-    'name': os.path.join(APP_ROOT, 'bookmarks.db'),
-    'engine': 'peewee.SqliteDatabase',
-}
 
 # create our flask app and a database wrapper
 app = Flask(__name__)
 app.config.from_object(__name__)
-database = SqliteDatabase(os.path.join(APP_ROOT, 'bookmarks.db'))
 
 # Strip unnecessary whitespace due to jinja2 codeblocks
 app.jinja_env.trim_blocks = True
diff --git a/digimarks/models.py b/digimarks/models.py
index cbffaac..86c8131 100644
--- a/digimarks/models.py
+++ b/digimarks/models.py
@@ -2,6 +2,7 @@
 
 import binascii
 import os
+import datetime
 
 from peewee import *  # noqa
 
@@ -16,6 +17,12 @@ except ImportError:
     from urlparse import urljoin, urlparse, urlunparse
 
 
+DATABASE_PATH = os.path.dirname(os.path.realpath(__file__))
+if 'DIGIMARKS_DB_PATH' in os.environ:
+    DATABASE_PATH = os.environ['DIGIMARKS_DB_PATH']
+database = SqliteDatabase(os.path.join(DATABASE_PATH, 'bookmarks.db'))
+
+
 def ifilterfalse(predicate, iterable):
     # ifilterfalse(lambda x: x%2, range(10)) --> 0 2 4 6 8
     if predicate is None:
diff --git a/digimarks/themes.py b/digimarks/themes.py
index 8e5a472..abe14b1 100644
--- a/digimarks/themes.py
+++ b/digimarks/themes.py
@@ -1,4 +1,4 @@
-"""digimarks theme definitions"
+"""digimarks theme definitions"""
 
 DEFAULT_THEME = 'freshgreen'
 themes = {
diff --git a/digimarks/views.py b/digimarks/views.py
index 916bcd3..f67b15f 100644
--- a/digimarks/views.py
+++ b/digimarks/views.py
@@ -1,2 +1,2 @@
-"""digimarks views"
+"""digimarks views"""