diff --git a/bin/partyfuse.py b/bin/partyfuse.py index a7c5ca76..6e0b4c44 100755 --- a/bin/partyfuse.py +++ b/bin/partyfuse.py @@ -417,7 +417,7 @@ class Gateway(object): ret = [] rem = b"" ptn = re.compile( - r'^(-|DIR|)]* href="([^"]+)"[^>]*>([^<]+)([^<]+)[^<]+([^<]+)$' + r'^(-|DIR|)]* href="([^"]+)"[^>]*>([^<]+)([^<]+).*([^<]+)$' ) while True: @@ -454,7 +454,7 @@ class Gateway(object): info("bad HTML or OS [%r] [%r]", fdate, fsize) # python cannot strptime(1959-01-01) on windows - if ftype != "DIR": + if ftype != "DIR" and "zip=crc" not in ftype: ret.append([fname, self.stat_file(ts, sz), 0]) else: ret.append([fname, self.stat_dir(ts, sz), 0]) diff --git a/copyparty/web/browser.html b/copyparty/web/browser.html index 1b730e4f..78be327d 100644 --- a/copyparty/web/browser.html +++ b/copyparty/web/browser.html @@ -108,12 +108,9 @@ {%- for f in files %} {{ f.lead }}{{ f.name|e }}{{ f.sz }} - {%- if f.tags is defined %} - {%- for k in taglist %} -{{ f.tags[k] }} - {%- endfor %} - {%- endif %} -{{ f.ext }}{{ f.dt }} +{%- if f.tags is defined %} + {%- for k in taglist %}{{ f.tags[k] }}{%- endfor %} +{%- endif %}{{ f.ext }}{{ f.dt }} {%- endfor %}