From 91038bc0d7165f9b91e0bfb87742993f7d3bdb67 Mon Sep 17 00:00:00 2001
From: Nick Fisher <nick.fisher@avinium.com>
Date: Fri, 26 Aug 2022 00:26:03 +1000
Subject: [PATCH] fix HotReload helper to use proper paths consistently

---
 .../app/polyvox/filament/HotReloadPathHelper.kt  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt b/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt
index 05889d83..4d79dd9a 100644
--- a/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt
+++ b/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt
@@ -10,22 +10,14 @@ import android.util.Log
 class HotReloadPathHelper {
     companion object {
         fun getAssetPath(path: String, packageName: String): String? {
-            // iterate over evr
-            val shortName = packageName.split(".").last().split("_").last()
             val packagePath = "/data/user/0/${packageName}/code_cache/"
-            Log.v("FFI", "Looking for shortName ${shortName} under package path ${packagePath}")
-            val files = File(packagePath).listFiles().filter {
-              it.path.split("/").last().startsWith(shortName)
-            }.map {
-              val f = File(it.path + "/${shortName}/build/${path}")
-              Log.v("FFI", "Looking for ${f.path.toString()}")
-              f
-            }.filter {
-              it.exists()
+            Log.v("FFI", "Looking for path ${path} under package path ${packagePath}")
+            val files = File(packagePath).walkBottomUp().filter {
+              it.path.endsWith(path)
             }.sortedBy {
               Log.v("FFI", it.path.toString())
               it.lastModified()
-            }
+            }.toList()
             Log.v("FFI", files.size.toString())
             if(files.size > 0)
                 return files.first().path;