copyparty 1.10.1__tar.gz → 1.10.2__tar.gz

{copyparty-1.10.1 → copyparty-1.10.2}/PKG-INFO

@@ -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 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/copyparty/web/browser.html

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

{copyparty-1.10.1 → copyparty-1.10.2}/copyparty/web/browser2.html

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

{copyparty-1.10.1 → copyparty-1.10.2}/copyparty/web/cf.html

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

{copyparty-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/copyparty/web/msg.html

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

{copyparty-1.10.1 → copyparty-1.10.2}/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-1.10.1 → copyparty-1.10.2}/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 → copyparty-1.10.2}/copyparty.egg-info/PKG-INFO

@@ -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