Fix RequestHandlerGithub heuristics, so that Github Releases files work properly

.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>

.idea/packwiz-installer.iml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />

README.md

@@ -1,2 +1,2 @@
 # packwiz-installer
-An installer for launching packwiz modpacks with MultiMC.
+An installer for launching packwiz modpacks with MultiMC. You'll need [the bootstrapper](https://github.com/comp500/packwiz-installer-bootstrap/releases) to actually use this.

src/main/kotlin/link/infra/packwiz/installer/Main.kt

@@ -1,3 +1,5 @@
+@file:JvmName("Main")
+
 package link.infra.packwiz.installer
 
 import link.infra.packwiz.installer.metadata.SpaceSafeURI
@@ -84,6 +86,7 @@ class Main(args: Array<String>) {
 
 	companion object {
 		// Called by packwiz-installer-bootstrap to set up the help command
+		@JvmStatic
 		fun addNonBootstrapOptions(options: Options) {
 			options.addOption("s", "side", true, "Side to install mods from (client/server, defaults to client)")
 			options.addOption(null, "title", true, "Title of the installer window")
@@ -92,6 +95,7 @@ class Main(args: Array<String>) {
 		}
 
 		// TODO: link these somehow so they're only defined once?
+		@JvmStatic
 		private fun addBootstrapOptions(options: Options) {
 			options.addOption(null, "bootstrap-update-url", true, "Github API URL for checking for updates")
 			options.addOption(null, "bootstrap-update-token", true, "Github API Access Token, for private repositories")

src/main/kotlin/link/infra/packwiz/installer/UpdateManager.kt

@@ -126,7 +126,6 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse
 
 		ui.submitProgress(InstallProgress("Loading pack file..."))
 		val packFileSource = try {
-			Objects.requireNonNull(opts.downloadURI)
 			val src = getFileSource(opts.downloadURI!!)
 			getHasher("sha256").getHashingSource(src)
 		} catch (e: Exception) {
@@ -191,12 +190,16 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse
 			handleCancellation()
 		}
 		try {
-			// This is badly written, I'll probably heavily refactor it at some point
-			// The port to Kotlin made this REALLY messy!!!!
-			getNewLoc(opts.downloadURI, Objects.requireNonNull(pf.index)!!.file)?.let {
-				pf.index!!.hashFormat?.let { it1 ->
-					processIndex(it,
-							getHash(Objects.requireNonNull(pf.index!!.hashFormat)!!, Objects.requireNonNull(pf.index!!.hash)!!), it1, manifest, invalidatedUris)
+			val index = pf.index!!
+			getNewLoc(opts.downloadURI, index.file)?.let { newLoc ->
+				index.hashFormat?.let { hashFormat ->
+					processIndex(
+						newLoc,
+						getHash(index.hashFormat!!, index.hash!!),
+						hashFormat,
+						manifest,
+						invalidatedUris
+					)
 				}
 			}
 		} catch (e1: Exception) {

src/main/kotlin/link/infra/packwiz/installer/request/HandlerManager.kt

@@ -1,6 +1,7 @@
 package link.infra.packwiz.installer.request
 
 import link.infra.packwiz.installer.metadata.SpaceSafeURI
+import link.infra.packwiz.installer.request.handlers.RequestHandlerFile
 import link.infra.packwiz.installer.request.handlers.RequestHandlerGithub
 import link.infra.packwiz.installer.request.handlers.RequestHandlerHTTP
 import okio.Source
@@ -9,7 +10,8 @@ object HandlerManager {
 
 	private val handlers: List<IRequestHandler> = listOf(
 			RequestHandlerGithub(),
-			RequestHandlerHTTP()
+			RequestHandlerHTTP(),
+			RequestHandlerFile()
 	)
 
 	@JvmStatic

src/main/kotlin/link/infra/packwiz/installer/request/handlers/RequestHandlerFile.kt

@@ -0,0 +1,18 @@
+package link.infra.packwiz.installer.request.handlers
+
+import link.infra.packwiz.installer.metadata.SpaceSafeURI
+import link.infra.packwiz.installer.request.IRequestHandler
+import okio.Source
+import okio.source
+import java.nio.file.Paths
+
+open class RequestHandlerFile : IRequestHandler {
+	override fun matchesHandler(loc: SpaceSafeURI): Boolean {
+		return "file" == loc.scheme
+	}
+
+	override fun getFileSource(loc: SpaceSafeURI): Source? {
+		val path = Paths.get(loc.toURL().toURI())
+		return path.source()
+	}
+}

src/main/kotlin/link/infra/packwiz/installer/request/handlers/RequestHandlerGithub.kt

@@ -65,7 +65,7 @@ class RequestHandlerGithub : RequestHandlerZip(true) {
 		if (!("http" == scheme || "https" == scheme)) {
 			return false
 		}
-		return "github.com" == loc.host
-		// TODO: sanity checks, support for more github urls
+		// TODO: more match testing?
+		return "github.com" == loc.host && branchMatcherPattern.matcher(loc.path).matches()
 	}
 }