diff --git a/.github/workflows/pypi_lib.yml b/.github/workflows/aux.library.pypi.yml similarity index 98% rename from .github/workflows/pypi_lib.yml rename to .github/workflows/aux.library.pypi.yml index 0413385..123b843 100644 --- a/.github/workflows/pypi_lib.yml +++ b/.github/workflows/aux.library.pypi.yml @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: pip install build - + - name: Change directory run: cd auxiliary/malojalib diff --git a/auxiliary/chromium_scrobbler/.gitignore b/auxiliary/chromium_scrobbler/.gitignore new file mode 100644 index 0000000..ea066ed --- /dev/null +++ b/auxiliary/chromium_scrobbler/.gitignore @@ -0,0 +1,3 @@ +screenshot.png +tile.png +!*.sh diff --git a/auxiliary/chromium_scrobbler/maloja-scrobbler/update_scrobbler.sh b/auxiliary/chromium_scrobbler/update_scrobbler.sh similarity index 68% rename from auxiliary/chromium_scrobbler/maloja-scrobbler/update_scrobbler.sh rename to auxiliary/chromium_scrobbler/update_scrobbler.sh index 55877e2..783af6d 100644 --- a/auxiliary/chromium_scrobbler/maloja-scrobbler/update_scrobbler.sh +++ b/auxiliary/chromium_scrobbler/update_scrobbler.sh @@ -1,6 +1,6 @@ -convert ../../maloja/web/static/png/favicon_large.png -resize 256 icon256.png -convert ../../maloja/web/static/png/favicon_large.png -resize 128 icon128.png -convert ../../maloja/web/static/png/favicon_large.png -resize 48 icon48.png +convert ../../maloja/web/static/png/favicon_large.png -resize 256 maloja-scrobbler/icon256.png +convert ../../maloja/web/static/png/favicon_large.png -resize 128 maloja-scrobbler/icon128.png +convert ../../maloja/web/static/png/favicon_large.png -resize 48 maloja-scrobbler/icon48.png convert ../../maloja/web/static/png/favicon_large.png -background none -resize 280 -gravity center -extent 440x280 -background "#232327" -flatten tile.png -rm ../maloja-scrobbler.zip -zip ../maloja-scrobbler.zip sites/* *.js *.json *.html icon*.png +rm ./maloja-scrobbler.zip +zip ./maloja-scrobbler.zip maloja-scrobbler/* diff --git a/maloja/globalconf.py b/maloja/globalconf.py index 121d703..1730448 100644 --- a/maloja/globalconf.py +++ b/maloja/globalconf.py @@ -1,5 +1,4 @@ import os -from doreah.settings import config as settingsconfig from doreah.configuration import Configuration from doreah.configuration import types as tp @@ -223,7 +222,7 @@ for datatype in ("state","cache","logs"): if malojaconfig.get_specified(directory_info[datatype]['setting']) is None and malojaconfig.get_specified('DATA_DIRECTORY') is None: find_good_folder(datatype,malojaconfig) - + @@ -296,7 +295,6 @@ config( } ) -settingsconfig._readpreconfig() # what the fuck did i just write # this spaghetti file is proudly sponsored by the rice crackers i'm eating at the diff --git a/maloja/proccontrol/control.py b/maloja/proccontrol/control.py index 8fa7e55..fb04517 100644 --- a/maloja/proccontrol/control.py +++ b/maloja/proccontrol/control.py @@ -20,6 +20,7 @@ def print_header_info(): print() + def getInstance(): try: output = subprocess.check_output(["pidof","Maloja"]) @@ -91,8 +92,13 @@ def debug(): def print_info(): print_header_info() + print("Configuration Directory:",globalconf.dir_settings['config']) + print("Data Directory: ",globalconf.dir_settings['state']) + print() + print("#####") + print() -@mainfunction({"l":"level","v":"version"},shield=True) +@mainfunction({"l":"level"},shield=True) def main(*args,**kwargs): actions = {