daniel/controldeck
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix justpy config overwrite

Browse Source
This commit is contained in:
Daniel Weschke
2022-11-06 15:51:47 +01:00
parent b32a63d9b4
commit 21c91b0b9c
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
controldeck.py
View File

@@ -16,6 +16,24 @@ import json
import time import time
import argparse import argparse
from addict import Dict # also used in justpy from addict import Dict # also used in justpy
APP_NAME = "ControlDeck"
COLOR_PRIME = "blue-grey-8" # "blue-grey-7" "blue-grey-8" 'light-blue-9'
COLOR_PRIME_TEXT = "blue-grey-7"
COLOR_SELECT = "light-blue-9"
DEBUG = False
CONFIG_DIR = path.join(path.expanduser("~"), '.config', APP_NAME.lower())
CONFIG_FILE_NAME = APP_NAME.lower() + '.conf'
CONFIG_FILE = path.join(CONFIG_DIR, CONFIG_FILE_NAME)
CACHE_DIR = path.join(path.expanduser('~'), '.cache', APP_NAME.lower())
STATIC_DIR = path.join(CACHE_DIR, 'static')
# justpy config overwrite
# NEEDS to be done before loading justpy
import jpcore.justpy_config
jpcore.justpy_config.STATIC_DIRECTORY = STATIC_DIR
from justpy import ( from justpy import (
Div, Div,
I, I,
@@ -57,22 +75,6 @@ from justpy import (
justpy justpy
) )
APP_NAME = "ControlDeck"
COLOR_PRIME = "blue-grey-8" # "blue-grey-7" "blue-grey-8" 'light-blue-9'
COLOR_PRIME_TEXT = "blue-grey-7"
COLOR_SELECT = "light-blue-9"
DEBUG = False
CONFIG_DIR = path.join(path.expanduser("~"), '.config', APP_NAME.lower())
CONFIG_FILE_NAME = APP_NAME.lower() + '.conf'
CONFIG_FILE = path.join(CONFIG_DIR, CONFIG_FILE_NAME)
CACHE_DIR = path.join(path.expanduser('~'), '.cache', APP_NAME.lower())
STATIC_DIR = path.join(CACHE_DIR, 'static')
# justpy config overwrite
import jpcore.justpy_config
jpcore.justpy_config.STATIC_DIRECTORY = STATIC_DIR
def tohtml(text): def tohtml(text):
return text.replace("\n", "<br>") return text.replace("\n", "<br>")
@@ -843,6 +845,9 @@ def cli():
print('[DEBUG] args:', args) print('[DEBUG] args:', args)
print('[DEBUG] __file__:', __file__) print('[DEBUG] __file__:', __file__)
print('[DEBUG] cwd:', getcwd()) print('[DEBUG] cwd:', getcwd())
print('[DEBUG] CONFIG_DIR:', CONFIG_DIR)
print('[DEBUG] CACHE_DIR:', CACHE_DIR)
print('[DEBUG] STATIC_DIR:', STATIC_DIR)
main(args) main(args)