add kotlinter

server/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 //    id("org.jetbrains.kotlin.jvm") version "1.4.21"
     application
     id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("org.jmailen.kotlinter") version "3.3.0"
 }
 
 val TachideskVersion = "v0.0.2"
@@ -139,9 +140,16 @@ tasks {
 
 tasks.withType<ShadowJar> {
     destinationDir = File("$rootDir/server/build")
+    dependsOn("lintKotlin")
 }
 
 tasks.named("processResources") {
     dependsOn(":webUI:copyBuild")
 }
 
+tasks.named("run") {
+    dependsOn("formatKotlin", "lintKotlin")
+}
+
+
+

server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt

@@ -11,10 +11,13 @@ import com.google.gson.Gson
 // import eu.kanade.tachiyomi.data.track.TrackManager
 // import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceManager
 import rx.Observable
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.api.*
+import uy.kohesive.injekt.api.InjektModule
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addSingleton
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
 
 class AppModule(val app: Application) : InjektModule {
 
@@ -56,11 +59,9 @@ class AppModule(val app: Application) : InjektModule {
         }
 
 //        rxAsync { get<DatabaseHelper>() }
-
     }
 
     private fun rxAsync(block: () -> Unit) {
         Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe()
     }
-
 }

server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -5,14 +5,8 @@ package eu.kanade.tachiyomi.extension.util
 // import android.content.pm.PackageInfo
 // import android.content.pm.PackageManager
 // import dalvik.system.PathClassLoader
-import eu.kanade.tachiyomi.annoations.Nsfw
 // import eu.kanade.tachiyomi.data.preference.PreferenceValues
 // import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.extension.model.Extension
-import eu.kanade.tachiyomi.extension.model.LoadResult
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.SourceFactory
 // import eu.kanade.tachiyomi.util.lang.Hash
 // import kotlinx.coroutines.async
 // import kotlinx.coroutines.runBlocking

server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt

@@ -9,22 +9,15 @@ package eu.kanade.tachiyomi.network
 // import android.webkit.WebView
 // import android.widget.Toast
 // import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.online.HttpSource
 // import eu.kanade.tachiyomi.util.lang.launchUI
 // import eu.kanade.tachiyomi.util.system.WebViewClientCompat
 // import eu.kanade.tachiyomi.util.system.WebViewUtil
 // import eu.kanade.tachiyomi.util.system.isOutdated
 // import eu.kanade.tachiyomi.util.system.setDefaultSettings
 // import eu.kanade.tachiyomi.util.system.toast
-import okhttp3.Cookie
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.Interceptor
-import okhttp3.Request
 import okhttp3.Response
 // import uy.kohesive.injekt.injectLazy
