CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: make klipper_config a secondary location for new configs fixes #800

Browse Source
This commit is contained in:
alfrix 2022-11-21 10:32:47 -03:00
parent d0d79a64df
commit e90dac950c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ks_includes/config.py
View File

@ -9,8 +9,6 @@ import pathlib
from io import StringIO
from os import path
SCREEN_BLANKING_OPTIONS = [
300, # 5 Minutes
900, # 15 Minutes
@ -352,7 +350,7 @@ class KlipperScreenConfig:
user_def = []
saved_def = []
found_saved = False
if not path.exists(config_path):
if not os.path.exists(config_path):
return ["", None]
with open(config_path) as file:
for line in file:
@ -369,31 +367,32 @@ class KlipperScreenConfig:
def get_config_file_location(self, file):
# Passed config (-c) by default is ~/KlipperScreen.conf
if path.exists(file):
logging.info(f"Passed config (-c): {file}")
if os.path.exists(file):
return file
file = os.path.join(klipperscreendir, self.configfile_name)
if path.exists(file):
if os.path.exists(file):
return file
file = os.path.join(klipperscreendir, self.configfile_name.lower())
if path.exists(file):
if os.path.exists(file):
return file
klipper_config = os.path.join(os.path.expanduser("~/"), "printer_data", "config")
file = os.path.join(klipper_config, self.configfile_name)
if path.exists(file):
if os.path.exists(file):
return file
file = os.path.join(klipper_config, self.configfile_name.lower())
if path.exists(file):
if os.path.exists(file):
return file
# OLD config folder
klipper_config = os.path.join(os.path.expanduser("~/"), "klipper_config")
file = os.path.join(klipper_config, self.configfile_name)
if path.exists(file):
if os.path.exists(file):
return file
file = os.path.join(klipper_config, self.configfile_name.lower())
if path.exists(file):
if os.path.exists(file):
return file
# fallback
@ -494,14 +493,15 @@ class KlipperScreenConfig:
filepath = self.config_path
else:
filepath = os.path.expanduser("~/")
klipper_config = os.path.join(filepath, "klipper_config")
if os.path.exists(klipper_config):
filepath = os.path.join(klipper_config, "KlipperScreen.conf")
klipper_config = os.path.join(filepath, "printer_data", "config")
old_klipper_config = os.path.join(filepath, "klipper_config")
if os.path.exists(klipper_config):
filepath = os.path.join(klipper_config, "KlipperScreen.conf")
filepath = os.path.join(klipper_config, self.configfile_name)
elif os.path.exists(old_klipper_config):
filepath = os.path.join(old_klipper_config, self.configfile_name)
else:
filepath = os.path.join(filepath, "KlipperScreen.conf")
filepath = os.path.join(filepath, self.configfile_name)
logging.info(f'Creating a new config file in {filepath}')
try:
with open(filepath, 'w') as file: