Use environment vars; fix modularising a bit

digimarks/__init__.py

@@ -22,7 +22,7 @@ def create_app(test_config=None):
     # set custom url for the app, for example '/bookmarks'
     try:
         # TODO: get settings from ENV vars
-        app.config['APPLICATION_ROOT'] = settings.APPLICATION_ROOT
+        app.config['APPLICATION_ROOT'] = os.environ['APPLICATION_ROOT']
     except AttributeError:
         pass
 

digimarks/marks.py

@@ -3,13 +3,13 @@ from __future__ import print_function
 import datetime
 import os
 import sys
+from urllib.parse import urljoin
 
-from flask import (Flask, abort, jsonify, redirect, render_template, request,
-                   url_for)
+from flask import abort, jsonify, redirect, render_template, request, url_for
 from werkzeug.contrib.atom import AtomFeed
 
 from . import themes
-from .models import Bookmark, PublicTag, User, urljoin, get_tags_for_user
+from .models import Bookmark, PublicTag, User, get_tags_for_user
 
 DIGIMARKS_USER_AGENT = 'digimarks/2.0.0-dev'
 
@@ -29,6 +29,17 @@ DATABASE = {
 }
 #PHANTOM = '/usr/local/bin/phantomjs'
 #SCRIPT = os.path.join(APP_ROOT, 'screenshot.js')
+SYSTEMKEY = None
+try:
+    SYSTEMKEY = os.environ['SYSTEMKEY']
+except KeyError:
+    print('No ENV var found for SYSTEMKEY')
+
+MASHAPE_API_KEY = None
+try:
+    MASHAPE_API_KEY = os.environ['MASHAPE_API_KEY']
+except KeyError:
+    print('No ENV var found for MASHAPE_API_KEY')
 
 # Cache the tags
 all_tags = {}

digimarks/models.py

@@ -5,6 +5,7 @@ import gzip
 import hashlib
 import os
 import shutil
+from urllib.parse import urlparse, urlunparse
 
 import bs4
 import requests
@@ -12,14 +13,6 @@ from peewee import *  # noqa
 
 from . import themes
 
-try:
-    # Python 3
-    from urllib.parse import urljoin, urlparse, urlunparse
-except ImportError:
-    # Python 2
-    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']
@@ -199,7 +192,7 @@ class Bookmark(BaseModel):
         response = requests.get(
             'https://realfavicongenerator.p.rapidapi.com/favicon/icon?platform=android_chrome&site=' + domain,
             stream=True,
-            headers={'User-Agent': DIGIMARKS_USER_AGENT, 'X-Mashape-Key': settings.MASHAPE_API_KEY}
+            headers={'User-Agent': DIGIMARKS_USER_AGENT, 'X-Mashape-Key': MASHAPE_API_KEY}
         )
         if response.status_code == 404:
             # Fall back to desktop favicon

requirements-dev.txt

@@ -2,28 +2,28 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile requirements-dev.in --upgrade
+#    pip-compile requirements-dev.in
 #
-astroid==2.2.5            # via pylint
-beautifulsoup4==4.7.1     # via bs4
+astroid==2.3.3            # via pylint
+beautifulsoup4==4.8.2     # via bs4
 bs4==0.0.1
-certifi==2019.3.9         # via requests
+certifi==2019.11.28       # via requests
 chardet==3.0.4            # via requests
 click==7.0                # via flask
-flask==1.0.2
+flask==1.1.1
 idna==2.8                 # via requests
-isort==4.3.17             # via pylint
+isort==4.3.21             # via pylint
 itsdangerous==1.1.0       # via flask
-jinja2==2.10.1            # via flask
-lazy-object-proxy==1.3.1  # via astroid
+jinja2==2.10.3            # via flask
+lazy-object-proxy==1.4.3  # via astroid
 markupsafe==1.1.1         # via jinja2
 mccabe==0.6.1             # via pylint
-peewee==3.9.3
-pylint==2.3.1
-requests==2.21.0
-six==1.12.0               # via astroid
-soupsieve==1.9            # via beautifulsoup4
-typed-ast==1.3.1          # via astroid
-urllib3==1.24.1           # via requests
-werkzeug==0.15.2          # via flask
-wrapt==1.11.1             # via astroid
+peewee==3.13.1
+pylint==2.4.4
+requests==2.22.0
+six==1.13.0               # via astroid
+soupsieve==1.9.5          # via beautifulsoup4
+typed-ast==1.4.0          # via astroid
+urllib3==1.25.7           # via requests
+werkzeug==0.16.0          # via flask
+wrapt==1.11.2             # via astroid