From 5110ef3b370938a9eac4d1708840d476d1e6f800 Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@unsigned.io>
Date: Thu, 26 Oct 2023 19:59:30 +0200
Subject: [PATCH] Use internal map cache dir

---
 sbapp/main.py          | 9 +++++----
 sbapp/sideband/core.py | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sbapp/main.py b/sbapp/main.py
index 5739812..47154c8 100644
--- a/sbapp/main.py
+++ b/sbapp/main.py
@@ -153,6 +153,7 @@ class SidebandApp(MDApp):
         self.map = None
         self.map_layer = None
         self.map_screen = None
+        self.map_cache = self.sideband.map_cache
         self.offline_source = None
         self.map_settings_screen = None
         self.object_details_screen = None
@@ -3315,7 +3316,7 @@ class SidebandApp(MDApp):
                 current_map_path = self.sideband.config["map_storage_file"]
                 if current_map_path == None:
                     raise ValueError("Map path cannot be None")
-                source = MBTilesMapSource(current_map_path)
+                source = MBTilesMapSource(current_map_path, cache_dir=self.map_cache)
                 self.offline_source = source
                 return self.offline_source
             
@@ -3335,7 +3336,7 @@ class SidebandApp(MDApp):
             source = self.map_get_offline_source()
         
         if source == None:
-            source = MapSource.from_provider("osm", quad_key=False)
+            source = MapSource.from_provider("osm", cache_dir=self.map_cache, quad_key=False)
 
         return source
 
@@ -3386,8 +3387,8 @@ class SidebandApp(MDApp):
 
             source = None
             if ml == "offline": source = self.map_get_offline_source()
-            if ml == "osm": source = MapSource.from_provider("osm", quad_key=False)
-            if ml == "ve": source = MapSource.from_provider("ve", quad_key=True)
+            if ml == "osm": source = MapSource.from_provider("osm", cache_dir=self.map_cache, quad_key=False)
+            if ml == "ve": source = MapSource.from_provider("ve", cache_dir=self.map_cache, quad_key=True)
 
             if source != None:
                 self.map_layer = ml
diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py
index d3ba182..67a4a8f 100644
--- a/sbapp/sideband/core.py
+++ b/sbapp/sideband/core.py
@@ -124,12 +124,14 @@ class SidebandCore():
         self.rpc_connection = None
 
         self.app_dir       = plyer.storagepath.get_home_dir()+"/.config/sideband"
+        self.cache_dir     = self.app_dir+"/cache"
         if self.app_dir.startswith("file://"):
             self.app_dir   = self.app_dir.replace("file://", "")
         
         self.rns_configdir = None
         if RNS.vendor.platformutils.is_android():
             self.app_dir = android_app_dir+"/io.unsigned.sideband/files/"
+            self.cache_dir = self.app_dir+"/cache"
             self.rns_configdir = self.app_dir+"/app_storage/reticulum"
             self.asset_dir     = self.app_dir+"/app/assets"
         elif RNS.vendor.platformutils.is_darwin():
@@ -141,6 +143,10 @@ class SidebandCore():
         else:
             self.asset_dir     = plyer.storagepath.get_application_dir()+"/sbapp/assets"
 
+        self.map_cache         = self.cache_dir+"/maps"
+        if not os.path.isdir(self.map_cache):
+            os.makedirs(self.map_cache)
+
         self.icon              = self.asset_dir+"/icon.png"
         self.icon_48           = self.asset_dir+"/icon_48.png"
         self.icon_32           = self.asset_dir+"/icon_32.png"