Merge pull request 'fixed config init' (#46) from fix-config-init into main

Reviewed-on: https://git.jbranan.com/jblu/qbit-maid/pulls/46
This commit is contained in:
jblu 2023-06-05 22:43:06 -05:00
commit a0ce03335d

View File

@ -12,16 +12,17 @@ from collections import Counter
import csv import csv
import requests as r import requests as r
import os import os
import sys
class Qbt: class Qbt:
def __init__(self): def __init__(self):
"""Main object, should be calling functions from qlist.py, qlogging.py and qprocess.py""" """Main object, should be calling functions from qlist.py, qlogging.py and qprocess.py"""
# Open the config. Needs a json file with the data in config.json.example # Open the config. Needs a json file with the data in config.json.example
self.st = datetime.datetime.now() self.st = datetime.datetime.now()
config_file_path=os.environ["toml_path"] if os.getenv("toml_path"):
with open(config_file_path, 'rb') as c: config_file_path=os.getenv("toml_path")
self.config = load(c) with open(config_file_path, 'rb') as c:
self.config = load(c)
if os.path.exists('./config.toml'): if os.path.exists('./config.toml'):
config_file_path = './config.toml' config_file_path = './config.toml'
with open(config_file_path, 'rb') as c: with open(config_file_path, 'rb') as c: