diff --git a/nomadnet/NomadNetworkApp.py b/nomadnet/NomadNetworkApp.py index 128f495..e9852e5 100644 --- a/nomadnet/NomadNetworkApp.py +++ b/nomadnet/NomadNetworkApp.py @@ -113,7 +113,8 @@ class NomadNetworkApp: self.identitypath = self.configdir+"/storage/identity" self.cachepath = self.configdir+"/storage/cache" self.imagecachepath = self.configdir+"/storage/cache/images" - self.convcachepath = self.configdir+"/storage/cache/images/converted" + self.convcachepath = self.configdir+"/storage/cache/images/converted_node" + self.dispcachepath = self.configdir+"/storage/cache/images/converted_disp" self.resourcepath = self.configdir+"/storage/resources" self.conversationpath = self.configdir+"/storage/conversations" self.directorypath = self.configdir+"/storage/directory" @@ -183,6 +184,9 @@ class NomadNetworkApp: if not os.path.isdir(self.convcachepath): os.makedirs(self.convcachepath) + if not os.path.isdir(self.dispcachepath): + os.makedirs(self.dispcachepath) + if not os.path.isdir(self.resourcepath): os.makedirs(self.resourcepath) diff --git a/nomadnet/ui/textui/images/_webp.py b/nomadnet/ui/textui/images/_webp.py index 5eff74c..9238216 100644 --- a/nomadnet/ui/textui/images/_webp.py +++ b/nomadnet/ui/textui/images/_webp.py @@ -25,7 +25,6 @@ # Environment overrides: # # NOMADNET_IMAGE_BACKEND force a specific backend (strict) -# NOMADNET_IMAGE_CACHE override the conversion cache directory import ctypes import ctypes.util @@ -115,12 +114,13 @@ def _encode_png_rgba(rgba, width, height): # Conversion cache # #################### +CONV_CACHE_BASE = None def cache_dir(): - base = os.environ.get("NOMADNET_IMAGE_CACHE") - if not base: - base = os.environ.get("XDG_CACHE_HOME") or os.path.join(os.path.expanduser("~"), ".cache") - base = os.path.join(base, "nomadnet", "image-cache") - return base + global CONV_CACHE_BASE + if not CONV_CACHE_BASE: + from nomadnet.NomadNetworkApp import NomadNetworkApp + CONV_CACHE_BASE = NomadNetworkApp._shared_instance.dispcachepath + return CONV_CACHE_BASE def _cache_path(source_data): return os.path.join(cache_dir(), hashlib.sha256(source_data).hexdigest() + ".png")