diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt index a18b98f1d..eae1de21f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt @@ -14,7 +14,7 @@ object MangaTypeAdapter { write { beginArray() value(it.url) - value(it.title) + value(it.originalTitle) value(it.source) value(it.viewer) value(it.chapter_flags) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt index 910bcd67c..72e078e03 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt @@ -51,11 +51,11 @@ class MangaPutResolver : DefaultPutResolver() { put(COL_ID, obj.id) put(COL_SOURCE, obj.source) put(COL_URL, obj.url) - put(COL_ARTIST, obj.artist) - put(COL_AUTHOR, obj.author) - put(COL_DESCRIPTION, obj.description) - put(COL_GENRE, obj.genre) - put(COL_TITLE, obj.title) + put(COL_ARTIST, obj.originalArtist) + put(COL_AUTHOR, obj.originalAuthor) + put(COL_DESCRIPTION, obj.originalDescription) + put(COL_GENRE, obj.originalGenre) + put(COL_TITLE, obj.originalTitle) put(COL_STATUS, obj.status) put(COL_THUMBNAIL_URL, obj.thumbnail_url) put(COL_FAVORITE, obj.favorite) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt index 3bf7a7300..40ace2ad3 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt @@ -118,7 +118,7 @@ class DownloadProvider(private val context: Context) { * @param manga the manga to query. */ fun getMangaDirName(manga: Manga): String { - return DiskUtil.buildValidFilename(manga.title) + return DiskUtil.buildValidFilename(manga.originalTitle) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt index 788bf9f6e..2d17ba08d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt @@ -167,12 +167,12 @@ class MigrationListController(bundle: Bundle? = null) : val searchResult = if (useSmartSearch) { smartSearchEngine.smartSearch( source, - mangaObj.title + mangaObj.originalTitle ) } else { smartSearchEngine.normalSearch( source, - mangaObj.title + mangaObj.originalTitle ) } @@ -222,12 +222,12 @@ class MigrationListController(bundle: Bundle? = null) : val searchResult = if (useSmartSearch) { smartSearchEngine.smartSearch( source, - mangaObj.title + mangaObj.originalTitle ) } else { smartSearchEngine.normalSearch( source, - mangaObj.title + mangaObj.originalTitle ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt index 699bddf8a..d1d5429c2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt @@ -171,7 +171,7 @@ class MigrationProcessHolder( title.text = if (manga.title.isBlank()) { view.context.getString(R.string.unknown) } else { - manga.title + manga.originalTitle } gradient.visible() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaHolder.kt index 0cc61d055..0198bcb39 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaHolder.kt @@ -20,7 +20,7 @@ class MangaHolder( fun bind(item: MangaItem) { // Update the title of the manga. - title.text = item.manga.title + title.text = item.manga.originalTitle // Create thumbnail onclick to simulate long click thumbnail.setOnClickListener { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt index da4d2d9be..0f6d7cfdd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt @@ -34,7 +34,7 @@ class MigrationMangaPresenter( private fun libraryToMigrationItem(library: List): List { return library.filter { it.source == sourceId } - .sortedBy { it.title } + .sortedBy { it.originalTitle } .map { MangaItem(it) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt index 216142577..ba4a842a4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt @@ -30,7 +30,7 @@ import uy.kohesive.injekt.injectLazy class SearchController( private var manga: Manga? = null, private var sources: List? = null -) : GlobalSearchController(manga?.title) { +) : GlobalSearchController(manga?.originalTitle) { private var newManga: Manga? = null private var progress = 1 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 49cc715ac..3007cc784 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -146,7 +146,7 @@ open class BrowseSourceController(bundle: Bundle) : // SY --> return when (mode) { Mode.CATALOGUE -> presenter.source.name - Mode.RECOMMENDS -> recommendsConfig!!.manga.title + Mode.RECOMMENDS -> recommendsConfig!!.manga.originalTitle } // SY <-- } @@ -712,7 +712,7 @@ open class BrowseSourceController(bundle: Bundle) : ) } } - Mode.RECOMMENDS -> openSmartSearch(item.manga.title) + Mode.RECOMMENDS -> openSmartSearch(item.manga.originalTitle) } // SY <-- return false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/RecommendsPager.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/RecommendsPager.kt index fb99e3831..94e3e778a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/RecommendsPager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/RecommendsPager.kt @@ -282,7 +282,7 @@ open class RecommendsPager( private fun getRecs(api: API) { Timber.tag("RECOMMENDATIONS").d("USING > %s", api.toString()) - apiList[api]?.getRecsBySearch(manga.title) { recs, error -> + apiList[api]?.getRecsBySearch(manga.originalTitle) { recs, error -> if (error != null) { handleError(error) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt index 6935003e2..3222c312a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt @@ -258,7 +258,7 @@ class MangaInfoController(private val fromSource: Boolean = false) : // EXH --> private fun openSmartSearch() { - val smartSearchConfig = SourceController.SmartSearchConfig(presenter.manga.title, presenter.manga.id!!) + val smartSearchConfig = SourceController.SmartSearchConfig(presenter.manga.originalTitle, presenter.manga.id!!) parentController?.router?.pushController( SourceController( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt index 57cbb1195..b17f69a8b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt @@ -211,7 +211,7 @@ class MangaInfoPresenter( ) ) ) - Manga.create(newMangaConfig.writeAsUrl(gson), originalManga.title, MERGED_SOURCE_ID).apply { + Manga.create(newMangaConfig.writeAsUrl(gson), originalManga.originalTitle, MERGED_SOURCE_ID).apply { copyFrom(originalManga) favorite = true last_update = originalManga.last_update diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt index 6a9f8ad8e..f7b527772 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt @@ -84,7 +84,7 @@ class TrackSearchDialog : DialogController { // Do an initial search based on the manga's title if (savedState == null) { - val title = trackController.presenter.manga.title + val title = trackController.presenter.manga.originalTitle view.track_search.append(title) search(title) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt index bb1524f0b..9aa3944f6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt @@ -77,7 +77,7 @@ object ChapterRecognition { } // Remove manga title from chapter title. - val nameWithoutManga = name.replace(manga.title.toLowerCase(), "").trim() + val nameWithoutManga = name.replace(manga.originalTitle.toLowerCase(), "").trim() // Check if first value is number after title remove. if (updateChapter(withoutManga.find(nameWithoutManga), chapter)) { diff --git a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt index 706468b60..ca499d980 100644 --- a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt +++ b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt @@ -120,7 +120,7 @@ class LocalFavoritesStorage { validateDbManga(it.second) }.mapNotNull { FavoriteEntry().apply { - title = it.second.title + title = it.second.originalTitle gid = EHentaiSearchMetadata.galleryId(it.second.url) token = EHentaiSearchMetadata.galleryToken(it.second.url) category = it.first diff --git a/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt b/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt index 017598e9e..d147e4b6a 100644 --- a/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt +++ b/app/src/main/java/exh/smartsearch/SmartSearchEngine.kt @@ -42,7 +42,7 @@ class SmartSearchEngine( .toSingle().await(Schedulers.io()) searchResults.mangas.map { - val cleanedMangaTitle = cleanSmartSearchTitle(it.title) + val cleanedMangaTitle = cleanSmartSearchTitle(it.originalTitle) val normalizedDistance = normalizedLevenshtein.similarity(cleanedTitle, cleanedMangaTitle) SearchEntry(it, normalizedDistance) }.filter { (_, normalizedDistance) -> @@ -67,7 +67,7 @@ class SmartSearchEngine( } searchResults.mangas.map { - val normalizedDistance = normalizedLevenshtein.similarity(title, it.title) + val normalizedDistance = normalizedLevenshtein.similarity(title, it.originalTitle) SearchEntry(it, normalizedDistance) }.filter { (_, normalizedDistance) -> normalizedDistance >= MIN_NORMAL_ELIGIBLE_THRESHOLD