Move things back into the EH package, no need for them to be in the regular app

app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt

@@ -21,6 +21,15 @@ import eu.kanade.tachiyomi.data.database.queries.HistoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaCategoryQueries
 import eu.kanade.tachiyomi.data.database.queries.MangaQueries
 import eu.kanade.tachiyomi.data.database.queries.TrackQueries
+import exh.metadata.sql.mappers.SearchMetadataTypeMapping
+import exh.metadata.sql.mappers.SearchTagTypeMapping
+import exh.metadata.sql.mappers.SearchTitleTypeMapping
+import exh.metadata.sql.models.SearchMetadata
+import exh.metadata.sql.models.SearchTag
+import exh.metadata.sql.models.SearchTitle
+import exh.metadata.sql.queries.SearchMetadataQueries
+import exh.metadata.sql.queries.SearchTagQueries
+import exh.metadata.sql.queries.SearchTitleQueries
 import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory
 
 /**

app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt

@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.database.tables.HistoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 import eu.kanade.tachiyomi.data.database.tables.MergedTable
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
 import eu.kanade.tachiyomi.data.database.tables.TrackTable
 import exh.metadata.sql.tables.SearchMetadataTable
 import exh.metadata.sql.tables.SearchTagTable

app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt

@@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.data.database.tables.CategoryTable
 import eu.kanade.tachiyomi.data.database.tables.ChapterTable
 import eu.kanade.tachiyomi.data.database.tables.MangaCategoryTable
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
+import exh.metadata.sql.tables.SearchMetadataTable
 
 interface MangaQueries : DbProvider {
 

app/src/main/java/eu/kanade/tachiyomi/smartsearch/SmartSearchEngine.kt

@@ -1,197 +0,0 @@
-package eu.kanade.tachiyomi.smartsearch
-
-import eu.kanade.tachiyomi.data.database.DatabaseHelper
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.SManga
-import exh.util.await
-import info.debatty.java.stringsimilarity.NormalizedLevenshtein
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.supervisorScope
-import rx.schedulers.Schedulers
-import uy.kohesive.injekt.injectLazy
-
-class SmartSearchEngine(
-    parentContext: CoroutineContext,
-    val extraSearchParams: String? = null
-) : CoroutineScope {
-    override val coroutineContext: CoroutineContext = parentContext + Job() + Dispatchers.Default
-
-    private val db: DatabaseHelper by injectLazy()
-
-    private val normalizedLevenshtein = NormalizedLevenshtein()
-
-    suspend fun smartSearch(source: CatalogueSource, title: String): SManga? {
-        val cleanedTitle = cleanSmartSearchTitle(title)
-
-        val queries = getSmartSearchQueries(cleanedTitle)
-
-        val eligibleManga = supervisorScope {
-            queries.map { query ->
-                async(Dispatchers.Default) {
-                    val builtQuery = if (extraSearchParams != null) {
-                        "$query ${extraSearchParams.trim()}"
-                    } else query
-
-                    val searchResults = source.fetchSearchManga(1, builtQuery, FilterList())
-                        .toSingle().await(Schedulers.io())
-
-                    searchResults.mangas.map {
-                        val cleanedMangaTitle = cleanSmartSearchTitle(it.title)
-                        val normalizedDistance = normalizedLevenshtein.similarity(cleanedTitle, cleanedMangaTitle)
-                        SearchEntry(it, normalizedDistance)
-                    }.filter { (_, normalizedDistance) ->
-                        normalizedDistance >= MIN_SMART_ELIGIBLE_THRESHOLD
-                    }
-                }
-            }.flatMap { it.await() }
-        }
-
-        return eligibleManga.maxBy { it.dist }?.manga
-    }
-
-    suspend fun normalSearch(source: CatalogueSource, title: String): SManga? {
-        val eligibleManga = supervisorScope {
-            val searchQuery = if (extraSearchParams != null) {
-                "$title ${extraSearchParams.trim()}"
-            } else title
-            val searchResults = source.fetchSearchManga(1, searchQuery, FilterList()).toSingle().await(Schedulers.io())
-
-            if (searchResults.mangas.size == 1)
-                return@supervisorScope listOf(SearchEntry(searchResults.mangas.first(), 0.0))
-
-            searchResults.mangas.map {
-                val normalizedDistance = normalizedLevenshtein.similarity(title, it.title)
-                SearchEntry(it, normalizedDistance)
-            }.filter { (_, normalizedDistance) ->
-                normalizedDistance >= MIN_NORMAL_ELIGIBLE_THRESHOLD
-            }
-        }
-
-        return eligibleManga.maxBy { it.dist }?.manga
-    }
-
-    private fun getSmartSearchQueries(cleanedTitle: String): List<String> {
-        val splitCleanedTitle = cleanedTitle.split(" ")
-        val splitSortedByLargest = splitCleanedTitle.sortedByDescending { it.length }
-
-        if (splitCleanedTitle.isEmpty()) {
-            return emptyList()
-        }
-
-        // Search cleaned title
-        // Search two largest words
-        // Search largest word
-        // Search first two words
-        // Search first word
-
-        val searchQueries = listOf(
-            listOf(cleanedTitle),
-            splitSortedByLargest.take(2),
-            splitSortedByLargest.take(1),
-            splitCleanedTitle.take(2),
-            splitCleanedTitle.take(1)
-        )
-
-        return searchQueries.map {
-            it.joinToString(" ").trim()
-        }.distinct()
-    }
-
-    private fun cleanSmartSearchTitle(title: String): String {
-        val preTitle = title.toLowerCase()
-
-        // Remove text in brackets
-        var cleanedTitle = removeTextInBrackets(preTitle, true)
-        if (cleanedTitle.length <= 5) { // Title is suspiciously short, try parsing it backwards
-            cleanedTitle = removeTextInBrackets(preTitle, false)
-        }
-
-        // Strip non-special characters
-        cleanedTitle = cleanedTitle.replace(titleRegex, " ")
-
-        // Strip splitters and consecutive spaces
-        cleanedTitle = cleanedTitle.trim().replace(" - ", " ").replace(consecutiveSpacesRegex, " ").trim()
-
-        return cleanedTitle
-    }
-
-    private fun removeTextInBrackets(text: String, readForward: Boolean): String {
-        val bracketPairs = listOf(
-            '(' to ')',
-            '[' to ']',
-            '<' to '>',
-            '{' to '}'
-        )
-        var openingBracketPairs = bracketPairs.mapIndexed { index, (opening, _) ->
-            opening to index
-        }.toMap()
-        var closingBracketPairs = bracketPairs.mapIndexed { index, (_, closing) ->
-            closing to index
-        }.toMap()
-
-        // Reverse pairs if reading backwards
-        if (!readForward) {
-            val tmp = openingBracketPairs
-            openingBracketPairs = closingBracketPairs
-            closingBracketPairs = tmp
-        }
-
-        val depthPairs = bracketPairs.map { 0 }.toMutableList()
-
-        val result = StringBuilder()
-        for (c in if (readForward) text else text.reversed()) {
-            val openingBracketDepthIndex = openingBracketPairs[c]
-            if (openingBracketDepthIndex != null) {
-                depthPairs[openingBracketDepthIndex]++
-            } else {
-                val closingBracketDepthIndex = closingBracketPairs[c]
-                if (closingBracketDepthIndex != null) {
-                    depthPairs[closingBracketDepthIndex]--
-                } else {
-                    if (depthPairs.all { it <= 0 }) {
-                        result.append(c)
-                    } else {
-                        // In brackets, do not append to result
-                    }
-                }
-            }
-        }
-
-        return result.toString()
-    }
-
-    /**
-     * Returns a manga from the database for the given manga from network. It creates a new entry
-     * if the manga is not yet in the database.
-     *
-     * @param sManga the manga from the source.
-     * @return a manga from the database.
-     */
-    suspend fun networkToLocalManga(sManga: SManga, sourceId: Long): Manga {
-        var localManga = db.getManga(sManga.url, sourceId).executeAsBlocking()
-        if (localManga == null) {
-            val newManga = Manga.create(sManga.url, sManga.title, sourceId)
-            newManga.copyFrom(sManga)
-            val result = db.insertManga(newManga).executeAsBlocking()
-            newManga.id = result.insertedId()
-            localManga = newManga
-        }
-        return localManga
-    }
-
-    companion object {
-        const val MIN_SMART_ELIGIBLE_THRESHOLD = 0.4
-        const val MIN_NORMAL_ELIGIBLE_THRESHOLD = 0.4
-
-        private val titleRegex = Regex("[^a-zA-Z0-9- ]")
-        private val consecutiveSpacesRegex = Regex(" +")
-    }
-}
-
-data class SearchEntry(val manga: SManga, val dist: Double)

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt

