Compare commits

...

2 Commits

Author SHA1 Message Date
comp500
91060dcd54 Put an error message there. Later is now! 2020-11-30 00:24:47 +00:00
comp500
e06ee21f3b Add User-Agent to download requests 2020-10-22 20:53:36 +01:00
2 changed files with 9 additions and 6 deletions

View File

@@ -255,8 +255,7 @@ class UpdateManager internal constructor(private val opts: Options, val ui: IUse
return return
} }
if (!indexFileSource.hashIsEqual(indexHash)) { if (!indexFileSource.hashIsEqual(indexHash)) {
// TODO: throw exception ui.handleExceptionAndExit(RuntimeException("Your index hash is invalid! Please run packwiz refresh on the pack again"))
println("I was meant to put an error message here but I'll do that later")
return return
} }
if (stateHandler.cancelButton) { if (stateHandler.cancelButton) {

View File

@@ -4,6 +4,7 @@ import link.infra.packwiz.installer.metadata.SpaceSafeURI
import link.infra.packwiz.installer.request.IRequestHandler import link.infra.packwiz.installer.request.IRequestHandler
import okio.Source import okio.Source
import okio.source import okio.source
import java.net.HttpURLConnection
open class RequestHandlerHTTP : IRequestHandler { open class RequestHandlerHTTP : IRequestHandler {
override fun matchesHandler(loc: SpaceSafeURI): Boolean { override fun matchesHandler(loc: SpaceSafeURI): Boolean {
@@ -12,14 +13,17 @@ open class RequestHandlerHTTP : IRequestHandler {
} }
override fun getFileSource(loc: SpaceSafeURI): Source? { override fun getFileSource(loc: SpaceSafeURI): Source? {
val conn = loc.toURL().openConnection() val conn = loc.toURL().openConnection() as HttpURLConnection
// TODO: when do we send specific headers??? should there be a way to signal this? // TODO: when do we send specific headers??? should there be a way to signal this?
// github *sometimes* requires it, sometimes not! conn.addRequestProperty("Accept", "application/octet-stream")
//conn.addRequestProperty("Accept", "application/octet-stream"); // TODO: include version?
conn.addRequestProperty("User-Agent", "packwiz-installer")
conn.apply { conn.apply {
// 30 second read timeout // 30 second read timeout
readTimeout = 30 * 1000 readTimeout = 30 * 1000
requestMethod = "GET"
} }
return conn.getInputStream().source() return conn.inputStream.source()
} }
} }