haloopdy/qcs-python
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Neat, loads from configs!

Browse Source
This commit is contained in:
Carlos Sanchez 2023-04-30 21:12:14 -04:00
parent ccd4e3232a
commit 2a0fbfe4a1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.py
View File

@ -11,6 +11,7 @@ CONFIGFILE="config.toml"
# The entire config object with all defaults # The entire config object with all defaults
config = { config = {
"api" : "https://oboy.smilebasicsource.com/api", "api" : "https://oboy.smilebasicsource.com/api",
"default_loglevel" : "WARNING",
"expire_seconds" : 31536000, # 365 days in seconds, expiration for token "expire_seconds" : 31536000, # 365 days in seconds, expiration for token
"tokenfile" : ".qcstoken" "tokenfile" : ".qcstoken"
} }
@ -18,7 +19,7 @@ config = {
def main(): def main():
print("Program start") print("Program start")
load_or_create_global_config() load_or_create_global_config()
logging.debug("Config: " + json.dumps(config, indent = 2)) logging.info("Config: " + json.dumps(config, indent = 2))
context = contentapi.ApiContext(config["api"], logging) context = contentapi.ApiContext(config["api"], logging)
print("Program end") print("Program end")
@ -31,13 +32,16 @@ def load_or_create_global_config():
if os.path.exists(CONFIGFILE): if os.path.exists(CONFIGFILE):
# Read and deserialize the config file # Read and deserialize the config file
with open(CONFIGFILE, 'r', encoding='utf-8') as f: with open(CONFIGFILE, 'r', encoding='utf-8') as f:
config = toml.load(f) temp_config = toml.load(f)
myutils.merge_dictionary(temp_config, config)
else: else:
# Serialize and write the config dictionary to the config file # Serialize and write the config dictionary to the config file
logging.warn("No config found at " + CONFIGFILE + ", creating now") logging.warn("No config found at " + CONFIGFILE + ", creating now")
with open(CONFIGFILE, 'w', encoding='utf-8') as f: with open(CONFIGFILE, 'w', encoding='utf-8') as f:
toml.dump(config, f) toml.dump(config, f)
myutils.set_logging_level(config["default_loglevel"])
# Because python reasons # Because python reasons
if __name__ == "__main__": if __name__ == "__main__":

8
myutils.py
View File

@ -1,3 +1,4 @@
import logging
# Merge the "new_values" dictionary recursively into the "base_values" dictionary, # Merge the "new_values" dictionary recursively into the "base_values" dictionary,
# assigning where new_values is assigned but not fully overwriting nested dictionaries # assigning where new_values is assigned but not fully overwriting nested dictionaries
@ -8,3 +9,10 @@ def merge_dictionary(new_values, base_values):
merge_dictionary(new_values[key], base_values[key]) merge_dictionary(new_values[key], base_values[key])
else: else:
base_values[key] = new_values[key] base_values[key] = new_values[key]
# Set the DEFAULT logging level based on a string representation of it
def set_logging_level(level_str):
level = getattr(logging, level_str.upper(), None)
if not isinstance(level, int):
raise ValueError('Invalid logging level: %s' % level_str)
logging.basicConfig(level=level)