@@ -28,10 +28,10 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
 import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController
-import eu.kanade.tachiyomi.ui.smartsearch.SmartSearchController
 import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchController
 import eu.kanade.tachiyomi.ui.source.latest.LatestUpdatesController
+import exh.ui.smartsearch.SmartSearchController
 import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt

@@ -5,9 +5,9 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.DatabaseHelper
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
-import eu.kanade.tachiyomi.data.database.tables.SearchMetadataTable
 import eu.kanade.tachiyomi.ui.category.CategoryAdapter
 import exh.isLewdSource
+import exh.metadata.sql.tables.SearchMetadataTable
 import exh.search.SearchEngine
 import exh.util.await
 import exh.util.cancellable

app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt

@@ -21,7 +21,6 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.databinding.MigrationListControllerBinding
-import eu.kanade.tachiyomi.smartsearch.SmartSearchEngine
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.SourceManager
@@ -36,6 +35,7 @@ import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.system.toast
+import exh.smartsearch.SmartSearchEngine
 import exh.util.RecyclerWindowInsetsListener
 import exh.util.applyWindowInsetsForController
 import exh.util.await

app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchController.kt

@@ -1,93 +0,0 @@
-package eu.kanade.tachiyomi.ui.smartsearch
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import eu.kanade.tachiyomi.databinding.SmartSearchBinding
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.ui.base.controller.NucleusController
-import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
-import eu.kanade.tachiyomi.ui.manga.MangaController
-import eu.kanade.tachiyomi.ui.source.SourceController
-import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController
-import eu.kanade.tachiyomi.util.system.toast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import uy.kohesive.injekt.injectLazy
-
-class SmartSearchController(bundle: Bundle? = null) : NucleusController<SmartSearchBinding, SmartSearchPresenter>(), CoroutineScope {
-    override val coroutineContext = Job() + Dispatchers.Main
-
-    private val sourceManager: SourceManager by injectLazy()
-
-    private val source = sourceManager.get(bundle?.getLong(ARG_SOURCE_ID, -1) ?: -1) as? CatalogueSource
-    private val smartSearchConfig: SourceController.SmartSearchConfig? = bundle?.getParcelable(
-        ARG_SMART_SEARCH_CONFIG
-    )
-
-    override fun inflateView(inflater: LayoutInflater, container: ViewGroup): View {
-        binding = SmartSearchBinding.inflate(inflater)
-        return binding.root
-    }
-
-    override fun getTitle() = source?.name ?: ""
-
-    override fun createPresenter() = SmartSearchPresenter(source, smartSearchConfig)
-
-    override fun onViewCreated(view: View) {
-        super.onViewCreated(view)
-
-        binding.appbar.bringToFront()
-
-        if (source == null || smartSearchConfig == null) {
-            router.popCurrentController()
-            applicationContext?.toast("Missing data!")
-            return
-        }
-
-        // Init presenter now to resolve threading issues
-        presenter
-
-        launch(Dispatchers.Default) {
-            for (event in presenter.smartSearchChannel) {
-                withContext(NonCancellable) {
-                    if (event is SmartSearchPresenter.SearchResults.Found) {
-                        val transaction = MangaController(event.manga, true, smartSearchConfig).withFadeTransaction()
-                        withContext(Dispatchers.Main) {
-                            router.replaceTopController(transaction)
-                        }
-                    } else {
-                        if (event is SmartSearchPresenter.SearchResults.NotFound) {
-                            applicationContext?.toast("Couldn't find the manga in the source!")
-                        } else {
-                            applicationContext?.toast("Error performing automatic search!")
-                        }
-
-                        val transaction = BrowseSourceController(source, smartSearchConfig.origTitle, smartSearchConfig).withFadeTransaction()
-                        withContext(Dispatchers.Main) {
-                            router.replaceTopController(transaction)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        cancel()
-    }
-
-    companion object {
-        const val ARG_SOURCE_ID = "SOURCE_ID"
-        const val ARG_SMART_SEARCH_CONFIG = "SMART_SEARCH_CONFIG"
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/smartsearch/SmartSearchPresenter.kt

@@ -1,66 +0,0 @@
-package eu.kanade.tachiyomi.ui.smartsearch
-
-import android.os.Bundle
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.smartsearch.SmartSearchEngine
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.model.SManga
-import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
-import eu.kanade.tachiyomi.ui.source.SourceController
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.launch
-
-class SmartSearchPresenter(private val source: CatalogueSource?, private val config: SourceController.SmartSearchConfig?) :
-        BasePresenter<SmartSearchController>(), CoroutineScope {
-
-    override val coroutineContext = Job() + Dispatchers.Main
-
-    val smartSearchChannel = Channel<SearchResults>()
-
-    private val smartSearchEngine = SmartSearchEngine(coroutineContext)
-
-    override fun onCreate(savedState: Bundle?) {
-        super.onCreate(savedState)
-
-        if (source != null && config != null) {
-            launch(Dispatchers.Default) {
-                val result = try {
-                    val resultManga = smartSearchEngine.smartSearch(source, config.origTitle)
-                    if (resultManga != null) {
-                        val localManga = smartSearchEngine.networkToLocalManga(resultManga, source.id)
-                        SearchResults.Found(localManga)
-                    } else {
-                        SearchResults.NotFound
-                    }
-                } catch (e: Exception) {
-                    if (e is CancellationException) {
-                        throw e
-                    } else {
-                        SearchResults.Error
-                    }
-                }
-
-                smartSearchChannel.send(result)
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-
-        cancel()
-    }
-
-    data class SearchEntry(val manga: SManga, val dist: Double)
-
-    sealed class SearchResults {
-        data class Found(val manga: Manga) : SearchResults()
-        object NotFound : SearchResults()
-        object Error : SearchResults()
-    }
-}