diff --git a/maloja/__pkginfo__.py b/maloja/__pkginfo__.py index 556be8f..2b2677d 100644 --- a/maloja/__pkginfo__.py +++ b/maloja/__pkginfo__.py @@ -5,7 +5,7 @@ author = { "email":"maloja@krateng.dev", "github": "krateng" } -version = 2,5,0 +version = 2,5,3 versionstr = ".".join(str(n) for n in version) links = { "pypi":"malojaserver", @@ -29,7 +29,9 @@ resources = [ "web/*", "static/*/*", "data_files/*/*", - "data_files/*/*/*" + "data_files/*/*/*", + "proccontrol/*", + "proccontrol/*/*" ] commands = { diff --git a/maloja/proccontrol/__init__.py b/maloja/proccontrol/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/maloja/proccontrol/tasks/__init__.py b/maloja/proccontrol/tasks/__init__.py index daaf86f..cc37761 100644 --- a/maloja/proccontrol/tasks/__init__.py +++ b/maloja/proccontrol/tasks/__init__.py @@ -1,11 +1,9 @@ import os -from .lastfmconverter import convert -from .backup import backup -from .fixexisting import fix +from doreah.io import ask from ...globalconf import datadir -from ..control import restart -from doreah.io import ask + + def loadlastfm(filename): @@ -18,17 +16,21 @@ def loadlastfm(filename): if not overwrite: return print("Please wait...") + from .lastfmconverter import convert convert(filename,datadir("scrobbles/lastfmimport.tsv")) #os.system("python3 -m maloja.lastfmconverter " + filename + " " + datadir("scrobbles/lastfmimport.tsv")) print("Successfully imported your Last.FM scrobbles!") def backuphere(): + from .backup import backup backup(folder=os.getcwd()) def update(): os.system("pip3 install malojaserver --upgrade --no-cache-dir") + from ..control import restart restart() def fixdb(): + from .fixexisting import fix fix()