Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-09 03:04:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replaced more settings calls, added missing settings

Browse Source
This commit is contained in:
krateng 2021-12-19 22:15:28 +01:00
parent 4186171b8f
commit 6ccbf68923
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maloja/apis/listenbrainz.py
View File

@ -3,7 +3,7 @@ from ._exceptions import *
from .. import database from .. import database
import datetime import datetime
from .globalconf import malojaconfig from ..globalconf import malojaconfig
class Listenbrainz(APIHandler): class Listenbrainz(APIHandler):

3
maloja/database.py
View File

@ -10,12 +10,11 @@ from .malojauri import uri_to_internal, internal_to_uri, compose_querystring
from .thirdparty import proxy_scrobble_all from .thirdparty import proxy_scrobble_all
from .__pkginfo__ import version from .__pkginfo__ import version
from .globalconf import data_dir from .globalconf import data_dir, malojaconfig
# doreah toolkit # doreah toolkit
from doreah.logging import log from doreah.logging import log
from doreah import tsv from doreah import tsv
from doreah import settings
from doreah.caching import Cache, DeepCache from doreah.caching import Cache, DeepCache
from doreah.auth import authenticated_api, authenticated_api_with_alternate from doreah.auth import authenticated_api, authenticated_api_with_alternate
from doreah.io import ProgressBar from doreah.io import ProgressBar

4
maloja/globalconf.py
View File

@ -246,7 +246,9 @@ malojaconfig = Configuration(
"spotify_api_id":(tp.String(), "Spotify API ID", None), "spotify_api_id":(tp.String(), "Spotify API ID", None),
"spotify_api_secret":(tp.String(), "Spotify API Secret", None), "spotify_api_secret":(tp.String(), "Spotify API Secret", None),
"lastfm_api_key":(tp.String(), "Last.fm API Key", 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":{ "Database":{

8
maloja/server.py
View File

@ -21,7 +21,6 @@ from .globalconf import malojaconfig
from .jinjaenv.context import jinja_environment from .jinjaenv.context import jinja_environment
from jinja2.exceptions import TemplateNotFound from jinja2.exceptions import TemplateNotFound
# doreah toolkit # doreah toolkit
from doreah import settings
from doreah.logging import log from doreah.logging import log
from doreah.timing import Clock from doreah.timing import Clock
from doreah import auth from doreah import auth
@ -44,10 +43,7 @@ import urllib
### TECHNICAL SETTINGS ### TECHNICAL SETTINGS
##### #####
PORT = malojaconfig["PORT"]
#settings.config(files=["settings/default.ini","settings/settings.ini"])
#settings.update("settings/default.ini","settings/settings.ini")
MAIN_PORT = malojaconfig["WEB_PORT"]
HOST = malojaconfig["HOST"] HOST = malojaconfig["HOST"]
THREADS = 24 THREADS = 24
BaseRequest.MEMFILE_MAX = 15 * 1024 * 1024 BaseRequest.MEMFILE_MAX = 15 * 1024 * 1024
@ -330,7 +326,7 @@ def run_server():
try: try:
#run(webserver, host=HOST, port=MAIN_PORT, server='waitress') #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: except OSError:
log("Error. Is another Maloja process already running?") log("Error. Is another Maloja process already running?")
raise raise

4
maloja/utilities/images.py
View File

@ -1,8 +1,8 @@
from .. import globalconf from .. import globalconf
from ..globalconf import data_dir from ..globalconf import data_dir, malojaconfig
from .. import thirdparty from .. import thirdparty
from doreah import settings, caching from doreah import caching
from doreah.logging import log from doreah.logging import log
import itertools import itertools

2
maloja/utilities/maintenance.py
View File

@ -1,8 +1,8 @@
from ..__pkginfo__ import version from ..__pkginfo__ import version
from ..malojatime import ranges, thisweek, thisyear from ..malojatime import ranges, thisweek, thisyear
from ..globalconf import malojaconfig
from doreah.regular import yearly, daily from doreah.regular import yearly, daily
from doreah import settings
from doreah.logging import log from doreah.logging import log
import datetime import datetime