From 2b644fa81bfd7c26e5a7b0bbd288b2332fe85cfc Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sat, 4 Feb 2023 13:41:43 +0000
Subject: [PATCH] don't alias randomized filenames

---
 copyparty/up2k.py     | 26 ++++++++++++++------------
 copyparty/web/up2k.js |  6 ++++--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/copyparty/up2k.py b/copyparty/up2k.py
index c4350752..3b734338 100644
--- a/copyparty/up2k.py
+++ b/copyparty/up2k.py
@@ -2028,6 +2028,7 @@ class Up2k(object):
             reg = self.registry[ptop]
             vfs = self.asrv.vfs.all_vols[cj["vtop"]]
             n4g = vfs.flags.get("noforget")
+            rand = vfs.flags.get("rand") or cj.get("rand")
             lost: list[tuple["sqlite3.Cursor", str, str]] = []
 
             vols = [(ptop, jcur)] if jcur else []
@@ -2095,10 +2096,6 @@ class Up2k(object):
             if alts:
                 best = sorted(alts, reverse=True)[0]
                 job = best[2]
-                if best[0] == 5 and vfs.flags.get("rand") or cj.get("rand"):
-                    # filenames are randomized; found dupe in same folder;
-                    # perfect! return the original file
-                    cj["name"] = job["name"]
             else:
                 job = None
 
@@ -2172,11 +2169,11 @@ class Up2k(object):
                         # symlink to the client-provided name,
                         # returning the previous upload info
                         job = deepcopy(job)
-                        for k in ["ptop", "vtop", "prel"]:
+                        for k in "ptop vtop prel addr".split():
                             job[k] = cj[k]
 
                         pdir = djoin(cj["ptop"], cj["prel"])
-                        if vfs.flags.get("rand") or cj.get("rand"):
+                        if rand:
                             job["name"] = rand_name(
                                 pdir, cj["name"], vfs.flags["nrand"]
                             )
@@ -2185,23 +2182,24 @@ class Up2k(object):
 
                         dst = os.path.join(job["ptop"], job["prel"], job["name"])
                         if not self.args.nw:
-                            bos.unlink(dst)  # TODO ed pls
                             try:
-                                dst_flags = self.flags[job["ptop"]]
-                                self._symlink(src, dst, dst_flags, lmod=cj["lmod"])
+                                dvf = self.flags[job["ptop"]]
+                                self._symlink(src, dst, dvf, lmod=cj["lmod"], rm=True)
                             except:
+                                if bos.path.exists(dst):
+                                    bos.unlink(dst)
                                 if not n4g:
                                     raise
 
                         if cur:
-                            a = [cj[x] for x in "prel name lmod size addr".split()]
-                            a += [cj.get("at") or time.time()]
+                            a = [job[x] for x in "prel name lmod size addr".split()]
+                            a += [job.get("at") or time.time()]
                             self.db_add(cur, wark, *a)
                             cur.connection.commit()
 
             if not job:
                 ap1 = djoin(cj["ptop"], cj["prel"])
-                if vfs.flags.get("rand") or cj.get("rand"):
+                if rand:
                     cj["name"] = rand_name(ap1, cj["name"], vfs.flags["nrand"])
 
                 if vfs.lim:
@@ -2306,6 +2304,7 @@ class Up2k(object):
         dst: str,
         flags: dict[str, Any],
         verbose: bool = True,
+        rm: bool = False,
         lmod: float = 0,
     ) -> None:
         if verbose:
@@ -2345,6 +2344,9 @@ class Up2k(object):
                 lsrc = lsrc.replace("/", "\\")
                 ldst = ldst.replace("/", "\\")
 
+            if rm and bos.path.exists(dst):
+                bos.unlink(dst)
+
             try:
                 if "hardlink" in flags:
                     os.link(fsenc(src), fsenc(dst))
diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js
index 8109bb1e..6e19b773 100644
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -1364,8 +1364,10 @@ function up2k_init(subtle) {
 
             if (uc.fsearch)
                 entry.srch = 1;
-            else if (uc.rand)
+            else if (uc.rand) {
                 entry.rand = true;
+                entry.name = 'a\n' + entry.name;
+            }
 
             if (biggest_file < entry.size)
                 biggest_file = entry.size;
@@ -1401,7 +1403,7 @@ function up2k_init(subtle) {
         ebi('u2tabw').className = 'ye';
 
         setTimeout(function () {
-            if (!actx || actx.state != 'suspended' || toast.tag == L.u_unpt)
+            if (!actx || actx.state != 'suspended' || toast.visible)
                 return;
 
             toast.warn(30, "<div onclick=\"start_actx();toast.inf(3,'thanks!')\">please click this text to<br />unlock full upload speed</div>");