overhaul (#68)

* overhaul

* review fixes

Author: Frotty

.gitignore

@@ -22,3 +22,5 @@ testproject/
 ptrtestproject/
 temp/
 invalidbuild/
+/gen_test_ci
+/gen_test_jass

build.gradle

@@ -44,7 +44,6 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
-    implementation 'com.github.frotty:SwingDarkFlatTable:1d9ae26e69'
     implementation 'com.github.Frotty:SimpleRegistry:f96dda96bd'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17'
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.32'
@@ -53,6 +52,7 @@ dependencies {
 
 test {
     useTestNG()
+    jvmArgs '-Djava.awt.headless=true'
 }
 
 jacocoTestReport {

src/main/kotlin/config/DAOs.kt

@@ -6,6 +6,9 @@ import kotlin.collections.ArrayList
 
 const val CONFIG_FILE_NAME = "wurst.build"
 
+enum class ScriptMode { LUA, JASS }
+enum class Wc3Patch { REFORGED, PRE_129 }
+
 /**
  * The root DAO that contains the child DAOs.
  * Represents a complete wurst.build file.
@@ -14,7 +17,9 @@ const val CONFIG_FILE_NAME = "wurst.build"
 data class WurstProjectConfigData(
     var projectName: String = "unnamed",
     val dependencies: ArrayList<String> = ArrayList(),
-    val buildMapData: WurstProjectBuildMapData = WurstProjectBuildMapData()
+    val buildMapData: WurstProjectBuildMapData = WurstProjectBuildMapData(),
+    val scriptMode: ScriptMode? = null,
+    val wc3Patch: Wc3Patch? = null
 ) {
     constructor() : this("unnamed")
 }

src/main/kotlin/config/WurstProjectConfig.kt

@@ -12,13 +12,11 @@ import file.*
 import global.InstallationManager
 import global.Log
 import logging.KotlinLogging
-import ui.UiManager
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardOpenOption
-import javax.swing.JOptionPane
 /**
  * Created by Frotty on 10.07.2017.
  */
@@ -32,11 +30,9 @@ object WurstProjectConfig {
     fun handleCreate(projectRoot: Path, gameRoot: Path?, projectConfig: WurstProjectConfigData) {
         try {
             createProject(projectRoot, gameRoot, projectConfig)
-            UiManager.refreshComponents()
         } catch (e: Exception) {
             Log.print("\n===ERROR PROJECT CREATE===\n" + e.message + "\nPlease report here: github.com/wurstscript/WurstScript/issues\n")
         }
-
     }
 
     @Throws(IOException::class)
@@ -82,17 +78,15 @@ object WurstProjectConfig {
 		if (extractSuccess) {
 			Log.print("done\n")
 			cleanupDownload(projectRoot)
+            normalizeGeneratedTemplate(projectRoot)
 		} else {
 			Log.print("error\n")
-			JOptionPane.showMessageDialog(null,
-				"Error: Cannot extract patch files.\nWurst might still be in use.\nClose any Wurst, VSCode or Eclipse instances before updating.",
-				"Error Massage", JOptionPane.ERROR_MESSAGE)
+			log.error("❌ Cannot extract template files. Close any Wurst, VSCode or Eclipse instances and try again.")
 		}
 
 		setupEnvironment(projectRoot, gameRoot, projectConfig)
 
         log.info("✔ Project generated.")
-		UiManager.refreshComponents()
 	}
 
 	private fun cleanupDownload(projectRoot: Path) {
@@ -107,6 +101,18 @@ object WurstProjectConfig {
 		}
 	}
 
+    private fun normalizeGeneratedTemplate(projectRoot: Path) {
+        val runArgs = projectRoot.resolve("wurst_run.args")
+        if (Files.exists(runArgs)) {
+            val normalizedArgs = Files.readString(runArgs)
+                .lineSequence()
+                .filterNot { it.trim().equals("lua", ignoreCase = true) || it.trim().equals("-lua", ignoreCase = true) }
+                .joinToString(System.lineSeparator())
+                .trimEnd() + System.lineSeparator()
+            Files.writeString(runArgs, normalizedArgs)
+        }
+    }
+
 	private fun setupEnvironment(projectRoot: Path, gameRoot: Path?, projectConfig: WurstProjectConfigData) {
 		Log.print("done\n")
 
@@ -198,12 +204,10 @@ object WurstProjectConfig {
             DependencyManager.updateDependencies(projectRoot, config)
 
             Log.print("Project successfully updated!\nReload vscode to apply the changed dependencies.\n")
-            UiManager.refreshComponents()
         } catch (e: Exception) {
             e.printStackTrace()
             Log.print("\n===ERROR PROJECT UPDATE===\n" + e.message + "\nPlease report here: github.com/wurstscript/WurstScript/issues\n")
         }
-
     }
 
     private const val VSCODE_MIN_CONFIG =

src/main/kotlin/file/CLICommand.kt

@@ -1,5 +1,8 @@
 package file
 
+import config.ScriptMode
+import config.Wc3Patch
+
 enum class CLICommand {
     HELP,
 	INSTALL,
@@ -32,6 +35,42 @@ enum class GlobalOptions(val optionName: String = "", val argCount: Int = 0) {
         override fun runOption(setupMain: SetupMain, args: List<String>) {
             setupMain.measure = true
         }
+    },
+    WITH_AGENTS("--with-agents") {
+        override fun runOption(setupMain: SetupMain, args: List<String>) {
+            setupMain.addAgents = true
+        }
+    },
+    NO_AGENTS("--no-agents") {
+        override fun runOption(setupMain: SetupMain, args: List<String>) {
+            setupMain.addAgents = false
+        }
+    },
+    WITH_CI("--with-ci") {
+        override fun runOption(setupMain: SetupMain, args: List<String>) {
+            setupMain.addGithubWorkflow = true
+        }
+    },
+    NO_CI("--no-ci") {
+        override fun runOption(setupMain: SetupMain, args: List<String>) {
+            setupMain.addGithubWorkflow = false
+        }
+    },
+    SCRIPT_MODE("--script-mode", 1) {
+        override fun runOption(setupMain: SetupMain, args: List<String>) {
+            setupMain.scriptMode = when (args[0].lowercase()) {
+                "jass" -> ScriptMode.JASS
+                else -> ScriptMode.LUA
+            }
+        }
+    },
+    WC3_PATCH("--wc3-patch", 1) {
+        override fun runOption(setupMain: SetupMain, args: List<String>) {
+            setupMain.wc3Patch = when (args[0].lowercase()) {
+                "pre1.29" -> Wc3Patch.PRE_129
+                else -> Wc3Patch.REFORGED
+            }
+        }
     };
 
 	abstract fun runOption(setupMain: SetupMain, args: List<String>)

src/main/kotlin/file/Download.kt

@@ -1,11 +1,7 @@
 package file
 
 import global.Log
-
-
 import logging.KotlinLogging
-import ui.MainWindow
-import workers.DownloadWithProgressWorker
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.FileOutputStream
@@ -14,64 +10,56 @@ import java.net.HttpURLConnection
 import java.net.URL
 import java.nio.file.Files
 import java.nio.file.Path
+
 object Download {
     private val log = KotlinLogging.logger {}
 
 	private const val compilerReleaseBaseUrl = "https://github.com/wurstscript/WurstScript/releases/download/nightly/"
 	private const val bareboneUrl = "github.com/wurstscript/wurst-project-template/archive/master.zip"
 
-    @Throws(IOException::class)
-    private fun downloadFile(filePath: String, callback: (Path) -> Unit) {
-        if (SetupApp.setup.isGUILaunch) {
-			DownloadWithProgressWorker(filePath, MainWindow.ui.progressBar, callback).execute()
-		} else {
-			downloadDirect(filePath, callback)
-        }
-    }
-
-	fun getHttpURLConnection(filePath: String): HttpURLConnection {
-		val url = URL(filePath)
-		val httpConnection = url.openConnection() as HttpURLConnection
-		httpConnection.connectTimeout = 14000
-		httpConnection.readTimeout = 20000
-		httpConnection.addRequestProperty("User-Agent", "Chrome")
-		return httpConnection
-	}
-
     @Throws(IOException::class)
     fun downloadSetup(callback: (Path) -> Unit) {
         throw UnsupportedOperationException("Standalone grill updates are not currently published via GitHub releases.")
     }
 
     @Throws(IOException::class)
     fun downloadCompiler(callback: (Path) -> Unit) {
-        downloadFile(compilerReleaseBaseUrl + getCompilerArchiveName(), callback)
+        downloadDirect(compilerReleaseBaseUrl + getCompilerArchiveName(), callback)
     }
 
     @Throws(IOException::class)
     fun downloadBareboneProject(callback: (Path) -> Unit) {
         try {
-            downloadFile("https://$bareboneUrl", callback)
+            downloadDirect("https://$bareboneUrl", callback)
         } catch (e: Exception) {
-            log.warn( "downloadBareboneProject Exception caught", e)
+            log.warn("downloadBareboneProject Exception caught", e)
             Log.println("Https error, falling back to unsafe http.")
-            downloadFile("http://$bareboneUrl", callback)
+            downloadDirect("http://$bareboneUrl", callback)
         }
     }
 
+	fun getHttpURLConnection(filePath: String): HttpURLConnection {
+		val url = URL(filePath)
+		val httpConnection = url.openConnection() as HttpURLConnection
+		httpConnection.connectTimeout = 14000
+		httpConnection.readTimeout = 20000
+		httpConnection.addRequestProperty("User-Agent", "Chrome")
+		return httpConnection
+	}
+
 	private fun downloadDirect(filePath: String, callback: (Path) -> Unit) {
-			val httpConnection = getHttpURLConnection(filePath)
-			val completeFileSize = httpConnection.contentLength
-			val size = completeFileSize / 1024 / 1024
-			log.info("\t\uD83D\uDCE5 (" + (if (size == 0) "<1" else size) + "MB)")
-			val input = java.io.BufferedInputStream(httpConnection.inputStream)
-			val downloadedFile = createDownloadTempFile(filePath)
+		val httpConnection = getHttpURLConnection(filePath)
+		val completeFileSize = httpConnection.contentLength
+		val size = completeFileSize / 1024 / 1024
+		log.info("\t📥 (" + (if (size == 0) "<1" else size) + "MB)")
+		val input = BufferedInputStream(httpConnection.inputStream)
+		val downloadedFile = createDownloadTempFile(filePath)
 
-			readStream(downloadedFile, input)
+		readStream(downloadedFile, input)
 
-			input.close()
-	        callback.invoke(downloadedFile)
-	    }
+		input.close()
+        callback.invoke(downloadedFile)
+    }
 
 		private fun readStream(destination: Path, input: BufferedInputStream) {
 			FileOutputStream(destination.toFile()).use { fos ->