techwire/copyparty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use __package__ to find package resources

Browse Source
This commit is contained in:
Shiz 2024-09-17 12:05:38 +02:00
parent 2997c427aa
commit 5320ff9c1f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
copyparty/__init__.py
View File

@ -54,6 +54,7 @@ except:
class EnvParams(object): class EnvParams(object):
def __init__(self) -> None: def __init__(self) -> None:
self.pkg = ""
self.t0 = time.time() self.t0 = time.time()
self.mod = "" self.mod = ""
self.cfg = "" self.cfg = ""

1
copyparty/__main__.py
View File

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

6
copyparty/util.py
View File

@ -3576,7 +3576,7 @@ def stat_resource(E: EnvParams, name: str):
def has_resource(E: EnvParams, name: str): def has_resource(E: EnvParams, name: str):
if impresources: if impresources:
try: try:
resources = impresources.files("copyparty") resources = impresources.files(E.pkg)
except ImportError: except ImportError:
pass pass
else: else:
@ -3590,7 +3590,7 @@ def has_resource(E: EnvParams, name: str):
def load_resource(E: EnvParams, name: str, mode="rb"): def load_resource(E: EnvParams, name: str, mode="rb"):
if impresources: if impresources:
try: try:
resources = impresources.files("copyparty") resources = impresources.files(E.pkg)
except ImportError: except ImportError:
pass pass
else: else:
@ -3618,7 +3618,7 @@ def walk_resources(E: EnvParams, name: str):
if impresources: if impresources:
try: try:
resources = impresources.files("copyparty").joinpath(name) resources = impresources.files(E.pkg).joinpath(name)
except ImportError: except ImportError:
resources = None resources = None
else: else: