1
0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00

Fixed oversights

This commit is contained in:
Krateng 2019-12-15 15:43:56 +01:00
parent e50cce28fa
commit e85049af64
3 changed files with 6 additions and 6 deletions

View File

@ -17,7 +17,6 @@ from .backup import backup
origpath = os.getcwd()
def copy_initial_local_files(): def copy_initial_local_files():
folder = pkg_resources.resource_filename(__name__,"data_files") folder = pkg_resources.resource_filename(__name__,"data_files")
@ -106,8 +105,8 @@ def start():
setup() setup()
try: try:
with open(datadir("logs/stderr.log"),"w") as logf: with open(datadir("logs/stderr.log"),"w") as logf:
p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=logf,cwd=DATA_DIR) p = subprocess.Popen(["python3","-m","maloja.server"],stdout=subprocess.DEVNULL,stderr=logf)
sp = subprocess.Popen(["python3","-m","maloja.supervisor"],stdout=subprocess.DEVNULL,stderr=logf,cwd=DATA_DIR) sp = subprocess.Popen(["python3","-m","maloja.supervisor"],stdout=subprocess.DEVNULL,stderr=logf)
print(col["green"]("Maloja started!") + " PID: " + str(p.pid)) print(col["green"]("Maloja started!") + " PID: " + str(p.pid))
from doreah import settings from doreah import settings
@ -164,7 +163,7 @@ def direct():
from . import server from . import server
def backuphere(): def backuphere():
backup(folder=origpath) backup(folder=os.getcwd())
def update(): def update():
os.system("pip3 install malojaserver --upgrade --no-cache-dir") os.system("pip3 install malojaserver --upgrade --no-cache-dir")

View File

@ -27,7 +27,8 @@ TRACK_SEARCH_PROVIDER = None
DB_CACHE_SIZE = 8192 # how many MB on disk each database cache should have available. DB_CACHE_SIZE = 8192 # how many MB on disk each database cache should have available.
INVALID_ARTISTS = ["[Unknown Artist]","Unknown Artist","Spotify"] INVALID_ARTISTS = ["[Unknown Artist]","Unknown Artist","Spotify"]
REMOVE_FROM_TITLE = ["(Original Mix)","(Radio Edit)","(Album Version)"] REMOVE_FROM_TITLE = ["(Original Mix)","(Radio Edit)","(Album Version)","(Explicit Version)"]
USE_PARSE_PLUGINS = no
[Local Images] [Local Images]

View File

@ -49,7 +49,7 @@ BaseRequest.MEMFILE_MAX = 15 * 1024 * 1024
WEBFOLDER = pkg_resources.resource_filename(__name__,"web") WEBFOLDER = pkg_resources.resource_filename(__name__,"web")
STATICFOLDER = pkg_resources.resource_filename(__name__,"static") STATICFOLDER = pkg_resources.resource_filename(__name__,"static")
DATAFOLDER = DATADIR DATAFOLDER = DATA_DIR
webserver = Bottle() webserver = Bottle()