diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py index 00083961..bd5d38ad 100644 --- a/copyparty/httpcli.py +++ b/copyparty/httpcli.py @@ -7187,18 +7187,18 @@ class HttpCli(object): files = [] ptn_hr = RE_HR use_abs_url = is_opds or ( - vpath - and not is_ls - and not is_js - and not self.trailing_slash + vpath and not is_ls and not is_js and not self.trailing_slash ) for fn in ls_names: base = "" href = fn if use_abs_url: - base = self.args.SRS - if vpath: - base += vpath + "/" + if is_opds: + base = self.args.SRS + if vpath: + base += vpath + "/" + else: + base = "/" + vpath + "/" href = base + fn if fn in vfs_virt: @@ -7529,19 +7529,25 @@ class HttpCli(object): j2a["opds_osd"] = "%s%s?opds&osd" % (self.args.SRS, quotep(vpath)) j2a["opds_id"] = uuid.uuid5(uuid.NAMESPACE_URL, vpath + "/").urn - j2a["opds_title"] = (vpath.rsplit("/", 1)[-1] + '/') if vpath else self.args.bname + j2a["opds_title"] = ( + (vpath.rsplit("/", 1)[-1] + "/") if vpath else self.args.bname + ) for item in dirs: href = item["href"] href += ("&" if "?" in href else "?") + "opds" item["href"] = href - item["opds_id"] = uuid.uuid5(uuid.NAMESPACE_URL, "%s/%s" % (vpath, item["name"])).urn + item["opds_id"] = uuid.uuid5( + uuid.NAMESPACE_URL, "%s/%s" % (vpath, item["name"]) + ).urn item["iso8601"] = "%sZ" % (item["dt"].replace(" ", "T"),) for item in files: href = item["href"] href += ("&" if "?" in href else "?") + "dl" item["href"] = href - item["opds_id"] = uuid.uuid5(uuid.NAMESPACE_URL, "%s/%s" % (vpath, item["name"])).urn + item["opds_id"] = uuid.uuid5( + uuid.NAMESPACE_URL, "%s/%s" % (vpath, item["name"]) + ).urn item["iso8601"] = "%sZ" % (item["dt"].replace(" ", "T"),) if "rmagic" in self.vn.flags: