Rewrite tag searching to use SQL

Fix EHentai/ExHentai
Fix hitomi.la
Fix hitomi.la crashing application
Rewrite hitomi.la search engine to be faster, use less CPU and require no preloading
Fix nhentai
Add additional filters to nhentai
Fix PervEden
Introduce delegated sources
Rewrite HentaiCafe to be a delegated source
Introduce ability to save/load search presets
Temporarily disable misbehaving native Tachiyomi migrations
Fix tap-to-search-tag breaking on aliased tags
Add debug menu
Add experimental automatic captcha solver
Add app name to wakelock names
Add ability to interrupt metadata migrator
Fix incognito open-in-browser being zoomed in immediately when it's opened

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

@@ -6,18 +6,28 @@ import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite
 import eu.kanade.tachiyomi.data.database.mappers.*
 import eu.kanade.tachiyomi.data.database.models.*
 import eu.kanade.tachiyomi.data.database.queries.*
+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
 
 /**
  * This class provides operations to manage the database through its interfaces.
  */
 open class DatabaseHelper(context: Context)
-: MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries {
-
+    : MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries,
+        /* EXH --> */ SearchMetadataQueries, SearchTagQueries, SearchTitleQueries /* EXH <-- */
+{
     private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context)
-        .name(DbOpenCallback.DATABASE_NAME)
-        .callback(DbOpenCallback())
-        .build()
+            .name(DbOpenCallback.DATABASE_NAME)
+            .callback(DbOpenCallback())
+            .build()
 
     override val db = DefaultStorIOSQLite.builder()
             .sqliteOpenHelper(RequerySQLiteOpenHelperFactory().create(configuration))
@@ -27,6 +37,11 @@ open class DatabaseHelper(context: Context)
             .addTypeMapping(Category::class.java, CategoryTypeMapping())
             .addTypeMapping(MangaCategory::class.java, MangaCategoryTypeMapping())
             .addTypeMapping(History::class.java, HistoryTypeMapping())
+            // EXH -->
+            .addTypeMapping(SearchMetadata::class.java, SearchMetadataTypeMapping())
+            .addTypeMapping(SearchTag::class.java, SearchTagTypeMapping())
+            .addTypeMapping(SearchTitle::class.java, SearchTitleTypeMapping())
+            // EXH <--
             .build()
 
     inline fun inTransaction(block: () -> Unit) = db.inTransaction(block)

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

@@ -2,10 +2,10 @@ package eu.kanade.tachiyomi.data.database
 
 import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.db.SupportSQLiteOpenHelper
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteOpenHelper
 import eu.kanade.tachiyomi.data.database.tables.*
+import exh.metadata.sql.tables.SearchMetadataTable
+import exh.metadata.sql.tables.SearchTagTable
+import exh.metadata.sql.tables.SearchTitleTable
 
 class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
 
@@ -18,7 +18,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
         /**
          * Version of the database.
          */
-        const val DATABASE_VERSION = 8
+        const val DATABASE_VERSION = 9 // [EXH]
     }
 
     override fun onCreate(db: SupportSQLiteDatabase) = with(db) {
@@ -28,6 +28,11 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
         execSQL(CategoryTable.createTableQuery)
         execSQL(MangaCategoryTable.createTableQuery)
         execSQL(HistoryTable.createTableQuery)
+        // EXH -->
+        execSQL(SearchMetadataTable.createTableQuery)
+        execSQL(SearchTagTable.createTableQuery)
+        execSQL(SearchTitleTable.createTableQuery)
+        // EXH <--
 
         // DB indexes
         execSQL(MangaTable.createUrlIndexQuery)
@@ -35,6 +40,14 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
         execSQL(ChapterTable.createMangaIdIndexQuery)
         execSQL(ChapterTable.createUnreadChaptersIndexQuery)
         execSQL(HistoryTable.createChapterIdIndexQuery)
+        // EXH -->
+        db.execSQL(SearchMetadataTable.createUploaderIndexQuery)
+        db.execSQL(SearchMetadataTable.createIndexedExtraIndexQuery)
+        db.execSQL(SearchTagTable.createMangaIdIndexQuery)
+        db.execSQL(SearchTagTable.createNamespaceNameIndexQuery)
+        db.execSQL(SearchTitleTable.createMangaIdIndexQuery)
+        db.execSQL(SearchTitleTable.createTitleIndexQuery)
+        // EXH <--
     }
 
     override fun onUpgrade(db: SupportSQLiteDatabase, oldVersion: Int, newVersion: Int) {
@@ -67,6 +80,21 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) {
             db.execSQL(MangaTable.createLibraryIndexQuery)
             db.execSQL(ChapterTable.createUnreadChaptersIndexQuery)
         }
