Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manga info edit will now not break everything

Browse Source
This commit is contained in:
Jobobby04 2020-07-11 15:22:11 -04:00
parent 044c638079
commit 2e033356aa
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/data/backup/serializer/MangaTypeAdapter.kt
View File

@ -14,7 +14,7 @@ object MangaTypeAdapter {
write { write {
beginArray() beginArray()
value(it.url) value(it.url)
value(it.title) value(it.originalTitle)
value(it.source) value(it.source)
value(it.viewer) value(it.viewer)
value(it.chapter_flags) value(it.chapter_flags)

10
app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
View File

@ -51,11 +51,11 @@ class MangaPutResolver : DefaultPutResolver<Manga>() {
put(COL_ID, obj.id) put(COL_ID, obj.id)
put(COL_SOURCE, obj.source) put(COL_SOURCE, obj.source)
put(COL_URL, obj.url) put(COL_URL, obj.url)
put(COL_ARTIST, obj.artist) put(COL_ARTIST, obj.originalArtist)
put(COL_AUTHOR, obj.author) put(COL_AUTHOR, obj.originalAuthor)
put(COL_DESCRIPTION, obj.description) put(COL_DESCRIPTION, obj.originalDescription)
put(COL_GENRE, obj.genre) put(COL_GENRE, obj.originalGenre)
put(COL_TITLE, obj.title) put(COL_TITLE, obj.originalTitle)
put(COL_STATUS, obj.status) put(COL_STATUS, obj.status)
put(COL_THUMBNAIL_URL, obj.thumbnail_url) put(COL_THUMBNAIL_URL, obj.thumbnail_url)
put(COL_FAVORITE, obj.favorite) put(COL_FAVORITE, obj.favorite)

2
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
View File

@ -118,7 +118,7 @@ class DownloadProvider(private val context: Context) {
* @param manga the manga to query. * @param manga the manga to query.
*/ */
fun getMangaDirName(manga: Manga): String { fun getMangaDirName(manga: Manga): String {
return DiskUtil.buildValidFilename(manga.title) return DiskUtil.buildValidFilename(manga.originalTitle)
} }
/** /**

8
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt
View File

@ -167,12 +167,12 @@ class MigrationListController(bundle: Bundle? = null) :
val searchResult = if (useSmartSearch) { val searchResult = if (useSmartSearch) {
smartSearchEngine.smartSearch( smartSearchEngine.smartSearch(
source, source,
mangaObj.title mangaObj.originalTitle
) )
} else { } else {
smartSearchEngine.normalSearch( smartSearchEngine.normalSearch(
source, source,
mangaObj.title mangaObj.originalTitle
) )
} }
@ -222,12 +222,12 @@ class MigrationListController(bundle: Bundle? = null) :
val searchResult = if (useSmartSearch) { val searchResult = if (useSmartSearch) {
smartSearchEngine.smartSearch( smartSearchEngine.smartSearch(
source, source,
mangaObj.title mangaObj.originalTitle
) )
} else { } else {
smartSearchEngine.normalSearch( smartSearchEngine.normalSearch(
source, source,
mangaObj.title mangaObj.originalTitle
) )
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt
View File

@ -171,7 +171,7 @@ class MigrationProcessHolder(
title.text = if (manga.title.isBlank()) { title.text = if (manga.title.isBlank()) {
view.context.getString(R.string.unknown) view.context.getString(R.string.unknown)
} else { } else {
manga.title manga.originalTitle
} }
gradient.visible() gradient.visible()

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaHolder.kt
View File

@ -20,7 +20,7 @@ class MangaHolder(
fun bind(item: MangaItem) { fun bind(item: MangaItem) {
// Update the title of the manga. // Update the title of the manga.
title.text = item.manga.title title.text = item.manga.originalTitle
// Create thumbnail onclick to simulate long click // Create thumbnail onclick to simulate long click
thumbnail.setOnClickListener { thumbnail.setOnClickListener {

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaPresenter.kt
View File

@ -34,7 +34,7 @@ class MigrationMangaPresenter(
private fun libraryToMigrationItem(library: List<Manga>): List<MangaItem> { private fun libraryToMigrationItem(library: List<Manga>): List<MangaItem> {
return library.filter { it.source == sourceId } return library.filter { it.source == sourceId }
.sortedBy { it.title } .sortedBy { it.originalTitle }
.map { MangaItem(it) } .map { MangaItem(it) }
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
View File

@ -30,7 +30,7 @@ import uy.kohesive.injekt.injectLazy
class SearchController( class SearchController(
private var manga: Manga? = null, private var manga: Manga? = null,
private var sources: List<CatalogueSource>? = null private var sources: List<CatalogueSource>? = null
) : GlobalSearchController(manga?.title) { ) : GlobalSearchController(manga?.originalTitle) {
private var newManga: Manga? = null private var newManga: Manga? = null
private var progress = 1 private var progress = 1

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
View File

@ -146,7 +146,7 @@ open class BrowseSourceController(bundle: Bundle) :
// SY --> // SY -->
return when (mode) { return when (mode) {
Mode.CATALOGUE -> presenter.source.name Mode.CATALOGUE -> presenter.source.name
Mode.RECOMMENDS -> recommendsConfig!!.manga.title Mode.RECOMMENDS -> recommendsConfig!!.manga.originalTitle
} }
// SY <-- // SY <--
} }
@ -712,7 +712,7 @@ open class BrowseSourceController(bundle: Bundle) :
) )
} }
} }
Mode.RECOMMENDS -> openSmartSearch(item.manga.title) Mode.RECOMMENDS -> openSmartSearch(item.manga.originalTitle)
} }
// SY <-- // SY <--
return false return false

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/RecommendsPager.kt
View File

@ -282,7 +282,7 @@ open class RecommendsPager(
private fun getRecs(api: API) { private fun getRecs(api: API) {
Timber.tag("RECOMMENDATIONS").d("USING > %s", api.toString()) 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) { if (error != null) {
handleError(error) handleError(error)
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
View File

@ -258,7 +258,7 @@ class MangaInfoController(private val fromSource: Boolean = false) :
// EXH --> // EXH -->
private fun openSmartSearch() { 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( parentController?.router?.pushController(
SourceController( SourceController(

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
View File

@ -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) copyFrom(originalManga)
favorite = true favorite = true
last_update = originalManga.last_update last_update = originalManga.last_update

2
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
View File

@ -84,7 +84,7 @@ class TrackSearchDialog : DialogController {
// Do an initial search based on the manga's title // Do an initial search based on the manga's title
if (savedState == null) { if (savedState == null) {
val title = trackController.presenter.manga.title val title = trackController.presenter.manga.originalTitle
view.track_search.append(title) view.track_search.append(title)
search(title) search(title)
} }

2
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt
View File

@ -77,7 +77,7 @@ object ChapterRecognition {
} }
// Remove manga title from chapter title. // 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. // Check if first value is number after title remove.
if (updateChapter(withoutManga.find(nameWithoutManga), chapter)) { if (updateChapter(withoutManga.find(nameWithoutManga), chapter)) {

2
app/src/main/java/exh/favorites/LocalFavoritesStorage.kt
View File

@ -120,7 +120,7 @@ class LocalFavoritesStorage {
validateDbManga(it.second) validateDbManga(it.second)
}.mapNotNull { }.mapNotNull {
FavoriteEntry().apply { FavoriteEntry().apply {
title = it.second.title title = it.second.originalTitle
gid = EHentaiSearchMetadata.galleryId(it.second.url) gid = EHentaiSearchMetadata.galleryId(it.second.url)
token = EHentaiSearchMetadata.galleryToken(it.second.url) token = EHentaiSearchMetadata.galleryToken(it.second.url)
category = it.first category = it.first

4
app/src/main/java/exh/smartsearch/SmartSearchEngine.kt
View File

@ -42,7 +42,7 @@ class SmartSearchEngine(
.toSingle().await(Schedulers.io()) .toSingle().await(Schedulers.io())
searchResults.mangas.map { searchResults.mangas.map {
val cleanedMangaTitle = cleanSmartSearchTitle(it.title) val cleanedMangaTitle = cleanSmartSearchTitle(it.originalTitle)
val normalizedDistance = normalizedLevenshtein.similarity(cleanedTitle, cleanedMangaTitle) val normalizedDistance = normalizedLevenshtein.similarity(cleanedTitle, cleanedMangaTitle)
SearchEntry(it, normalizedDistance) SearchEntry(it, normalizedDistance)
}.filter { (_, normalizedDistance) -> }.filter { (_, normalizedDistance) ->
@ -67,7 +67,7 @@ class SmartSearchEngine(
} }
searchResults.mangas.map { searchResults.mangas.map {
val normalizedDistance = normalizedLevenshtein.similarity(title, it.title) val normalizedDistance = normalizedLevenshtein.similarity(title, it.originalTitle)
SearchEntry(it, normalizedDistance) SearchEntry(it, normalizedDistance)
}.filter { (_, normalizedDistance) -> }.filter { (_, normalizedDistance) ->
normalizedDistance >= MIN_NORMAL_ELIGIBLE_THRESHOLD normalizedDistance >= MIN_NORMAL_ELIGIBLE_THRESHOLD