3.1.3

Fix case sensitive option getShipById
Improve ship finding when exact name is requested

Author: sylux6

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.1.3 (2020-18-02)
+
+### Bug fixes
+
+- Fix case sensitive option in `getShipById`
+
 ## 3.1.2 (2020-01-26)
 
 ### Bug fixes
@@ -70,4 +76,4 @@ Pre release
 
 - **getShipByName**: returns the closest ship which name matches the requested name
 - **getShipById**: returns ship with the given ID
-- **getAllShips**: returns a list of all available ships in database
+- **getAllShips**: returns a list of all available ships in database

build.gradle.kts

@@ -4,13 +4,13 @@ val spekVersion = "2.0.9"
 
 plugins {
     java
-    `maven-publish`
+    maven
     kotlin("jvm") version "1.3.61"
     id("org.jmailen.kotlinter") version "2.3.0"
 }
 
 group = "com.github.AzurApi"
-version = "2.0.1"
+version = "3.1.3"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

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

@@ -8,7 +8,6 @@ import com.github.azurapi.azurapikotlin.internal.exceptions.DatabaseException
 import com.github.azurapi.azurapikotlin.internal.exceptions.ShipNotFoundException
 import com.github.azurapi.azurapikotlin.internal.json.Takao
 import com.github.azurapi.azurapikotlin.internal.utils.info.AtagoInfo
-import java.util.stream.Collectors
 
 /**
  * API class
@@ -47,8 +46,8 @@ object Atago {
      * @param id id of the ship
      */
     fun getShipById(id: String, caseSensitive: Boolean = false): Ship {
-        val formattedId = if (caseSensitive) id.toLowerCase() else id
-        return (if (caseSensitive) database.shipsById.mapKeys { it.key.toLowerCase() } else
+        val formattedId = if (!caseSensitive) id.toLowerCase() else id
+        return (if (!caseSensitive) database.shipsById.mapKeys { it.key.toLowerCase() } else
             database.shipsById)[formattedId] ?: throw ShipNotFoundException("Could not find ship with id: $id")
     }
 
@@ -58,7 +57,7 @@ object Atago {
      * Get list of all ships
      */
     fun getAllShips(): List<Ship> {
-        return database.shipsById.values.stream().collect(Collectors.toList())
+        return database.shipsById.values.toList()
     }
 
     /**

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

@@ -92,23 +92,27 @@ internal class Takao {
      * @param search
      */
     fun findShip(search: String, lang: Lang): Ship? {
-        val cosine = Cosine()
-        var bestScore = 0.0
-        var result: Ship? = null
         val databaseLang = when (lang) {
             Lang.EN -> shipsByEnName
             Lang.CN -> shipsByCnName
             Lang.JP -> shipsByJpName
             Lang.KR -> shipsByKrName
             Lang.ANY -> shipsByEnName + shipsByCnName + shipsByJpName + shipsByKrName
         }
-        for ((name, ship) in databaseLang.entries) {
-            val score = cosine.similarity(search.toLowerCase(), name.toLowerCase())
-            if (score > bestScore) {
-                result = ship
-                bestScore = score
+        return if (databaseLang.containsKey(search)) {
+            databaseLang[search]
+        } else {
+            val cosine = Cosine()
+            var bestScore = 0.0
+            var result: Ship? = null
+            for ((name, ship) in databaseLang.entries) {
+                val score = cosine.similarity(search.toLowerCase(), name.toLowerCase())
+                if (score > bestScore) {
+                    result = ship
+                    bestScore = score
+                }
             }
+            result
         }
-        return result
     }
 }

src/main/kotlin/com/github/azurapi/azurapikotlin/internal/utils/info/AtagoInfo.kt

@@ -4,5 +4,5 @@ package com.github.azurapi.azurapikotlin.internal.utils.info
  * API info
  */
 object AtagoInfo {
-    const val VERSION = "2.0.1"
+    const val VERSION = "3.1.3"
 }