SmartSearch architecture improvements

app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt

@@ -5,28 +5,22 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import eu.kanade.tachiyomi.R
-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.SourceManager
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.ui.base.controller.NucleusController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.catalogue.CatalogueController
+import eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.toast
-import exh.util.await
-import info.debatty.java.stringsimilarity.NormalizedLevenshtein
 import kotlinx.android.synthetic.main.eh_smart_search.*
 import kotlinx.coroutines.*
-import rx.schedulers.Schedulers
 import uy.kohesive.injekt.injectLazy
-import kotlin.text.StringBuilder
 
-class SmartSearchController(bundle: Bundle? = null) : NucleusController<SmartSearchPresenter>() {
+class SmartSearchController(bundle: Bundle? = null) : NucleusController<SmartSearchPresenter>(), CoroutineScope {
+    override val coroutineContext = Job() + Dispatchers.Main
+
     private val sourceManager: SourceManager by injectLazy()
-    private val db: DatabaseHelper by injectLazy()
 
     private val source = sourceManager.get(bundle?.getLong(ARG_SOURCE_ID, -1) ?: -1) as? CatalogueSource
     private val smartSearchConfig: CatalogueController.SmartSearchConfig? = bundle?.getParcelable(ARG_SMART_SEARCH_CONFIG)
@@ -36,7 +30,7 @@ class SmartSearchController(bundle: Bundle? = null) : NucleusController<SmartSea
 
     override fun getTitle() = source?.name ?: ""
 
-    override fun createPresenter() = SmartSearchPresenter()
+    override fun createPresenter() = SmartSearchPresenter(source, smartSearchConfig)
 
     override fun onViewCreated(view: View) {
         super.onViewCreated(view)
@@ -49,166 +43,42 @@ class SmartSearchController(bundle: Bundle? = null) : NucleusController<SmartSea
             return
         }
 
-        // TODO Error handling
+        // Init presenter now to resolve threading issues
+        presenter
 
-        // TODO Use activity scope
+        launch(Dispatchers.Default) {
-        GlobalScope.launch(Dispatchers.IO) {
+            for(event in presenter.smartSearchChannel) {
-            val resultManga = initiateSmartSearch(source, smartSearchConfig)
+                withContext(NonCancellable) {
-            if(resultManga != null) {
+                    if (event is SmartSearchPresenter.SearchResults.Found) {
-                val localManga = networkToLocalManga(resultManga, source.id)
+                        val transaction = MangaController(event.manga, true).withFadeTransaction()
-                val transaction = MangaController(localManga, true).withFadeTransaction()
                         withContext(Dispatchers.Main) {
                             router.replaceTopController(transaction)
                         }
                     } else {
-                // TODO Open search
+                        if (event is SmartSearchPresenter.SearchResults.NotFound) {
-                router.popCurrentController()
+                            applicationContext?.toast("Couldn't find the manga in the source!")
-            }
-            println(resultManga)
-        }
-    }
-
-    suspend fun initiateSmartSearch(source: CatalogueSource, config: CatalogueController.SmartSearchConfig): SManga? {
-        val cleanedTitle = cleanSmartSearchTitle(config.title)
-
-        val queries = getSmartSearchQueries(cleanedTitle)
-
-        val eligibleManga = supervisorScope {
-            queries.map { query ->
-                async(Dispatchers.IO) {
-                    val searchResults = source.fetchSearchManga(1, query, 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_ELIGIBLE_THRESHOLD
-                    }
-                }
-            }.flatMap { it.await() }
-        }
-
-        return eligibleManga.maxBy { it.dist }?.manga
-    }
-
-    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()
-    }
-
-    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]
+                            applicationContext?.toast("Error performing automatic search!")
-                if(closingBracketDepthIndex != null) {
+                        }
-                    depthPairs[closingBracketDepthIndex]--
+
-                } else {
+                        val transaction = BrowseCatalogueController(source, smartSearchConfig.title).withFadeTransaction()
-                    if(depthPairs.all { it <= 0 }) {
+                        withContext(Dispatchers.Main) {
-                        result.append(c)
+                            router.replaceTopController(transaction)
-                    } else {
+                        }
-                        // In brackets, do not append to result
+                    }
                 }
             }
         }
     }
 
-        return result.toString()
+    override fun onDestroy() {
-    }
+        super.onDestroy()
 
-    /**
+        cancel()
-     * 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.
-     */
-    private 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
-    }
-
-    data class SearchEntry(val manga: SManga, val dist: Double)
 
     companion object {
         const val ARG_SOURCE_ID = "SOURCE_ID"
         const val ARG_SMART_SEARCH_CONFIG = "SMART_SEARCH_CONFIG"
-        const val MIN_ELIGIBLE_THRESHOLD = 0.7
-
-        private val titleRegex = Regex("[^a-zA-Z0-9- ]")
-        private val consecutiveSpacesRegex = Regex(" +")
     }
 }

app/src/main/java/exh/ui/smartsearch/SmartSearchPresenter.kt

@@ -1,6 +1,209 @@
 package exh.ui.smartsearch
 
+import android.os.Bundle
+import com.elvishew.xlog.XLog
+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 eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
+import eu.kanade.tachiyomi.ui.catalogue.CatalogueController
+import exh.util.await
+import info.debatty.java.stringsimilarity.NormalizedLevenshtein
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.Channel
+import rx.schedulers.Schedulers
+import uy.kohesive.injekt.injectLazy
 
-class SmartSearchPresenter: BasePresenter<SmartSearchPresenter>() {
+class SmartSearchPresenter(private val source: CatalogueSource?, private val config: CatalogueController.SmartSearchConfig?):
+        BasePresenter<SmartSearchController>(), CoroutineScope {
+    private val db: DatabaseHelper by injectLazy()
+
+    private val logger = XLog.tag("SmartSearchPresenter")
+
+    override val coroutineContext = Job() + Dispatchers.Main
+
+    val smartSearchChannel = Channel<SearchResults>()
+
+    override fun onCreate(savedState: Bundle?) {
+        super.onCreate(savedState)
+
+        if(source != null && config != null) {
+            launch(Dispatchers.Default) {
+                val result = try {
+                    val resultManga = smartSearch(source, config)
+                    if (resultManga != null) {
+                        val localManga = networkToLocalManga(resultManga, source.id)
+                        SearchResults.Found(localManga)
+                    } else {
+                        SearchResults.NotFound
+                    }
+                } catch (e: Exception) {
+                    if (e is CancellationException) {
+                        throw e
+                    } else {
+                        logger.e("Smart search error", e)
+                        SearchResults.Error
+                    }
+                }
+
+                smartSearchChannel.send(result)
+            }
+        }
+    }
+
+    private suspend fun smartSearch(source: CatalogueSource, config: CatalogueController.SmartSearchConfig): SManga? {
+        val cleanedTitle = cleanSmartSearchTitle(config.title)
+
+        val queries = getSmartSearchQueries(cleanedTitle)
+
+        val eligibleManga = supervisorScope {
+            queries.map { query ->
+                async(Dispatchers.Default) {
+                    val searchResults = source.fetchSearchManga(1, query, 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_ELIGIBLE_THRESHOLD
+                    }
+                }
+            }.flatMap { it.await() }
+        }
+
+        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.
+     */
+    private 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
+    }
+
+    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()
+    }
+
+    companion object {
+        const val MIN_ELIGIBLE_THRESHOLD = 0.7
+
+        private val titleRegex = Regex("[^a-zA-Z0-9- ]")
+        private val consecutiveSpacesRegex = Regex(" +")
+    }
 }