+        // EXH -->
+        if (oldVersion < 9) {
+            db.execSQL(SearchMetadataTable.createTableQuery)
+            db.execSQL(SearchTagTable.createTableQuery)
+            db.execSQL(SearchTitleTable.createTableQuery)
+
+            db.execSQL(SearchMetadataTable.createUploaderIndexQuery)
+            db.execSQL(SearchMetadataTable.createIndexedExtraIndexQuery)
+            db.execSQL(SearchTagTable.createMangaIdIndexQuery)
+            db.execSQL(SearchTagTable.createNamespaceNameIndexQuery)
+            db.execSQL(SearchTitleTable.createMangaIdIndexQuery)
+            db.execSQL(SearchTitleTable.createTitleIndexQuery)
+        }
+        // Remember to increment any Tachiyomi database upgrades after this
+        // EXH <--
     }
 
     override fun onConfigure(db: SupportSQLiteDatabase) {

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

@@ -0,0 +1,34 @@
+package eu.kanade.tachiyomi.data.database.resolvers
+
+import android.content.ContentValues
+import com.pushtorefresh.storio.sqlite.StorIOSQLite
+import com.pushtorefresh.storio.sqlite.operations.put.PutResolver
+import com.pushtorefresh.storio.sqlite.operations.put.PutResult
+import com.pushtorefresh.storio.sqlite.queries.UpdateQuery
+import eu.kanade.tachiyomi.data.database.inTransactionReturn
+import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.data.database.tables.MangaTable
+
+// [EXH]
+class MangaUrlPutResolver : PutResolver<Manga>() {
+
+    override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
+        val updateQuery = mapToUpdateQuery(manga)
+        val contentValues = mapToContentValues(manga)
+
+        val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
+        PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
+    }
+
+    fun mapToUpdateQuery(manga: Manga) = UpdateQuery.builder()
+            .table(MangaTable.TABLE)
+            .where("${MangaTable.COL_ID} = ?")
+            .whereArgs(manga.id)
+            .build()
+
+    fun mapToContentValues(manga: Manga) = ContentValues(1).apply {
+        put(MangaTable.COL_URL, manga.url)
+    }
+
+}
+

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt

@@ -157,15 +157,7 @@ object PreferenceKeys {
 
     const val eh_ts_aspNetCookie = "eh_ts_aspNetCookie"
 
-    const val eh_showSettingsUploadWarning = "eh_showSettingsUploadWarning1"
-
-    const val eh_hl_earlyRefresh = "eh_hl_early_refresh"
-
-    const val eh_hl_refreshFrequency = "eh_hl_refresh_frequency"
-
-    const val eh_hl_lastRefresh = "eh_hl_last_refresh"
-
-    const val eh_hl_lastRealmIndex = "eh_hl_lastRealmIndex"
+    const val eh_showSettingsUploadWarning = "eh_showSettingsUploadWarning2"
 
     const val eh_expandFilters = "eh_expand_filters"
 
@@ -182,4 +174,8 @@ object PreferenceKeys {
     const val eh_preserveReadingPosition = "eh_preserve_reading_position"
 
     const val eh_incogWebview = "eh_incognito_webview"
+
+    const val eh_autoSolveCaptchas = "eh_autosolve_captchas"
+
+    const val eh_delegateSources = "eh_delegate_sources"
 }

app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt

@@ -189,16 +189,16 @@ class PreferencesHelper(val context: Context) {
 
     fun thumbnailRows() = rxPrefs.getString("ex_thumb_rows", "tr_2")
 
-    fun migrateLibraryAsked2() = rxPrefs.getBoolean("ex_migrate_library2", false)
+    fun migrateLibraryAsked() = rxPrefs.getBoolean("ex_migrate_library3", false)
 
     fun migrationStatus() = rxPrefs.getInteger("migration_status", MigrationStatus.NOT_INITIALIZED)
 
     fun hasPerformedURLMigration() = rxPrefs.getBoolean("performed_url_migration", false)
 
     //EH Cookies
-    fun memberIdVal() = rxPrefs.getString("eh_ipb_member_id", null)
-    fun passHashVal() = rxPrefs.getString("eh_ipb_pass_hash", null)
-    fun igneousVal() = rxPrefs.getString("eh_igneous", null)
+    fun memberIdVal() = rxPrefs.getString("eh_ipb_member_id", "")
+    fun passHashVal() = rxPrefs.getString("eh_ipb_pass_hash", "")
+    fun igneousVal() = rxPrefs.getString("eh_igneous", "")
     fun eh_ehSettingsProfile() = rxPrefs.getInteger(Keys.eh_ehSettingsProfile, -1)
     fun eh_exhSettingsProfile() = rxPrefs.getInteger(Keys.eh_exhSettingsProfile, -1)
     fun eh_settingsKey() = rxPrefs.getString(Keys.eh_settingsKey, "")
@@ -228,16 +228,6 @@ class PreferencesHelper(val context: Context) {
 
     fun eh_showSettingsUploadWarning() = rxPrefs.getBoolean(Keys.eh_showSettingsUploadWarning, true)
 
-    // Default is 24h, refresh daily
-    fun eh_hl_earlyRefresh() = rxPrefs.getBoolean(Keys.eh_hl_earlyRefresh, false)
-
-    fun eh_hl_refreshFrequency() = rxPrefs.getString(Keys.eh_hl_refreshFrequency, "24")
-
-    fun eh_hl_lastRefresh() = rxPrefs.getLong(Keys.eh_hl_lastRefresh, 0L)
-
-    fun eh_hl_lastRealmIndex() = rxPrefs.getInteger(Keys.eh_hl_lastRealmIndex, -1)
-    // <-- EH
-
     fun eh_expandFilters() = rxPrefs.getBoolean(Keys.eh_expandFilters, false)
 
     fun eh_readerThreads() = rxPrefs.getInteger(Keys.eh_readerThreads, 2)
@@ -253,4 +243,12 @@ class PreferencesHelper(val context: Context) {
     fun eh_incogWebview() = rxPrefs.getBoolean(Keys.eh_incogWebview, false)
 
     fun eh_askCategoryOnLongPress() = rxPrefs.getBoolean(Keys.eh_askCategoryOnLongPress, false)
+
+    fun eh_autoSolveCaptchas() = rxPrefs.getBoolean(Keys.eh_autoSolveCaptchas, false)
+
+    fun eh_delegateSources() = rxPrefs.getBoolean(Keys.eh_delegateSources, true)
+
+    fun eh_lastVersionCode() = rxPrefs.getInteger("eh_last_version_code", 0)
+
+    fun eh_savedSearches() = rxPrefs.getString("eh_saved_searches", "")
 }