lysis/pyuserconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: lysis:16020e8fbb20588652371bf07054c05ed3ad7937
Branches Tags
lysis:main
...
compare: lysis:e82fd99a164ba09b7aa08b46d2b08337a838ee6f
Branches Tags
lysis:main

4 Commits
16020e8fbb ... e82fd99a16

Author SHA1 Message Date
Marcus Stoegbauer
e82fd99a16 fixes for configparser.get for files in configdir 2024-03-30 00:25:35 +01:00
Marcus Stoegbauer
4790429f24 introduce force_filename to set filename exclusively 2024-03-30 00:24:55 +01:00
Marcus Stoegbauer
57b3600d47 set verbose 2024-03-30 00:24:24 +01:00
Marcus Stoegbauer
e46c8249de ignore .swp 2024-03-30 00:24:14 +01:00
4 changed files with 10 additions and 7 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ build/
.idea/ .idea/
.venv .venv
userconfig.egg-info/ userconfig.egg-info/
*.swp

1
cli/__init__.py
View File

@ -19,6 +19,7 @@ def main():
cmdline = parser.parse_args() cmdline = parser.parse_args()
cfg = Conf(cmdline.file) cfg = Conf(cmdline.file)
debug = Debug() debug = Debug()
debug.set_verbose(cmdline.verbose)
cfg.set_debug(debug) cfg.set_debug(debug)
uc = Userconfig(cfg) uc = Userconfig(cfg)

5
userconfig/cfgfile.py
View File

@ -7,13 +7,14 @@ class Conf(object):
_cfgfiles = [] _cfgfiles = []
debug = None debug = None
def __init__(self, filename=None, debug=None): def __init__(self, filename=None, debug=None, force_filename=False):
if debug: if debug:
self.set_debug(debug) self.set_debug(debug)
filenames = [] filenames = []
if filename: if filename:
filenames.append(filename) filenames.append(filename)
filenames.append(f'{os.environ.get("HOME")}/etc/userconfig2.conf') if not force_filename:
filenames.append(f'{os.environ.get("HOME")}/etc/userconfig2.conf')
ret = self.set_filenames(filenames) ret = self.set_filenames(filenames)
if not ret: if not ret:
raise ValueError(f'Cannot open either configuration file: {",".join(filenames)}') raise ValueError(f'Cannot open either configuration file: {",".join(filenames)}')

10
userconfig/tools.py
View File

@ -38,12 +38,12 @@ def get_config(filename, cfg):
cfg.debug.stderr("Error reading config file %s" % filename) cfg.debug.stderr("Error reading config file %s" % filename)
return False return False
# check for DEST parameter # check for DEST parameter
if not ret.check("Main", "dest"): if not ret.check(section="Main", option="dest"):
cfg.debug.stderr("No dest in config file %s" % filename) cfg.debug.stderr("No dest in config file %s" % filename)
return False return False
# make sure DEST ends with / # make sure DEST ends with /
if not ret.get("Main", "dest").endswith("/"): if not ret.get(section="Main", option="dest").endswith("/"):
ret.set("Main", "dest", ret.get("Main", "dest")+"/") ret.set(section="Main", option="dest", value=ret.get(section="Main", option="dest")+"/")
return ret return ret
@ -95,14 +95,14 @@ def user_config_generated(filename, cfg):
# filename does not exist, so it was not generated by userconfig # filename does not exist, so it was not generated by userconfig
return False return False
if not cfg.check("Main", "stamp"): if not cfg.check("stamp"):
# no STAMP in userconfig.cfg, so no way to check if file was generated by userconfig # no STAMP in userconfig.cfg, so no way to check if file was generated by userconfig
return False return False
fp = open(filename, "r") fp = open(filename, "r")
for line in fp: for line in fp:
if re.search(re.escape(cfg.get("Main", "stamp")), line): if re.search(re.escape(cfg.get("stamp")), line):
return True return True
return False return False