From 928fc06e586d9f5dde6bf7335b98d635b0646f2f Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 14 Apr 2021 15:53:13 -0400
Subject: [PATCH] Removing the logic for cleaning the old way for saving custom
 manga info

---
 .../tachiyomi/data/database/queries/MangaQueries.kt |  5 -----
 .../data/database/resolvers/MangaInfoPutResolver.kt | 13 ++-----------
 .../kanade/tachiyomi/ui/library/LibraryPresenter.kt |  4 +---
 .../ui/source/browse/BrowseSourcePresenter.kt       |  1 -
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
index ed7aa4d8e8..4127ec0f58 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaQueries.kt
@@ -114,11 +114,6 @@ interface MangaQueries : DbProvider {
         .withPutResolver(MangaInfoPutResolver())
         .prepare()
 
-    fun resetMangaInfo(manga: Manga) = db.put()
-        .`object`(manga)
-        .withPutResolver(MangaInfoPutResolver(true))
-        .prepare()
-
     fun deleteManga(manga: Manga) = db.delete().`object`(manga).prepare()
 
     fun deleteMangas(mangas: List<Manga>) = db.delete().objects(mangas).prepare()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt
index b1a2c826c4..140069fb05 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/MangaInfoPutResolver.kt
@@ -9,11 +9,11 @@ import eu.kanade.tachiyomi.data.database.inTransactionReturn
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.database.tables.MangaTable
 
-class MangaInfoPutResolver(val reset: Boolean = false) : PutResolver<Manga>() {
+class MangaInfoPutResolver() : PutResolver<Manga>() {
 
     override fun performPut(db: StorIOSQLite, manga: Manga) = db.inTransactionReturn {
         val updateQuery = mapToUpdateQuery(manga)
-        val contentValues = if (reset) resetToContentValues(manga) else mapToContentValues(manga)
+        val contentValues = mapToContentValues(manga)
 
         val numberOfRowsUpdated = db.lowLevel().update(updateQuery, contentValues)
         PutResult.newUpdateResult(numberOfRowsUpdated, updateQuery.table())
@@ -32,13 +32,4 @@ class MangaInfoPutResolver(val reset: Boolean = false) : PutResolver<Manga>() {
         put(MangaTable.COL_ARTIST, manga.originalArtist)
         put(MangaTable.COL_DESCRIPTION, manga.originalDescription)
     }
-
-    fun resetToContentValues(manga: Manga) = ContentValues(1).apply {
-        val splitter = "▒ ▒∩▒"
-        put(MangaTable.COL_TITLE, manga.title.split(splitter).last())
-        put(MangaTable.COL_GENRE, manga.genre?.split(splitter)?.lastOrNull())
-        put(MangaTable.COL_AUTHOR, manga.author?.split(splitter)?.lastOrNull())
-        put(MangaTable.COL_ARTIST, manga.artist?.split(splitter)?.lastOrNull())
-        put(MangaTable.COL_DESCRIPTION, manga.description?.split(splitter)?.lastOrNull())
-    }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
index 8e56a56bb4..04e39ac3f2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
@@ -729,7 +729,6 @@ class LibraryPresenter(
         scope.launch {
             val mangaToDelete = mangas.distinctBy { it.id }
             mangaToDelete.forEach { manga ->
-                db.resetMangaInfo(manga).executeOnIO()
                 coverCache.deleteFromCache(manga)
                 val source = sourceManager.get(manga.source) as? HttpSource
                 if (source != null) {
@@ -927,7 +926,7 @@ class LibraryPresenter(
         private var lastLibraryItems: List<LibraryItem>? = null
         private var lastCategories: List<Category>? = null
 
-        /** Give library manga to a date added based on min chapter fetch + remove custom info */
+        /** Give library manga to a date added based on min chapter fetch */
         fun updateDB() {
             val db: DatabaseHelper = Injekt.get()
             db.inTransaction {
@@ -938,7 +937,6 @@ class LibraryPresenter(
                         manga.date_added = chapters.minByOrNull { it.date_fetch }?.date_fetch ?: 0L
                         db.insertManga(manga).executeAsBlocking()
                     }
-                    db.resetMangaInfo(manga).executeAsBlocking()
                 }
             }
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt
index 0e7d974098..21eb641a1d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt
@@ -280,7 +280,6 @@ open class BrowseSourcePresenter(
         coverCache.deleteFromCache(manga)
         val downloadManager: DownloadManager = Injekt.get()
         downloadManager.deleteManga(manga, source)
-        db.resetMangaInfo(manga).executeAsBlocking()
     }
 
     /**