From 3aafde0a3ff46a08e06ce62dbf442f27976834ab Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Thu, 14 Nov 2024 21:59:12 +0100
Subject: [PATCH] Android fixes

---
 base/project.js      | 17 +++++++++++++++++
 base/sources/file.ts | 29 +++++++++++++----------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/base/project.js b/base/project.js
index be5878a7..96cd2abc 100644
--- a/base/project.js
+++ b/base/project.js
@@ -127,5 +127,22 @@ if (export_version_info) {
 	project.add_assets(dir + "/version.json", { destination: "data/{name}" });
 }
 
+let export_data_list = flags.android; // .apk contents
+if (export_data_list) {
+	let root = "../" + flags.name.toLowerCase();
+	let data_list = {
+		"/data/plugins": fs_readdir("../base/assets/plugins").concat(fs_readdir(root + "/assets/plugins")).join(","),
+		"/data/export_presets": fs_readdir(root + "/assets/export_presets").join(","),
+		"/data/keymap_presets": fs_readdir(root + "/assets/keymap_presets").join(","),
+		"/data/locale": fs_readdir("../base/assets/locale").join(","),
+		"/data/meshes": fs_readdir(root + "/assets/meshes").join(","),
+		"/data/themes": fs_readdir("../base/assets/themes").join(","),
+	};
+	let dir = "../" + flags.name.toLowerCase() + "/build";
+	fs_ensuredir(dir);
+	fs_writefile(dir + "/data_list.json", JSON.stringify(data_list));
+	project.add_assets(dir + "/data_list.json", { destination: "data/{name}" });
+}
+
 project.flatten();
 return project;
diff --git a/base/sources/file.ts b/base/sources/file.ts
index 92ce5d33..8369bcdb 100644
--- a/base/sources/file.ts
+++ b/base/sources/file.ts
@@ -33,9 +33,9 @@ let file_cloud_sizes: map_t<string, i32> = null;
 
 let _file_init_cloud_bytes_done: ()=>void;
 
-// ///if arm_android
-// let file_internal: map_t<string, string[]> = null; // .apk contents
-// ///end
+///if arm_android
+let file_internal: map_t<string, string[]> = null; // .apk contents
+///end
 
 function file_read_directory(path: string): string[] {
 	if (starts_with(path, "cloud")) {
@@ -48,19 +48,16 @@ function file_read_directory(path: string): string[] {
 			return empty;
 		}
 	}
-	// ///if arm_android
-	// path = string_replace_all(path, "//", "/");
-	// if (file_internal == null) {
-	// 	file_internal = [];
-	// 	map_set(file_internal, "/data/plugins", BuildMacros.readDirectory("out/data/plugins"));
-	// 	map_set(file_internal, "/data/export_presets", BuildMacros.readDirectory("out/data/export_presets"));
-	// 	map_set(file_internal, "/data/keymap_presets", BuildMacros.readDirectory("out/data/keymap_presets"));
-	// 	map_set(file_internal, "/data/locale", BuildMacros.readDirectory("out/data/locale"));
-	// 	map_set(file_internal, "/data/meshes", BuildMacros.readDirectory("out/data/meshes"));
-	// 	map_set(file_internal, "/data/themes", BuildMacros.readDirectory("out/data/themes"));
-	// }
-	// if (file_internal.exists(path)) return map_get(file_internal, path);
-	// ///end
+	///if arm_android
+	path = string_replace_all(path, "//", "/");
+	if (file_internal == null) {
+		let s: string = sys_buffer_to_string(data_get_blob("/data/data_list.json"));
+		file_internal = json_parse_to_map(s);
+	}
+	if (map_get(file_internal, path) != null) {
+		return string_split(map_get(file_internal, path), ",");
+	}
+	///end
 
 	let files: string[] = string_split(iron_read_directory(path), "\n");
 	///if arm_windows