Fix #1 and upload to our maven

Author: shedaniel

.github/workflows/publish.yml

@@ -12,8 +12,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
-      - name: Upload to Bintray
-        run: ./gradlew bintrayUpload
+      - name: Upload to Maven
+        run: ./gradlew publish
         env:
-          BINTRAY_USER: shedaniel
-          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
+          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}

build.gradle

@@ -5,7 +5,6 @@ plugins {
     id("maven-publish")
     id("maven")
     id("signing")
-    id("com.jfrog.bintray") version("1.8.4")
 }
 
 group "me.shedaniel"
@@ -24,7 +23,6 @@ tasks.test {
 }
 
 repositories {
-    jcenter()
     mavenCentral()
     maven { 
         url "https://maven.fabricmc.net"
@@ -34,8 +32,7 @@ repositories {
         }
     }
     maven { url "https://jitpack.io" }
-    maven { url "https://dl.bintray.com/kotlin/kotlinx/" }
-    maven { url "https://dl.bintray.com/kotlin/kotlin-dev/" }
+    maven { url "https://dl.bintray.com/korlibs/korlibs/" }
 }
 
 dependencies {
@@ -80,24 +77,6 @@ task javadocsJar(type: Jar, dependsOn: javadocs) {
     from javadocs.destinationDir
 }
 
-bintray {
-    user = project.hasProperty("bintrayUser") ? project.property("bintrayUser") : System.getenv("BINTRAY_USER")
-    key = project.hasProperty("bintrayApiKey") ? project.property("bintrayApiKey") : System.getenv("BINTRAY_KEY")
-    publications = ["publication"]
-    publish = true
-    pkg {
-        repo = "linkie"
-        name = "linkie-core"
-        userOrg = "shedaniel"
-        licenses = ["GPL-3.0"]
-        version {
-            gpg {
-                sign = true
-            }
-        }
-    }
-}
-
 publishing {
     publications {
         publication(MavenPublication) {
@@ -108,5 +87,14 @@ publishing {
     }
 
     repositories {
+        if (System.getenv("MAVEN_PASS") != null) {
+            maven {
+                url = "https://deploy.shedaniel.me/"
+                credentials {
+                    username = "shedaniel"
+                    password = System.getenv("MAVEN_PASS")
+                }
+            }
+        }
     }
 }

settings.gradle

@@ -1,6 +1,5 @@
 pluginManagement {
     repositories {
-        jcenter()
         mavenCentral()
         maven { url "https://dl.bintray.com/kotlin/kotlin-dev/" }
         gradlePluginPortal()

src/main/kotlin/me/shedaniel/linkie/utils/LinkieUtils.kt

@@ -1,29 +1,57 @@
 package me.shedaniel.linkie.utils
 
 import com.soywiz.korio.file.VfsFile
-import me.shedaniel.linkie.MappingsContainer
-import me.shedaniel.linkie.getClassByObfName
-import me.shedaniel.linkie.optimumName
 import java.io.StringReader
 import kotlin.math.min
 
 fun <T> Iterable<T>.dropAndTake(drop: Int, take: Int): Sequence<T> =
     asSequence().drop(drop).take(take)
 
-fun <T, R> Iterable<T>.firstMapped(filterTransform: (entry: T) -> R?): R? {
+inline fun <T, R> Iterable<T>.firstMapped(filterTransform: (entry: T) -> R?): R? {
     for (entry in this) {
         return filterTransform(entry) ?: continue
     }
     return null
 }
 
-fun <T, R> Sequence<T>.firstMapped(filterTransform: (entry: T) -> R?): R? {
-    for (entry in this) {
-        return filterTransform(entry) ?: continue
+inline fun <T, R> Sequence<T>.firstMapped(filterTransform: (entry: T) -> R?): R? = asIterable().firstMapped(filterTransform)
+
+inline fun <T, R : Comparable<R>> Iterable<T>.maxOfIgnoreNull(filterTransform: (entry: T) -> R?): R? {
+    val iterator = iterator()
+    if (!iterator.hasNext()) return null
+    var maxValue = filterTransform(iterator.next())
+    while (iterator.hasNext()) {
+        val v = filterTransform(iterator.next())
+        maxValue = when {
+            maxValue == null -> v
+            v == null -> maxValue
+            else -> maxOf(maxValue, v)
+        }
     }
-    return null
+    return maxValue
+}
+
+inline fun <T, R : Comparable<R>> Sequence<T>.maxOfIgnoreNull(filterTransform: (entry: T) -> R?): R? = asIterable().maxOfIgnoreNull(filterTransform)
+
+inline fun <T, R : Comparable<R>> Iterable<T>.maxOfIgnoreNullSelf(filterTransform: (entry: T) -> R?): T? {
+    val iterator = iterator()
+    if (!iterator.hasNext()) return null
+    var max = iterator.next()
+    var maxValue = filterTransform(max)
+    while (iterator.hasNext()) {
+        val next = iterator.next()
+        val v = filterTransform(next)
+
+        if (v != null && (maxValue == null || v > maxValue)) {
+            maxValue = v
+            max = next
+        }
+    }
+    return if (maxValue == null) null else max
 }
 
+inline fun <T, R : Comparable<R>> Sequence<T>.maxOfIgnoreNullSelf(filterTransform: (entry: T) -> R?): R? = asIterable().maxOfIgnoreNull(filterTransform)
+
 private fun editDistance(s11: String, s22: String): Int {
     val costs = IntArray(s22.length + 1)
     for (i in 0..s11.length) {
@@ -71,12 +99,22 @@ fun String.onlyClassOrNull(c: Char = '/'): String? {
     return if (indexOf < 0) null else substring(indexOf + 1)
 }
 
-fun String?.doesContainsOrMatchWildcard(searchTerm: String): Boolean {
-    if (this == null) return false
-    return if (searchTerm.onlyClassOrNull() != null) {
-        contains(searchTerm, true)
+fun String?.matchWithSimilarity(searchTerm: String): Double? {
+    if (this == null) return null
+    val searchOnlyClass = searchTerm.onlyClassOrNull()
+    return if (searchOnlyClass != null) {
+        if (contains(searchTerm, true)) {
+            this.similarity(searchTerm)
+        } else {
+            null
+        }
     } else {
-        onlyClass().contains(searchTerm, true)
+        val onlyClass = onlyClass()
+        if (onlyClass.contains(searchTerm, true)) {
+            this.similarity(searchTerm)
+        } else {
+            null
+        }
     }
 }
 

src/main/kotlin/me/shedaniel/linkie/utils/MappingsQuery.kt

@@ -67,7 +67,7 @@ object MappingsQuery {
     }
 
     fun MappingsEntry.searchDefinition(classKey: String): QueryDefinition? {
-        return QueryDefinition.allProper.firstOrNull { it(this).doesContainsOrMatchWildcard(classKey) }
+        return QueryDefinition.allProper.maxOfIgnoreNullSelf { it(this).matchWithSimilarity(classKey) }
     }
 
     fun MappingsEntry.searchWithDefinition(classKey: String): MatchResultWithDefinition? {
@@ -78,6 +78,10 @@ object MappingsQuery {
         return QueryDefinition.allProper.firstMapped { it(this).containsOrMatchWildcardOrNull(classKey) }
     }
 
+    fun MappingsEntry.searchWithSimilarity(classKey: String): Double? {
+        return QueryDefinition.allProper.maxOfIgnoreNull { it(this).matchWithSimilarity(classKey) }
+    }
+
     suspend fun queryClasses(context: QueryContext): QueryResult<MappingsContainer, ClassResultSequence> {
         val searchKey = context.searchKey
         val isSearchKeyWildcard = searchKey == "*"
@@ -90,7 +94,7 @@ object MappingsQuery {
         } else {
             mappings.classes.values.asSequence()
                 .map { c ->
-                    c.search(searchKey)?.let { c hold it.selfTerm.similarity(it.matchStr) }
+                    c.searchWithSimilarity(searchKey)?.let { c hold it }
                 }
                 .filterNotNull()
         }.sortedWith(compareByDescending<ResultHolder<Class>> { it.score }