copyparty 1.15.4__py3-none-any.whl → 1.15.5__py3-none-any.whl

copyparty/__init__.py

@@ -105,7 +105,6 @@ RES = set(zs.strip().split("\n"))
 
 class EnvParams(object):
     def __init__(self)  :
-        self.pkg  = None
         self.t0 = time.time()
         self.mod = ""
         self.cfg = ""

copyparty/__main__.py

@@ -212,7 +212,6 @@ def init_E(EE )  :
 
         raise Exception("could not find a writable path for config")
 
-    E.pkg = sys.modules[__package__]
     E.mod = os.path.dirname(os.path.realpath(__file__))
     if E.mod.endswith("__init__"):
         E.mod = os.path.dirname(E.mod)

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (1, 15, 4)
+VERSION = (1, 15, 5)
 CODENAME = "fill the drives"
-BUILD_DT = (2024, 10, 4)
+BUILD_DT = (2024, 10, 5)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/util.py

@@ -3532,9 +3532,9 @@ def stat_resource(E , name ):
     return None
 
 
-def _find_impresource(E , name ):
+def _find_impresource(pkg , name ):
     try:
-        files = impresources.files(E.pkg)
+        files = impresources.files(pkg)
     except ImportError:
         return None
 
@@ -3544,7 +3544,7 @@ def _find_impresource(E , name ):
 _rescache_has = {}
 
 
-def _has_resource(E , name ):
+def _has_resource(name ):
     try:
         return _rescache_has[name]
     except:
@@ -3553,14 +3553,16 @@ def _has_resource(E , name ):
     if len(_rescache_has) > 999:
         _rescache_has.clear()
 
+    pkg = sys.modules[__package__]
+
     if impresources:
-        res = _find_impresource(E, name)
+        res = _find_impresource(pkg, name)
         if res and res.is_file():
             _rescache_has[name] = True
             return True
 
     if pkg_resources:
-        if _pkg_resource_exists(E.pkg.__name__, name):
+        if _pkg_resource_exists(pkg.__name__, name):
             _rescache_has[name] = True
             return True
 
@@ -3569,14 +3571,14 @@ def _has_resource(E , name ):
 
 
 def has_resource(E , name ):
-    return _has_resource(E, name) or os.path.exists(os.path.join(E.mod, name))
+    return _has_resource(name) or os.path.exists(os.path.join(E.mod, name))
 
 
 def load_resource(E , name , mode="rb")  :
     enc = None if "b" in mode else "utf-8"
 
     if impresources:
-        res = _find_impresource(E, name)
+        res = _find_impresource(sys.modules[__package__], name)
         if res and res.is_file():
             if enc:
                 return res.open(mode, encoding=enc)
@@ -3585,8 +3587,9 @@ def load_resource(E , name , mode="rb")  :
                 return res.open(mode)
 
     if pkg_resources:
-        if _pkg_resource_exists(E.pkg.__name__, name):
-            stream = pkg_resources.resource_stream(E.pkg.__name__, name)
+        pkg = sys.modules[__package__]
+        if _pkg_resource_exists(pkg.__name__, name):
+            stream = pkg_resources.resource_stream(pkg.__name__, name)
             if enc:
                 stream = codecs.getreader(enc)(stream)
             return stream

