Skip to content

Commit

Permalink
Added relative files to ytd options
Browse files Browse the repository at this point in the history
  • Loading branch information
krateng committed Dec 11, 2021
1 parent 800d288 commit 545288f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion yeonji/__pkginfo__.py
Expand Up @@ -7,7 +7,7 @@
"github":"krateng"
}
desc = "Collection of command line tools"
version = 0,7,0
version = 0,7,1


requires = [
Expand Down
22 changes: 18 additions & 4 deletions yeonji/ytd.py
Expand Up @@ -47,12 +47,24 @@ def main(url=None,preset=None,new=None):
try:
with open(local_configfile,"r") as f:
localsettings = yaml.safe_load(f)



# already loaded ones from lower directories take precedence
if "options" in localsettings: options = {**localsettings["options"],**options}
if "flags" in localsettings: flags += localsettings["flags"]
if "options" in localsettings:
loc_options = localsettings["options"]
# adjust relative paths from settings file
for o in loc_options:
if isinstance(loc_options[o],str) and loc_options[o].startswith("^"):
loc_options[o] = loc_options[o].replace("^",tmpfolder)
options = {**loc_options,**options}
if "flags" in localsettings:
loc_flags = localsettings["flags"]
flags += loc_flags



print("[ytd]\t",local_configfile)
except:
except FileNotFoundError:
pass

if os.path.dirname(tmpfolder) != tmpfolder:
Expand All @@ -61,6 +73,8 @@ def main(url=None,preset=None,new=None):
break

os.chdir(folder)


# print("The following options have been loaded from local configuration:")
# for o in options:
# print(" ",o)
Expand Down

0 comments on commit 545288f

Please sign in to comment.