From 21405c3fda572096eb3d74f510cfc4743f8cfded Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sat, 27 Mar 2021 01:43:02 +0100
Subject: [PATCH] be nice to windows

---
 copyparty/szip.py     | 6 ++++--
 copyparty/web/md.html | 2 +-
 copyparty/web/util.js | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/copyparty/szip.py b/copyparty/szip.py
index 42e0bcdd..90f8e3d4 100644
--- a/copyparty/szip.py
+++ b/copyparty/szip.py
@@ -3,7 +3,7 @@ import zlib
 import struct
 from datetime import datetime
 
-from .util import yieldfile
+from .util import yieldfile, sanitize_fn
 
 
 def dostime2unix(buf):
@@ -84,7 +84,9 @@ def gen_hdr(h_pos, fn, sz, lastmod, utf8, crc32, pre_crc):
     vsz = 0xFFFFFFFF if z64 else sz
     ret += struct.pack("<LL", vsz, vsz)
 
-    bfn = fn.encode("utf-8" if utf8 else "cp437", "replace")
+    # windows support (the "?" replace below too)
+    fn = sanitize_fn(fn)
+    bfn = fn.encode("utf-8" if utf8 else "cp437", "replace").replace(b"?", b"_")
 
     z64_len = len(z64v) * 8 + 4 if z64v else 0
     ret += struct.pack("<HH", len(bfn), z64_len)
diff --git a/copyparty/web/md.html b/copyparty/web/md.html
index 6bc43ba1..457d56d3 100644
--- a/copyparty/web/md.html
+++ b/copyparty/web/md.html
@@ -147,7 +147,7 @@ var md_opt = {
 
 	</script>
     <script src="/.cpr/util.js"></script>
-	<script src="/.cpr/deps/marked.full.js"></script>
+	<script src="/.cpr/deps/marked.js"></script>
 	<script src="/.cpr/md.js"></script>
 	{%- if edit %}
 	<script src="/.cpr/md2.js"></script>
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index 9b5cd1ce..e36cf05a 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -237,7 +237,10 @@ function goto(dest) {
     goto();
     var op = sread('opmode');
     if (op !== null && op !== '.')
-        goto(op);
+        try {
+            goto(op);
+        }
+        catch (ex) { }
 })();