{copyparty-1.15.4.dist-info → copyparty-1.15.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: copyparty
-Version: 1.15.4
+Version: 1.15.5
 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
@@ -831,6 +831,7 @@ semi-intentional limitations:
 
 * cleanup of expired shares only works when global option `e2d` is set, and/or at least one volume on the server has volflag `e2d`
 * only folders from the same volume are shared; if you are sharing a folder which contains other volumes, then the contents of those volumes will not be available
+* related to [IdP volumes being forgotten on shutdown](https://github.com/9001/copyparty/blob/hovudstraum/docs/idp.md#idp-volumes-are-forgotten-on-shutdown), any shares pointing into a user's IdP volume will be unavailable until that user makes their first request after a restart
 * no option to "delete after first access" because tricky
   * when linking something to discord (for example) it'll get accessed by their scraper and that would count as a hit
   * browsers wouldn't be able to resume a broken download unless the requester's IP gets allowlisted for X minutes (ref. tricky)

{copyparty-1.15.4.dist-info → copyparty-1.15.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-copyparty/__init__.py,sha256=wkz_fW1qOsy4bUb6UOX45wyoM6eMXZrH_pbbJTHyhx4,2622
-copyparty/__main__.py,sha256=haJukP40kmpE0HidO3bY2mmohe-H4ih_cwFTullxrlE,109570
-copyparty/__version__.py,sha256=QdadkcRd9LbeLxEk1w-II6vFXxoK9pVhEgKcLiaEbOQ,257
+copyparty/__init__.py,sha256=Chqw7uXX4r_-a2p6-xthrrqVHFI4aZdW45sWU7UvqeE,2597
+copyparty/__main__.py,sha256=igXfkIk20dnXiMD3bOgmomv2m1_STd46QADrPb52P6E,109533
+copyparty/__version__.py,sha256=kIxyRw7J4J4tZ35LfBec0gjCU3PVbEq-j0P5Esc6kXw,257
 copyparty/authsrv.py,sha256=Uw_RaCJIsXUzjYih4R2VLQOkDfUePLfidiW5ERvCtMo,98670
 copyparty/broker_mp.py,sha256=jsHUM2BSfRVRyZT869iPCqYEHSqedk6VkwvygZwbEZE,4017
 copyparty/broker_mpw.py,sha256=PYFgQfssOCfdI6qayW1ZjO1j1-7oez094muhYMbPOz0,3339
@@ -32,7 +32,7 @@ copyparty/th_cli.py,sha256=o6FMkerYvAXS455z3DUossVztu_nzFlYSQhs6qN6Jt8,4636
 copyparty/th_srv.py,sha256=hI9wY1E_9N9Cgqvtr8zADeVqqiLGTiTdAnYAA7WFvJw,29346
 copyparty/u2idx.py,sha256=JjgqwgJBNj6sTn4PJfuqM3VEHqlmoyGC5bk4_92K2h0,13414
 copyparty/up2k.py,sha256=TzCNQKiC-fxfV2EpXdy1oCA3yExpHyzrH6BmgFrTrJg,163817
-copyparty/util.py,sha256=B9BhffBGsRE7f48078646gDABNVerSAuM8EbQpAjlxY,91242
+copyparty/util.py,sha256=RrL6SBjgeVTyXZdZQ8RRFVQn72Jz0Y6DTGYr4LO3Phc,91329
 copyparty/bos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 copyparty/bos/bos.py,sha256=Wb7eWsXJgR5AFlBR9ZOyKrLTwy-Kct9RrGiOu4Jo37Y,1622
 copyparty/bos/path.py,sha256=yEjCq2ki9CvxA5sCT8pS0keEXwugs0ZeUyUhdBziOCI,777
@@ -106,9 +106,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.15.4.dist-info/LICENSE,sha256=gOr4h33pCsBEg9uIy9AYmb7qlocL4V9t2uPJS5wllr0,1072
-copyparty-1.15.4.dist-info/METADATA,sha256=BpkzqpVDqywI5NP2j8_M_ccH12Ym3p4wUnNE9sdzYVs,135552
-copyparty-1.15.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-copyparty-1.15.4.dist-info/entry_points.txt,sha256=4zw6a3rqASywQomiYLObjjlxybaI65LYYOTJwgKz7b0,128
-copyparty-1.15.4.dist-info/top_level.txt,sha256=LnYUPsDyk-8kFgM6YJLG4h820DQekn81cObKSu9g-sI,10
-copyparty-1.15.4.dist-info/RECORD,,
+copyparty-1.15.5.dist-info/LICENSE,sha256=gOr4h33pCsBEg9uIy9AYmb7qlocL4V9t2uPJS5wllr0,1072
+copyparty-1.15.5.dist-info/METADATA,sha256=o3EaYdn7-JhJSuNd838dMe48Lv4KAberuypcFv5v03Q,135833
+copyparty-1.15.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+copyparty-1.15.5.dist-info/entry_points.txt,sha256=4zw6a3rqASywQomiYLObjjlxybaI65LYYOTJwgKz7b0,128
+copyparty-1.15.5.dist-info/top_level.txt,sha256=LnYUPsDyk-8kFgM6YJLG4h820DQekn81cObKSu9g-sI,10
+copyparty-1.15.5.dist-info/RECORD,,