diff --git a/copyparty/__main__.py b/copyparty/__main__.py index bf392b1f..9dab68ce 100644 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -196,42 +196,41 @@ def init_E(EE: EnvParams) -> None: (unicode, "/tmp"), ] errs = [] - if True: - for npath, (pf, pa) in enumerate(paths): - p = "" - try: - p = pf(pa) - if not p or p.startswith("~"): - continue + for npath, (pf, pa) in enumerate(paths): + p = "" + try: + p = pf(pa) + if not p or p.startswith("~"): + continue - p = os.path.normpath(p) - if os.path.isdir(p) and os.listdir(p): - mkdir = False - else: - mkdir = True - os.mkdir(p) + p = os.path.normpath(p) + if os.path.isdir(p) and os.listdir(p): + mkdir = False + else: + mkdir = True + os.mkdir(p) - p = os.path.join(p, "copyparty") - if not os.path.isdir(p): - os.mkdir(p) + p = os.path.join(p, "copyparty") + if not os.path.isdir(p): + os.mkdir(p) - if npath > 1: - t = "Using %s/copyparty [%s] for config; filekeys/dirkeys will change on every restart. Consider setting XDG_CONFIG_HOME or giving the unix-user a ~/.config/" - errs.append(t % (pa, p)) - elif mkdir: - t = "Using %s/copyparty [%s] for config%s (Warning: %s did not exist and was created just now)" - errs.append(t % (pa, p, " instead" if npath else "", pa)) - elif errs: - errs.append("Using %s/copyparty [%s] instead" % (pa, p)) + if npath > 1: + t = "Using %s/copyparty [%s] for config; filekeys/dirkeys will change on every restart. Consider setting XDG_CONFIG_HOME or giving the unix-user a ~/.config/" + errs.append(t % (pa, p)) + elif mkdir: + t = "Using %s/copyparty [%s] for config%s (Warning: %s did not exist and was created just now)" + errs.append(t % (pa, p, " instead" if npath else "", pa)) + elif errs: + errs.append("Using %s/copyparty [%s] instead" % (pa, p)) - if errs: - warn(". ".join(errs)) + if errs: + warn(". ".join(errs)) - return p # type: ignore - except Exception as ex: - if p and npath < 2: - t = "Unable to store config in %s [%s] due to %r" - errs.append(t % (pa, p, ex)) + return p # type: ignore + except Exception as ex: + if p and npath < 2: + t = "Unable to store config in %s [%s] due to %r" + errs.append(t % (pa, p, ex)) raise Exception("could not find a writable path for config")