copyparty 1.10.1__py3-none-any.whl → 1.10.2__py3-none-any.whl

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (1, 10, 1)
+VERSION = (1, 10, 2)
 CODENAME = "tftp"
-BUILD_DT = (2024, 2, 18)
+BUILD_DT = (2024, 2, 21)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/ftpd.py

@@ -20,6 +20,7 @@ from .authsrv import VFS
 from .bos import bos
 from .util import (
     Daemon,
+    ODict,
     Pebkac,
     exclude_dotfiles,
     fsenc,
@@ -540,6 +541,8 @@ class Ftpd(object):
         if self.args.ftp4:
             ips = [x for x in ips if ":" not in x]
 
+        ips = list(ODict.fromkeys(ips))  # dedup
+
         ioloop = IOLoop()
         for ip in ips:
             for h, lp in hs:

copyparty/httpcli.py

@@ -3135,11 +3135,15 @@ class HttpCli(object):
 
         ext = ext.rstrip(".") or "unk"
         if len(ext) > 11:
-            ext = "⋯" + ext[-9:]
+            ext = "~" + ext[-9:]
 
+        return self.tx_svg(ext, exact)
+
+    def tx_svg(self, txt , small  = False)  :
         # chrome cannot handle more than ~2000 unique SVGs
-        chrome = " rv:" not in self.ua
-        mime, ico = self.ico.get(ext, not exact, chrome)
+        # so url-param "raster" returns a png/webp instead
+        # (useragent-sniffing kinshi due to caching proxies)
+        mime, ico = self.ico.get(txt, not small, "raster" in self.uparam)
 
         lm = formatdate(self.E.t0, usegmt=True)
         self.reply(ico, mime=mime, headers={"Last-Modified": lm})
@@ -3403,6 +3407,9 @@ class HttpCli(object):
             self.reply(pt.encode("utf-8"), status=rc)
             return True
 
+        if "th" in self.ouparam:
+            return self.tx_svg("e" + pt[:3])
+
         t = t.format(self.args.SR)
         qv = quotep(self.vpaths) + self.ourlq()
         html = self.j2s("splash", this=self, qvpath=qv, msg=t)
@@ -3783,12 +3790,15 @@ class HttpCli(object):
             if idx and hasattr(idx, "p_end"):
                 icur = idx.get_cur(dbv.realpath)
 
+        th_fmt = self.uparam.get("th")
         if self.can_read:
-            th_fmt = self.uparam.get("th")
             if th_fmt is not None:
+                nothumb = "dthumb" in dbv.flags
                 if is_dir:
                     vrem = vrem.rstrip("/")
-                    if icur and vrem:
+                    if nothumb:
+                        pass
+                    elif icur and vrem:
                         q = "select fn from cv where rd=? and dn=?"
                         crd, cdn = vrem.rsplit("/", 1) if "/" in vrem else ("", vrem)
                         # no mojibake support:
@@ -3811,10 +3821,10 @@ class HttpCli(object):
                                 break
 
                     if is_dir:
-                        return self.tx_ico("a.folder")
+                        return self.tx_svg("folder")
 
                 thp = None
-                if self.thumbcli:
+                if self.thumbcli and not nothumb:
                     thp = self.thumbcli.get(dbv, vrem, int(st.st_mtime), th_fmt)
 
                 if thp:
@@ -3825,6 +3835,9 @@ class HttpCli(object):
 
                 return self.tx_ico(rem)
 
+        elif self.can_write and th_fmt is not None:
+            return self.tx_svg("upload\nonly")
+
         elif self.can_get and self.avn:
             axs = self.avn.axs
             if self.uname not in axs.uhtml:

copyparty/ico.py

@@ -8,7 +8,7 @@ import re
 
 from .__init__ import PY2
 from .th_srv import HAVE_PIL, HAVE_PILF
-from .util import BytesIO  # type: ignore
+from .util import BytesIO, html_escape  # type: ignore
 
 
 class Ico(object):
@@ -31,10 +31,9 @@ class Ico(object):
 
         w = 100
         h = 30
-        if "n" in self.args.th_crop and as_thumb:
+        if as_thumb:
             sw, sh = self.args.th_size.split("x")
             h = int(100.0 / (float(sw) / float(sh)))
-            w = 100
 
         if chrome:
             # cannot handle more than ~2000 unique SVGs
@@ -99,6 +98,6 @@ class Ico(object):
   fill="#{}" font-family="monospace" font-size="14px" style="letter-spacing:.5px">{}</text>
 </g></svg>
 """
-        svg = svg.format(h, c[:6], c[6:], ext)
+        svg = svg.format(h, c[:6], c[6:], html_escape(ext, True))
 
         return "image/svg+xml", svg.encode("utf-8")

copyparty/tftpd.py

@@ -36,7 +36,7 @@ from partftpy.TftpShared import TftpException
 from .__init__ import EXE, TYPE_CHECKING
 from .authsrv import VFS
 from .bos import bos
-from .util import BytesIO, Daemon, exclude_dotfiles, min_ex, runhook, undot
+from .util import BytesIO, Daemon, ODict, exclude_dotfiles, min_ex, runhook, undot
 
 if TYPE_CHECKING:
     from .svchub import SvcHub
@@ -166,6 +166,8 @@ class Tftpd(object):
         if self.args.ftp4:
             ips = [x for x in ips if ":" not in x]
 
+        ips = list(ODict.fromkeys(ips))  # dedup
+
         for ip in ips:
             name = "tftp_%s" % (ip,)
             Daemon(self._start, name, [ip, ports])
@@ -176,18 +178,54 @@ class Tftpd(object):
 
     def _start(self, ip, ports):
         fam = socket.AF_INET6 if ":" in ip else socket.AF_INET
-        srv = TftpServer.TftpServer("/", self._ls)
-        with self.mutex:
-            self.srv.append(srv)
-            self.ips.append(ip)
-        try:
-            srv.listen(ip, self.port, af_family=fam, ports=ports)
-        except OSError:
+        have_been_alive = False
+        while True:
+            srv = TftpServer.TftpServer("/", self._ls)
             with self.mutex:
-                self.srv.remove(srv)
-                self.ips.remove(ip)
-            if ip != "0.0.0.0" or "::" not in self.ips:
-                raise
+                self.srv.append(srv)
+                self.ips.append(ip)
+
+            try:
+                # this is the listen loop; it should block forever
+                srv.listen(ip, self.port, af_family=fam, ports=ports)
+            except:
+                with self.mutex:
+                    self.srv.remove(srv)
+                    self.ips.remove(ip)
+
+                try:
+                    srv.sock.close()
+                except:
+                    pass
+
+                try:
+                    bound = bool(srv.listenport)
+                except:
+                    bound = False
+
+                if bound:
+                    # this instance has managed to bind at least once
+                    have_been_alive = True
+
+                if have_been_alive:
+                    t = "tftp server [%s]:%d crashed; restarting in 3 sec:\n%s"
+                    error(t, ip, self.port, min_ex())
+                    time.sleep(3)
+                    continue
+
+                # server failed to start; could be due to dualstack (ipv6 managed to bind and this is ipv4)
+                if ip != "0.0.0.0" or "::" not in self.ips:
+                    # nope, it's fatal
+                    t = "tftp server [%s]:%d failed to start:\n%s"
+                    error(t, ip, self.port, min_ex())
+
+                # yep; ignore
+                # (TODO: move the "listening @ ..." infolog in partftpy to
+                #   after the bind attempt so it doesn't print twice)
+                return
+
+            info("tftp server [%s]:%d terminated", ip, self.port)
+            break
 
     def stop(self):
         with self.mutex:

copyparty/web/browser.html

@@ -161,3 +161,4 @@
 </body>
 
 </html>
+

copyparty/web/browser2.html

@@ -61,3 +61,4 @@
 
 </body>
 </html>
+

copyparty/web/cf.html

@@ -25,3 +25,4 @@
 </body>
 
 </html>
+

copyparty/web/md.html

@@ -160,3 +160,4 @@ try { l.light = drk? 0:1; } catch (ex) { }
 	<script src="{{ r }}/.cpr/md2.js?_={{ ts }}"></script>
 	{%- endif %}
 </body></html>
+

copyparty/web/mde.html

@@ -54,3 +54,4 @@ try { l.light = drk? 0:1; } catch (ex) { }
 	<script src="{{ r }}/.cpr/deps/easymde.js?_={{ ts }}"></script>
 	<script src="{{ r }}/.cpr/mde.js?_={{ ts }}"></script>
 </body></html>
+

copyparty/web/msg.html

@@ -48,4 +48,5 @@
 	{%- endif %}
 </body>
 
-</html>
+</html>
+

copyparty/web/splash.html

@@ -118,3 +118,4 @@ document.documentElement.className = (STG && STG.cpp_thm) || "{{ this.args.theme
 <script src="{{ r }}/.cpr/splash.js?_={{ ts }}"></script>
 </body>
 </html>
+

copyparty/web/svcs.html

@@ -246,3 +246,4 @@ document.documentElement.className = (STG && STG.cpp_thm) || "{{ args.theme }}";
 <script src="{{ r }}/.cpr/svcs.js?_={{ ts }}"></script>
 </body>
 </html>
+

{copyparty-1.10.1.dist-info → copyparty-1.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: copyparty
-Version: 1.10.1
+Version: 1.10.2
 Summary: Portable file server with accelerated resumable uploads, deduplication, WebDAV, FTP, zeroconf, media indexer, video thumbnails, audio transcoding, and write-only folders
 Author-email: ed <copyparty@ocv.me>
 License: MIT

{copyparty-1.10.1.dist-info → copyparty-1.10.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 copyparty/__init__.py,sha256=34xcU8AoRRQscgVSx2gC6DeUyu7ZLmEVlXjttdQgXnI,1752
 copyparty/__main__.py,sha256=wK7Fop32aq7LUKmBCQcp3A6bJ2abdpj3em9IigFyniI,91595
-copyparty/__version__.py,sha256=Yf9rAPI4EWShbqAGltVRunB7inrUrDMybrzWdRaWf-0,246
+copyparty/__version__.py,sha256=z7G2R3a_jwf2rpKu1PpKRwOFSv86M6MOa1nRTzu_t9I,246
 copyparty/authsrv.py,sha256=BzJwPbYhTr9etW50DMY0UXRHBdNOKdnSdTuZ4qXlNvs,73470
 copyparty/broker_mp.py,sha256=4mEZC5tiHUazJMgYuwInNo2dxS7jrbzrGb1qs2UBt9k,3948
 copyparty/broker_mpw.py,sha256=4ZI7bJYOwUibeAJVv9_FPGNmHrr9eOtkj_Kz0JEppTU,3197
@@ -10,11 +10,11 @@ copyparty/cert.py,sha256=bt1n-629-Gtez1C_CroXq53gXEmUsVjkTbkQ6Gu2Zfc,7323
 copyparty/cfg.py,sha256=XMqgS5JMcTe4vCmAnUkSXrKBPTzn0zHYsBenXcZNK_s,9000
 copyparty/dxml.py,sha256=lZpg-kn-kQsXRtNY1n6fRaS-b7uXzMCyv8ovKnhZcZc,1548
 copyparty/fsutil.py,sha256=c4fTvmclKbVABNsjU4rGddsjCgRwi9YExAyo-06ATc8,3932
-copyparty/ftpd.py,sha256=wBoNl-DBMXJhP5irFKEFisMg10vouB5-VA9c6Juy1tI,15878
-copyparty/httpcli.py,sha256=wjVzOIstXy7bqjYWc2O7yxLRX3kdnZ7ki4vs9wOCtmQ,141841
+copyparty/ftpd.py,sha256=BqxH4j-mLrjRvxW3Lnz-qrR4_ETv3OnmIRNifSf_3Fk,15939
+copyparty/httpcli.py,sha256=YoumInsa3mzoJXQHjznsPpDYuKuzx0DoLXgx6vy8Oew,142323
 copyparty/httpconn.py,sha256=XyFv6yIsyq0InrqulwovsmAcqziEq_O2zsI41K8bJWs,6698
 copyparty/httpsrv.py,sha256=q0z4RuoTMiZz_QbUSCFikIDbKHm9_JT1uGTGuDvOdO0,16218
-copyparty/ico.py,sha256=NLWrgXwNPFHx30l8NOS5RaK-YSTntvAtQG31-bDwmLc,3562
+copyparty/ico.py,sha256=AYHdK6NlYBfBgafVYXia3jHQ9XHZdUL1D8WftLMAzIU,3545
 copyparty/mdns.py,sha256=CcraggbDxTT1ntYzD8Ebgqmw5Q4HkyZcfh5ymtCV_ak,17469
 copyparty/metrics.py,sha256=glBeNYGWMF4zEK9__aKks7qKnSwwJuWAzPx6ljRYt4k,8754
 copyparty/mtag.py,sha256=OZM6cVJafOe_LZ4bPJzVJbORA_omzewwJh-N11u3nak,16855
@@ -27,7 +27,7 @@ copyparty/sutil.py,sha256=dZhDAzVAp02i6YmGqcedy4LaYVffnJCSp3F6WEwfz7c,2967
 copyparty/svchub.py,sha256=LyhbfI4pYga-X7VSsbyzx3xM5kn2e4Z6bSObU4cRU0w,29036
 copyparty/szip.py,sha256=SJg5nzN_5oaIsIYXlRvcLHVTqngLAOPfe4_WVsuhSkw,8520
 copyparty/tcpsrv.py,sha256=2LGUqOBAIrsmL-1pwrbsPXR71gutHccqRp-hjzt91Us,17289
-copyparty/tftpd.py,sha256=ljT5AE1Uc88ZxqQjnvWnff9ELOTcM3E_Hj2EozL10qc,11673
+copyparty/tftpd.py,sha256=yM_byDfFI2c7TwgDbTtw9xt3LWJ3PBBHfIsMsB6MDow,13028
 copyparty/th_cli.py,sha256=e2FF-wVY4qcwAO8hrtTlwn3EJIOHyZt5sYhl0N8eudk,4378
 copyparty/th_srv.py,sha256=HBw6mq0RrJkAJupJpwFAjCMNS67Y9hda6sv7gFSzRwk,25764
 copyparty/u2idx.py,sha256=JBEqKX1ZM8GIvQrDYb5VQ_5QiFNFsjWF6H9drHlPVEY,12709
@@ -55,26 +55,26 @@ copyparty/stolen/ifaddr/_posix.py,sha256=-67NdfGrCktfQPakT2fLbjl2U00QMvyBGkSvrUu
 copyparty/stolen/ifaddr/_shared.py,sha256=cJACl8cOxQ-HSYphZTzKMAjAx_TAFyJwUPjfD102Xqw,6111
 copyparty/stolen/ifaddr/_win32.py,sha256=EE-QyoBgeB7lYQ6z62VjXNaRozaYfCkaJBHGNA8QtZM,4026
 copyparty/web/baguettebox.js.gz,sha256=BxwvSjky72hZprWofueRrlskiIeRrgGERUpKiZXQ5C8,7671
-copyparty/web/browser.css.gz,sha256=b8Ua3XIWFKP59iLsAz7aj8dMziBfg9GjKJuYAHLR0ns,11359
-copyparty/web/browser.html,sha256=pIkjj1J5vY-yy4_BsN0gZrBHiooEeLcMIeqnvcIotoY,4872
-copyparty/web/browser.js.gz,sha256=Ji72MRytc-wbp6Ly4EHx_xUv7Sr5-67YVbPJZDDcY9I,66518
-copyparty/web/browser2.html,sha256=3kR3QiDXYqtAo7gOoBtdTP3eRvibUCZHVVAbmAfaAVU,1604
-copyparty/web/cf.html,sha256=_tgwgNtK5MpjvvthGXx6Q9sasDaiWruyZfXsXYVW2KA,588
+copyparty/web/browser.css.gz,sha256=_C5z5xYMkKGnwT_y_dmQzbQBkXbYn6h0KWGdiMv_7yQ,11380
+copyparty/web/browser.html,sha256=72E2Q6grz_MtkmFVIXE_0rOVzliyQo-XwuawkJsB-qY,4873
+copyparty/web/browser.js.gz,sha256=NdOb9VBrO_ETpDt6LBhoUPPhiehYEckDCzVZndfpmG0,66579
+copyparty/web/browser2.html,sha256=AtGRGtb_rsyu-gWXEuXDMg9WqbjJFcDDJXel3ScG-4c,1605
+copyparty/web/cf.html,sha256=lJThtNFNAQT1ClCHHlivAkDGE0LutedwopXD62Z8Nys,589
 copyparty/web/dbg-audio.js.gz,sha256=Ma-KZtK8LnmiwNvNKFKXMPYl_Nn_3U7GsJ6-DRWC2HE,688
 copyparty/web/md.css.gz,sha256=DadSn01UeCBE47AKqCjmrc7x2ZLZMwl4f__RhGCDzS4,2011
-copyparty/web/md.html,sha256=Wv7QgWgOH4q_i1g89YaNNQO9SQ7xfbIAgqTp4FlI1vM,4109
+copyparty/web/md.html,sha256=QdrN1-58IgdXj6QnT9w3_nbT825A6UWknj6WOKxn69I,4110
 copyparty/web/md.js.gz,sha256=7uNDAB8ctTLm4vr3ui-hfqusn7rORDOJfydonOFEWCU,4277
 copyparty/web/md2.css.gz,sha256=bM_1hsegXnEig1b6OQ28yWWUlMPje6u9M58VZ1Z-C9g,681
 copyparty/web/md2.js.gz,sha256=P47IdvqfOaDSnAxKk-0K8au9yUkH3be6t4YZ8AosDtI,8343
 copyparty/web/mde.css.gz,sha256=L6YhxnYBoqT5bSwD99rx8ALXDh8d_1-sCvbc_p3MoAU,929
-copyparty/web/mde.html,sha256=VOvill4xAy7B5ZC_m-z4Xwu5_y_Ta4J7GzzxAE7dMJ8,1677
+copyparty/web/mde.html,sha256=1KPTKGFxTTuJ9Zp9OBdmm1DREtSvijqnlsZoNTpv7q0,1678
 copyparty/web/mde.js.gz,sha256=eo-UjMKIbRcPL6LR8BDl4IkCGcpJyFK0mhYte7WgqLc,2219
 copyparty/web/msg.css.gz,sha256=-wOmwxU0_Xg2W53rIAjKA2TeFAVQNJeT8ZMtmiJiviY,252
-copyparty/web/msg.html,sha256=V-X8PDeu64itAYijLjXTKJJzXylLxFVrJXdh-XM9-50,894
+copyparty/web/msg.html,sha256=-MPzXZnHzQNuX04-aSn_fA7L15GASOHnCyeS1eVCYUI,896
 copyparty/web/splash.css.gz,sha256=ZJ1E7wWGYBVl50ytkxdYkLsLDhRJtGwP2-YdMUo7MgI,927
-copyparty/web/splash.html,sha256=eYBC4h23RSGQMYoFYAIn3hwr-fycqM86hhC9kt85LMM,3781
+copyparty/web/splash.html,sha256=4ZgHc7v1C9ABwzde4UvlsyTCtkmIwKVMXm-3rHcFXsM,3782
 copyparty/web/splash.js.gz,sha256=3PMKsMLwEsHP8eonBmtvonm9yeNq69xjMi8ZqnVeKcA,1255
-copyparty/web/svcs.html,sha256=xwxvs7Fad8h9xn7xe3D7_zbR-GF-sMRyDgPi2m5yOiA,11701
+copyparty/web/svcs.html,sha256=Jn-G2QMF09oc01C_tmJwGZAdjFzbeu4unLSs6dowluM,11702
 copyparty/web/svcs.js.gz,sha256=k81ZvZ3I-f4fMHKrNGGOgOlvXnCBz0mVjD-8mieoWCA,520
 copyparty/web/ui.css.gz,sha256=oyrc_sf0u-KycOUV7FoRI7uF6oK6ruQ13Qzyz-7rad8,2567
 copyparty/web/up2k.js.gz,sha256=mT9u6jZFWjTTVgNodHrMvmuQ-sp7N4S6AtJHlrbOqoE,22027
@@ -90,7 +90,7 @@ copyparty/web/dd/4.png,sha256=fIwEVmtZNZtloZuVEKPKnkx3SELwRJmB3US61y7t2lI,248
 copyparty/web/dd/5.png,sha256=Lfpu8-yOlhONuoMbygloKqQVPXSm9gjxH2gUYn5QQAE,250
 copyparty/web/dd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 copyparty/web/deps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-copyparty/web/deps/marked.js.gz,sha256=jS4XXdh9KkF-isrI_nObhQOhQnlnnYZd90xzuRoeenI,22376
+copyparty/web/deps/marked.js.gz,sha256=WhUw0LPWs5cxqORQmW-zajQiUc5rSRkcvf3eT3-XSZc,22372
 copyparty/web/deps/mini-fa.css.gz,sha256=CTPrNaH8OTVmxajrGP88E2MkjadY9_81TBVnd9sw9Y8,572
 copyparty/web/deps/mini-fa.woff,sha256=L9DNncV2TIyvsrspMbJouvnnt7F068Hbn7YZYvN76AU,2784
 copyparty/web/deps/prism.css.gz,sha256=Z_A6rJ3MN5KWnjvXaV787aTW_5DT-xjFd0YZ7_W-Krk,1468
@@ -99,9 +99,9 @@ copyparty/web/deps/prismd.css.gz,sha256=ObUlksQVr-OuYlTz-I4B23TeBg2QDVVGRnWBz8cV
 copyparty/web/deps/scp.woff2,sha256=w99BDU5i8MukkMEL-iW0YO9H4vFFZSPWxbkH70ytaAg,8612
 copyparty/web/deps/sha512.ac.js.gz,sha256=lFZaCLumgWxrvEuDr4bqdKHsqjX82AbVAb7_F45Yk88,7033
 copyparty/web/deps/sha512.hw.js.gz,sha256=vqoXeracj-99Z5MfY3jK2N4WiSzYQdfjy0RnUlQDhSU,8110
-copyparty-1.10.1.dist-info/LICENSE,sha256=gOr4h33pCsBEg9uIy9AYmb7qlocL4V9t2uPJS5wllr0,1072
-copyparty-1.10.1.dist-info/METADATA,sha256=qyBDrdFsyK6XUgSIXmiQZo3oTmEbCoKSHU2jgibety0,112378
-copyparty-1.10.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-copyparty-1.10.1.dist-info/entry_points.txt,sha256=4zw6a3rqASywQomiYLObjjlxybaI65LYYOTJwgKz7b0,128
-copyparty-1.10.1.dist-info/top_level.txt,sha256=LnYUPsDyk-8kFgM6YJLG4h820DQekn81cObKSu9g-sI,10
-copyparty-1.10.1.dist-info/RECORD,,
+copyparty-1.10.2.dist-info/LICENSE,sha256=gOr4h33pCsBEg9uIy9AYmb7qlocL4V9t2uPJS5wllr0,1072
+copyparty-1.10.2.dist-info/METADATA,sha256=VztHHVGSLDK0ZRVxlGhBN2WuBCO3fpz6rbK0iVROAYY,112378
+copyparty-1.10.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+copyparty-1.10.2.dist-info/entry_points.txt,sha256=4zw6a3rqASywQomiYLObjjlxybaI65LYYOTJwgKz7b0,128
+copyparty-1.10.2.dist-info/top_level.txt,sha256=LnYUPsDyk-8kFgM6YJLG4h820DQekn81cObKSu9g-sI,10
+copyparty-1.10.2.dist-info/RECORD,,