cleanup

Author: syntaxerror247

app/src/main/java/org/godotengine/godot_gradle_build_environment/BuildEnvironment.kt

@@ -165,6 +165,50 @@ class BuildEnvironment(
         return exitCode
     }
 
+    private fun setupProject(projectPath: String, outputHandler: (Int, String) -> Unit): File {
+        val projectTreeUri: Uri
+        val hash = Integer.toHexString(projectPath.hashCode())
+        val workDir = File(projectRoot, hash)
+        if (workDir.exists()) {
+            val info = ProjectInfo.readFromDirectory(workDir)
+            if (info != null) {
+                projectTreeUri = info.projectTreeUri.toUri()
+            } else {
+                throw Exception("Could not get projectTreeUri.")
+            }
+        } else {
+            outputHandler(OUTPUT_STDERR, "Project path \"$projectPath\" is not accessible. Please give GABE app access to this directory.")
+            Utils.showDirectoryAccessNotification(context, projectPath)
+            // 2 minute wait should be ideal?
+			val uri = waitForDirectoryAccess(2 * 60 * 1000)
+				?: throw Exception("Directory access not granted in time. Build canceled.")
+			projectTreeUri = uri
+            outputHandler(OUTPUT_STDOUT, "Access granted for $projectPath. Starting Gradle build...")
+        }
+
+        outputHandler(OUTPUT_INFO, "> Importing project files...")
+        FileUtils.importAndroidProject(context, projectTreeUri, workDir)
+        return workDir
+    }
+
+    private fun fixGradleArgs(projectPath: String, rawGradleArgs: List<String>): List<String> {
+        return rawGradleArgs.map { arg ->
+            when {
+                arg.startsWith("-Pdebug_keystore_file=") -> "-Pdebug_keystore_file=/project/.android/debug.keystore"
+                arg.startsWith("-Prelease_keystore_file=") -> "-Prelease_keystore_file=/project/.android/release.keystore"
+                arg.startsWith("-Paddons_directory=") -> "-Paddons_directory=/project/addons"
+
+                arg.startsWith("-Pplugins_local_binaries=") -> {
+                    val prefix = "-Pplugins_local_binaries="
+                    val value = arg.removePrefix(prefix)
+                    val updated = value.replace("$projectPath/addons", "/project/addons")
+                    prefix + updated
+                }
+                else -> arg
+            }
+        }
+    }
+
     fun cleanProject(projectPath: String) {
         val normalizeProjectPath = projectPath.trimEnd('/')
         val hash = Integer.toHexString(normalizeProjectPath.hashCode())
@@ -338,33 +382,9 @@ class BuildEnvironment(
             return 255
         }
 
-        val projectTreeUri: Uri
         val projectPath = rawProjectPath.trimEnd('/')
-        val hash = Integer.toHexString(projectPath.hashCode())
-        val workDir = File(projectRoot, hash)
-        if (workDir.exists()) {
-            val info = ProjectInfo.readFromDirectory(workDir)
-            if (info != null) {
-                projectTreeUri = info.projectTreeUri.toUri()
-            } else {
-                outputHandler(OUTPUT_STDERR, "Unable to setup project: could not get projectTreeUri.")
-                return 255
-            }
-        } else {
-            outputHandler(OUTPUT_STDERR, "Unable to setup project: $projectPath is not accessible. Please give GABE app access to this directory.")
-            Utils.showDirectoryAccessNotification(context, projectPath)
-            val uri = waitForDirectoryAccess(2 * 60 * 1000) // 2 minutes should be ideal?
-            if (uri == null) {
-                outputHandler(OUTPUT_STDERR, "Directory access not granted in time. Build canceled.")
-                return 255
-            }
-            projectTreeUri = uri
-            outputHandler(OUTPUT_STDOUT, "Access granted for $projectPath. Starting Gradle build...")
-        }
-
-        try {
-            outputHandler(OUTPUT_INFO, "> Importing project files...")
-            FileUtils.importAndroidProject(context, projectTreeUri, workDir)
+        val workDir = try {
+            setupProject(projectPath, outputHandler)
         } catch (e: Exception) {
             outputHandler(OUTPUT_STDERR, "Unable to setup project: ${e.message}")
             return 255
@@ -380,25 +400,7 @@ class BuildEnvironment(
             outputHandler(type, line)
         }
 
-        val gradleArgs = rawGradleArgs.map { arg ->
-            when {
-                arg.startsWith("-Pdebug_keystore_file=") -> "-Pdebug_keystore_file=/project/.android/debug.keystore"
-                arg.startsWith("-Prelease_keystore_file=") -> "-Prelease_keystore_file=/project/.android/release.keystore"
-                arg.startsWith("-Paddons_directory=") -> "-Paddons_directory=/project/addons"
-
-                arg.startsWith("-Pplugins_local_binaries=") -> {
-                    val prefix = "-Pplugins_local_binaries="
-                    val value = arg.removePrefix(prefix)
-                    val normalizeProjectPath = projectPath.trimEnd('/')
-                    val updated = value.replace(
-                        "$normalizeProjectPath/addons",
-                        "/project/addons"
-                    )
-                    prefix + updated
-                }
-                else -> arg
-            }
-        }
+        val gradleArgs = fixGradleArgs(projectPath, rawGradleArgs)
 
         var result = executeGradleInternal(gradleArgs, workDir, captureOutputHandler)