Build fixes and remove possibly unneeded settings?
This commit is contained in:
@@ -5,7 +5,6 @@ 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.smartsearch.SmartSearchPresenter
|
||||
import eu.kanade.tachiyomi.util.await
|
||||
import info.debatty.java.stringsimilarity.NormalizedLevenshtein
|
||||
import kotlin.coroutines.CoroutineContext
|
||||
@@ -45,7 +44,7 @@ class SmartSearchEngine(
|
||||
searchResults.mangas.map {
|
||||
val cleanedMangaTitle = cleanSmartSearchTitle(it.title)
|
||||
val normalizedDistance = normalizedLevenshtein.similarity(cleanedTitle, cleanedMangaTitle)
|
||||
SmartSearchPresenter.SearchEntry(it, normalizedDistance)
|
||||
SearchEntry(it, normalizedDistance)
|
||||
}.filter { (_, normalizedDistance) ->
|
||||
normalizedDistance >= MIN_SMART_ELIGIBLE_THRESHOLD
|
||||
}
|
||||
@@ -65,7 +64,7 @@ class SmartSearchEngine(
|
||||
|
||||
searchResults.mangas.map {
|
||||
val normalizedDistance = normalizedLevenshtein.similarity(title, it.title)
|
||||
SmartSearchPresenter.SearchEntry(it, normalizedDistance)
|
||||
SearchEntry(it, normalizedDistance)
|
||||
}.filter { (_, normalizedDistance) ->
|
||||
normalizedDistance >= MIN_NORMAL_ELIGIBLE_THRESHOLD
|
||||
}
|
||||
@@ -191,3 +190,5 @@ class SmartSearchEngine(
|
||||
private val consecutiveSpacesRegex = Regex(" +")
|
||||
}
|
||||
}
|
||||
|
||||
data class SearchEntry(val manga: SManga, val dist: Double)
|
||||
|
||||
@@ -168,11 +168,6 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
|
||||
}
|
||||
|
||||
initWhenIdle {
|
||||
// Migrate metadata if empty (EH)
|
||||
if(!preferences.migrateLibraryAsked().getOrDefault()) {
|
||||
MetadataFetchDialog().askMigration(this, false)
|
||||
}
|
||||
|
||||
// Upload settings
|
||||
if(preferences.enableExhentai().getOrDefault()
|
||||
&& preferences.eh_showSettingsUploadWarning().getOrDefault())
|
||||
|
||||
+3
-3
@@ -104,9 +104,9 @@ class MigrationBottomSheetDialog(
|
||||
|
||||
private fun setFlags() {
|
||||
var flags = 0
|
||||
if(mig_chapters.isChecked) flags = flags or MigrationFlags.CHAPTERS
|
||||
if(mig_categories.isChecked) flags = flags or MigrationFlags.CATEGORIES
|
||||
if(mig_tracking.isChecked) flags = flags or MigrationFlags.TRACK
|
||||
if (mig_chapters.isChecked) flags = flags or MigrationFlags.CHAPTERS
|
||||
if (mig_categories.isChecked) flags = flags or MigrationFlags.CATEGORIES
|
||||
if (mig_tracking.isChecked) flags = flags or MigrationFlags.TRACK
|
||||
preferences.migrateFlags().set(flags)
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateService.Target
|
||||
import eu.kanade.tachiyomi.network.NetworkHelper
|
||||
import eu.kanade.tachiyomi.ui.base.controller.DialogController
|
||||
import eu.kanade.tachiyomi.ui.library.LibraryController
|
||||
import eu.kanade.tachiyomi.ui.migration.MetadataFetchDialog
|
||||
import eu.kanade.tachiyomi.util.preference.defaultValue
|
||||
import eu.kanade.tachiyomi.util.preference.onClick
|
||||
import eu.kanade.tachiyomi.util.preference.preference
|
||||
@@ -112,42 +111,7 @@ class SettingsAdvancedController : SettingsController() {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --> EXH
|
||||
preferenceCategory {
|
||||
title = "Gallery metadata"
|
||||
isPersistent = false
|
||||
|
||||
preference {
|
||||
title = "Migrate library metadata"
|
||||
isPersistent = false
|
||||
key = "ex_migrate_library"
|
||||
summary = "Fetch the library metadata to enable tag searching in the library. This button will be visible even if you have already fetched the metadata"
|
||||
|
||||
onClick {
|
||||
activity?.let {
|
||||
MetadataFetchDialog().askMigration(it, true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
preference {
|
||||
title = "Clear library metadata"
|
||||
isPersistent = false
|
||||
key = "ex_clear_metadata"
|
||||
summary = "Clear all library metadata. Disables tag searching in the library"
|
||||
|
||||
onClick {
|
||||
db.inTransaction {
|
||||
db.deleteAllSearchMetadata().executeAsBlocking()
|
||||
db.deleteAllSearchTags().executeAsBlocking()
|
||||
db.deleteAllSearchTitle().executeAsBlocking()
|
||||
}
|
||||
|
||||
context.toast("Library metadata cleared!")
|
||||
}
|
||||
}
|
||||
}
|
||||
// <-- EXH
|
||||
preferenceCategory {
|
||||
title = "Developer tools"
|
||||
isPersistent = false
|
||||
|
||||
Reference in New Issue
Block a user