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

2020-04-21 17:37:03 -04:00
parent b4ade8c15d
commit a393772083
16 changed files with 43 additions and 37 deletions
@@ -0,0 +1,93 @@
+package exh.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"
+    }
+}
@@ -0,0 +1,66 @@
+package exh.ui.smartsearch
+
+import android.os.Bundle
+import eu.kanade.tachiyomi.data.database.models.Manga
+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 exh.smartsearch.SmartSearchEngine
+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()
+    }
+}