sorceress
/
MatterLink
mirror of https://github.com/AgathaSorceress/MatterLink.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/elytra/MatterLink

This commit is contained in:
DaMachinator 2018-02-17 11:41:20 -05:00
parent 4c19b26ce3 4545b7d38a
commit cdcc79fcaf
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -96,6 +96,7 @@ gradle-app.setting
### MatterLink ### ### MatterLink ###
classes/
run/ run/
*.tmp *.tmp
**/gen/ **/gen/

16
core/src/main/kotlin/matterlink/update/UpdateChecker.kt
View File

@ -22,16 +22,14 @@ class UpdateChecker : Runnable {
instance.info("Checking for new versions...") instance.info("Checking for new versions...")
val apiUpdateList: List<CurseFile>
val client: HttpClient = HttpClients.createDefault() val client: HttpClient = HttpClients.createDefault()
val response: HttpResponse = client.execute(HttpGet("https://cursemeta.nikky.moe/api/addon/287323/files")) val response: HttpResponse = client.execute(HttpGet("http://bit.ly/matterlinkfiles"))
apiUpdateList = if (200 == response.statusLine.statusCode) { //HTTP 200 OK val apiUpdateList = if (200 == response.statusLine.statusCode) { //HTTP 200 OK
val buffer: BufferedReader = response.entity.content.bufferedReader() val buffer: BufferedReader = response.entity.content.bufferedReader()
//put all of the buffer content onto the string //put all of the buffer content onto the string
val content = buffer.readText() val content = buffer.readText()
instance.debug("updateData: $content") instance.trace("updateData: $content")
gson.fromJson(content, Array<CurseFile>::class.java) gson.fromJson(content, Array<CurseFile>::class.java)
.filter { .filter {
@ -47,7 +45,6 @@ class UpdateChecker : Runnable {
val possibleUpdates = mutableListOf<CurseFile>() val possibleUpdates = mutableListOf<CurseFile>()
apiUpdateList.forEach { apiUpdateList.forEach {
instance.debug(it.toString()) instance.debug(it.toString())
//TODO: fix this if we ever release jars that support multiple versions
val version = it.fileName.substringAfter("-") val version = it.fileName.substringAfter("-")
if(version > currentModVersion) if(version > currentModVersion)
{ {
@ -58,8 +55,9 @@ class UpdateChecker : Runnable {
val latest= possibleUpdates[0] val latest= possibleUpdates[0]
possibleUpdates.sortByDescending { it.fileName.substringAfter(" ") } possibleUpdates.sortByDescending { it.fileName.substringAfter(" ") }
val version = if(possibleUpdates.count() == 1) "version" else "versions" val count = possibleUpdates.count()
instance.info("Matterlink out of date! You are {} $version behind", possibleUpdates.count()) val version = if(count == 1) "version" else "versions"
instance.info("Matterlink out of date! You are $count $version behind")
possibleUpdates.forEach { possibleUpdates.forEach {
instance.info("version: {} download: {}", it.fileName, it.downloadURL) instance.info("version: {} download: {}", it.fileName, it.downloadURL)
} }
@ -67,7 +65,7 @@ class UpdateChecker : Runnable {
instance.warn("Mod out of date! New $version available at ${latest.downloadURL}") instance.warn("Mod out of date! New $version available at ${latest.downloadURL}")
MessageHandler.transmit(ApiMessage( MessageHandler.transmit(ApiMessage(
username = cfg.relay.systemUser, username = cfg.relay.systemUser,
text = "Matterlink out of date! You are {} $version behind! Please download new version from ${latest.downloadURL}" text = "Matterlink out of date! You are $count $version behind! Please download new version from ${latest.downloadURL}"
)) ))
} }