-import java.io.IOException
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 
 class CloudflareInterceptor() : Interceptor {
 

server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -4,14 +4,11 @@ package eu.kanade.tachiyomi.network
 // import eu.kanade.tachiyomi.BuildConfig
 // import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import android.content.Context
-import okhttp3.Cache
 // import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 // import okhttp3.dnsoverhttps.DnsOverHttps
 // import okhttp3.logging.HttpLoggingInterceptor
 // import uy.kohesive.injekt.injectLazy
-import java.io.File
-import java.net.InetAddress
 import java.util.concurrent.TimeUnit
 
 class NetworkHelper(context: Context) {

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -2,17 +2,13 @@ package eu.kanade.tachiyomi.network
 
 // import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
 import rx.Producer
 import rx.Subscription
-import java.io.IOException
 import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 fun Call.asObservable(): Observable<Response> {
     return Observable.unsafeCreate { subscriber ->

server/src/main/kotlin/ir/armor/tachidesk/Main.kt

@@ -2,7 +2,17 @@ package ir.armor.tachidesk
 
 import eu.kanade.tachiyomi.App
 import io.javalin.Javalin
-import ir.armor.tachidesk.util.*
+import ir.armor.tachidesk.util.applicationSetup
+import ir.armor.tachidesk.util.getChapterList
+import ir.armor.tachidesk.util.getExtensionList
+import ir.armor.tachidesk.util.getManga
+import ir.armor.tachidesk.util.getMangaList
+import ir.armor.tachidesk.util.getPages
+import ir.armor.tachidesk.util.getSourceList
+import ir.armor.tachidesk.util.installAPK
+import ir.armor.tachidesk.util.sourceFilters
+import ir.armor.tachidesk.util.sourceGlobalSearch
+import ir.armor.tachidesk.util.sourceSearch
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import xyz.nulldev.androidcompat.AndroidCompat
@@ -35,7 +45,6 @@ class Main {
             // start app
             androidCompat.startApp(App())
 
-
             val app = Javalin.create { config ->
                 try {
                     this::class.java.classLoader.getResource("/react/index.html")
@@ -46,8 +55,6 @@ class Main {
                 }
             }.start(4567)
 
-
-
             app.before() { ctx ->
                 // allow the client which is running on another port
                 ctx.header("Access-Control-Allow-Origin", "*")
@@ -57,7 +64,6 @@ class Main {
                 ctx.json(getExtensionList())
             }
 
-
             app.get("/api/v1/extension/install/:apkName") { ctx ->
                 val apkName = ctx.pathParam("apkName")
                 println(apkName)
@@ -114,11 +120,6 @@ class Main {
                 val sourceId = ctx.pathParam("sourceId").toLong()
                 ctx.json(sourceFilters(sourceId))
             }
-
-
-
-
         }
     }
 }
-

server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt

@@ -1,7 +1,8 @@
 package ir.armor.tachidesk.database.entity
 
 import ir.armor.tachidesk.database.table.SourceTable
-import org.jetbrains.exposed.dao.*
+import org.jetbrains.exposed.dao.EntityClass
+import org.jetbrains.exposed.dao.LongEntity
 import org.jetbrains.exposed.dao.id.EntityID
 
 class SourceEntity(id: EntityID<Long>) : LongEntity(id) {

server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt

@@ -1,6 +1,5 @@
 package ir.armor.tachidesk.database.table
 
-import eu.kanade.tachiyomi.source.model.SManga
 import org.jetbrains.exposed.dao.id.IntIdTable
 
 object ChapterTable : IntIdTable() {

server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt

@@ -2,7 +2,6 @@ package ir.armor.tachidesk.database.table
 
 import org.jetbrains.exposed.dao.id.IntIdTable
 
-
 object ExtensionsTable : IntIdTable() {
     val name = varchar("name", 128)
     val pkgName = varchar("pkg_name", 128)

server/src/main/kotlin/ir/armor/tachidesk/util/APK.kt

@@ -41,7 +41,6 @@ fun installAPK(apkName: String): Int {
             // download apk file
             downloadAPKFile(apkToDownload, apkFilePath)
 
-
             val className: String = APKExtractor.extract_dex_and_read_className(apkFilePath, dexFilePath)
             println(className)
             // dex -> jar
@@ -80,7 +79,6 @@ fun installAPK(apkName: String): Int {
 //                            println(httpSource.name)
 //                            println()
                 }
-
             } else { // multi source
                 val sourceFactory = instance as SourceFactory
                 transaction {
@@ -110,7 +108,6 @@ fun installAPK(apkName: String): Int {
                     it[classFQName] = className
                 }
             }
-
         }
         return 201 // we downloaded successfully
     } else {

server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt

@@ -6,14 +6,12 @@ import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import ir.armor.tachidesk.database.dataclass.ChapterDataClass
 import ir.armor.tachidesk.database.dataclass.PageDataClass
-import ir.armor.tachidesk.database.entity.MangaEntity
 import ir.armor.tachidesk.database.table.ChapterTable
 import ir.armor.tachidesk.database.table.MangaTable
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 
-
 fun getChapterList(mangaId: Int): List<ChapterDataClass> {
     val mangaDetails = getManga(mangaId)
     val source = getHttpSource(mangaDetails.sourceId)
@@ -41,7 +39,6 @@ fun getChapterList(mangaId: Int): List<ChapterDataClass> {
             }
         }
 
-
         return@transaction chapterList.map {
             ChapterDataClass(
                 ChapterTable.select { ChapterTable.url eq it.url }.firstOrNull()!![ChapterTable.id].value,
@@ -77,7 +74,6 @@ fun getPages(chapterId: Int, mangaId: Int): List<PageDataClass> {
             )
         }
     }
-
 }
 
 fun getTrueImageUrl(page: Page, source: HttpSource): String {

server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt

@@ -79,6 +79,5 @@ fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
                 it[ExtensionsTable.classFQName]
             )
         }
-
     }
 }

server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt

@@ -59,7 +59,6 @@ fun getManga(mangaId: Int): MangaDataClass {
                 mangaId,
                 mangaEntry[MangaTable.sourceReference].value,
 
-
                 mangaEntry[MangaTable.url],
                 mangaEntry[MangaTable.title],
                 mangaEntry[MangaTable.thumbnail_url],
@@ -75,4 +74,3 @@ fun getManga(mangaId: Int): MangaDataClass {
         }
     }
 }
-

server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt

@@ -3,8 +3,6 @@ package ir.armor.tachidesk.util
 import ir.armor.tachidesk.database.dataclass.MangaDataClass
 import ir.armor.tachidesk.database.table.MangaStatus
 import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.SourceTable
-import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction

server/src/main/kotlin/ir/armor/tachidesk/util/Search.kt

@@ -1,8 +1,5 @@
 package ir.armor.tachidesk.util
 
-import eu.kanade.tachiyomi.source.model.Filter
-import eu.kanade.tachiyomi.source.model.FilterList
-
 fun sourceFilters(sourceId: Long) {
     val source = getHttpSource(sourceId)
     // source.getFilterList().toItems()
@@ -14,7 +11,6 @@ fun sourceSearch(sourceId: Long, searchTerm: String) {
 }
 
 fun sourceGlobalSearch(searchTerm: String) {
-
 }
 
 data class FilterWrapper(

server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt

@@ -13,7 +13,7 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.net.URL
 import java.net.URLClassLoader
-import java.util.*
+import java.util.Locale
 
 private val sourceCache = mutableListOf<Pair<Long, HttpSource>>()
 private val extensionCache = mutableListOf<Pair<String, Any>>()

server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt

@@ -9,6 +9,5 @@ fun applicationSetup() {
     File(Config.dataRoot).mkdirs()
     File(Config.extensionsRoot).mkdirs()
 
-
     makeDataBaseTables()
 }