mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-20 02:12:20 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #556 fuckup, fixes #624

Browse source
This commit is contained in:
ed 2025-08-17 15:19:25 +00:00
parent e7f2c6d806
commit bf1fdcab09
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
copyparty/__main__.py
View file

@ -441,15 +441,8 @@ def expand_cfg(argv) -> list[str]:
supp = args_from_cfg(CFG_DEF[0]) supp = args_from_cfg(CFG_DEF[0])
argv = supp + argv argv = supp + argv
n = spins = 0 n = 0
while n < len(argv): while n < len(argv):
if not n:
if spins % 1000 == 999:
t = "still expanding config files... giving up after %d more"
print(t % (9999 - spins))
if spins > 9999:
t = "got stuck expanding config files; do you have a config-file which imports itself? this is where I gave up:\n%r"
raise Exception(t % (argv[:1000]))
v1 = argv[n] v1 = argv[n]
v1v = v1[2:].lstrip("=") v1v = v1[2:].lstrip("=")
try: try:
@ -457,16 +450,12 @@ def expand_cfg(argv) -> list[str]:
except: except:
v2 = "" v2 = ""
n += 1
if v1 == "-c" and v2 and os.path.isfile(v2): if v1 == "-c" and v2 and os.path.isfile(v2):
argv = argv[:n] + args_from_cfg(v2) + argv[n + 2 :]
spins += 1
n = 0
elif v1.startswith("-c") and v1v and os.path.isfile(v1v):
argv = argv[:n] + args_from_cfg(v1v) + argv[n + 1 :]
spins += 1
n = 0
else:
n += 1 n += 1
argv = argv[:n] + args_from_cfg(v2) + argv[n:]
elif v1.startswith("-c") and v1v and os.path.isfile(v1v):
argv = argv[:n] + args_from_cfg(v1v) + argv[n:]
return argv return argv