diff --git a/maloja/apis/listenbrainz.py b/maloja/apis/listenbrainz.py index 80f8ba1..a254ffa 100644 --- a/maloja/apis/listenbrainz.py +++ b/maloja/apis/listenbrainz.py @@ -3,7 +3,7 @@ from ._exceptions import * from .. import database import datetime -from .globalconf import malojaconfig +from ..globalconf import malojaconfig class Listenbrainz(APIHandler): diff --git a/maloja/database.py b/maloja/database.py index bbe1a7f..92e227a 100644 --- a/maloja/database.py +++ b/maloja/database.py @@ -10,12 +10,11 @@ from .malojauri import uri_to_internal, internal_to_uri, compose_querystring from .thirdparty import proxy_scrobble_all from .__pkginfo__ import version -from .globalconf import data_dir +from .globalconf import data_dir, malojaconfig # doreah toolkit from doreah.logging import log from doreah import tsv -from doreah import settings from doreah.caching import Cache, DeepCache from doreah.auth import authenticated_api, authenticated_api_with_alternate from doreah.io import ProgressBar diff --git a/maloja/globalconf.py b/maloja/globalconf.py index 9577397..236670d 100644 --- a/maloja/globalconf.py +++ b/maloja/globalconf.py @@ -246,7 +246,9 @@ malojaconfig = Configuration( "spotify_api_id":(tp.String(), "Spotify API ID", None), "spotify_api_secret":(tp.String(), "Spotify API Secret", None), "lastfm_api_key":(tp.String(), "Last.fm API Key", None), - "track_search_provider":(tp.String(), "Track Search Provider", None) + "audiodb_api_key":(tp.String(), "TheAudioDB API Key", None), + "track_search_provider":(tp.String(), "Track Search Provider", None), + "send_stats":(tp.Boolean(), "Send Statistics", None), }, "Database":{ diff --git a/maloja/server.py b/maloja/server.py index 2203ba2..6473d92 100644 --- a/maloja/server.py +++ b/maloja/server.py @@ -21,7 +21,6 @@ from .globalconf import malojaconfig from .jinjaenv.context import jinja_environment from jinja2.exceptions import TemplateNotFound # doreah toolkit -from doreah import settings from doreah.logging import log from doreah.timing import Clock from doreah import auth @@ -44,10 +43,7 @@ import urllib ### TECHNICAL SETTINGS ##### - -#settings.config(files=["settings/default.ini","settings/settings.ini"]) -#settings.update("settings/default.ini","settings/settings.ini") -MAIN_PORT = malojaconfig["WEB_PORT"] +PORT = malojaconfig["PORT"] HOST = malojaconfig["HOST"] THREADS = 24 BaseRequest.MEMFILE_MAX = 15 * 1024 * 1024 @@ -330,7 +326,7 @@ def run_server(): try: #run(webserver, host=HOST, port=MAIN_PORT, server='waitress') - waitress.serve(webserver, host=HOST, port=MAIN_PORT, threads=THREADS) + waitress.serve(webserver, host=HOST, port=PORT, threads=THREADS) except OSError: log("Error. Is another Maloja process already running?") raise diff --git a/maloja/utilities/images.py b/maloja/utilities/images.py index 69e4476..cf44016 100644 --- a/maloja/utilities/images.py +++ b/maloja/utilities/images.py @@ -1,8 +1,8 @@ from .. import globalconf -from ..globalconf import data_dir +from ..globalconf import data_dir, malojaconfig from .. import thirdparty -from doreah import settings, caching +from doreah import caching from doreah.logging import log import itertools diff --git a/maloja/utilities/maintenance.py b/maloja/utilities/maintenance.py index 780ef5a..8181b62 100644 --- a/maloja/utilities/maintenance.py +++ b/maloja/utilities/maintenance.py @@ -1,8 +1,8 @@ from ..__pkginfo__ import version from ..malojatime import ranges, thisweek, thisyear +from ..globalconf import malojaconfig from doreah.regular import yearly, daily -from doreah import settings from doreah.logging import log import datetime