Change Version class attributes

Author: piggylux

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.github.AzurApi"
-version = "1.0.0"
+version = "2.0.0"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

src/main/kotlin/com/github/azurapi/azurapikotlin/api/Atago.kt

@@ -67,7 +67,7 @@ object Atago {
      * Get version of the api wrapper
      */
     fun getVersion(): Version {
-        return Version(AtagoInfo.VERSION, database.lastUpdated, database.databaseVersion, database.lastUpdatedDatabase)
+        return Version(AtagoInfo.VERSION, database.lastCheckDate, database.databaseVersion, database.lastUpdatedDatabaseDate)
     }
 
     /**

src/main/kotlin/com/github/azurapi/azurapikotlin/api/AtagoInfo.kt

@@ -4,5 +4,5 @@ package com.github.azurapi.azurapikotlin.api
  * API info
  */
 object AtagoInfo {
-    const val VERSION = "1.0.0"
+    const val VERSION = "2.0.0"
 }

src/main/kotlin/com/github/azurapi/azurapikotlin/internal/entities/Version.kt

@@ -12,6 +12,6 @@ import java.util.*
 data class Version (
     val apiVersion: String,
     val lastUpdatedApi: Date,
-    val databaseVersion: String,
+    val databaseVersion: Int,
     val lastUpdatedDatabase: Date
 )

src/main/kotlin/com/github/azurapi/azurapikotlin/json/Takao.kt

@@ -20,9 +20,9 @@ class Takao {
     private lateinit var jsonDatabase: JSONObject
     private lateinit var jsonVersion: JSONObject
 
-    lateinit var lastUpdated: Date
-    lateinit var lastUpdatedDatabase: Date
-    lateinit var databaseVersion: String
+    lateinit var lastCheckDate: Date
+    lateinit var lastUpdatedDatabaseDate: Date
+    var databaseVersion = 0
 
     var shipsById = HashMap<String, Ship>()
     var shipsByName = HashMap<String, Ship>()
@@ -42,23 +42,42 @@ class Takao {
         }
     }
 
+    /**
+     * Load remote json and update local database
+     */
     fun loadDatabase() {
-        lastUpdated = Date()
+        lastCheckDate = Date()
+        val version = getRemoteDatabaseVersion()
+        // Database is already up to date
+        if (databaseVersion >= version.first) {
+            return
+        }
+        databaseVersion = version.first
+        lastUpdatedDatabaseDate = version.second
         try {
             jsonDatabase = loadJSON(TakaoInfo.JSON_SOURCE)
-            jsonVersion = loadJSON(TakaoInfo.JSON_VERSION)
             for (shipId in jsonDatabase.keySet()) {
                 val ship = ShipParser.jsonToShip(jsonDatabase.getJSONObject(shipId), shipId)
                 shipsById[ship.id.toLowerCase()] = ship
                 shipsByName[ship.names.en.toLowerCase()] = ship
             }
-            databaseVersion = jsonVersion.getInt("version-number").toString()
-            lastUpdatedDatabase = Date(jsonVersion.getLong("last-data-refresh-date"))
         } catch (e: Exception) {
             throw DatabaseException("Could not reload database: (${e.message})")
         }
     }
 
+    /**
+     * Get version of the remote json
+     */
+    private fun getRemoteDatabaseVersion(): Pair<Int, Date> {
+        try {
+            jsonVersion = loadJSON(TakaoInfo.JSON_VERSION)
+            return Pair(jsonVersion.getInt("version-number"), Date(jsonVersion.getLong("last-data-refresh-date")))
+        } catch (e: Exception) {
+            throw DatabaseException("Could not retrieve database version: (${e.message})")
+        }
+    }
+
     /**
      * Find the closest ship matching `search` terms
      * @param search