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

Allow category names with different casing (fixes #3465)

Browse Source 
(cherry picked from commit 4bc228880654320fdeec3d337d4dd948c5ab1269)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
This commit is contained in:
arkon 2020-07-14 09:04:15 -04:00 committed by Jobobby04
parent 8e24797e50
commit 1ac7043163
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
View File

@ -359,7 +359,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
for (dbCategory in dbCategories) { for (dbCategory in dbCategories) {
// If the category is already in the db, assign the id to the file's category // If the category is already in the db, assign the id to the file's category
// and do nothing // and do nothing
if (category.nameLower == dbCategory.nameLower) { if (category.name == dbCategory.name) {
category.id = dbCategory.id category.id = dbCategory.id
found = true found = true
break break
@ -387,7 +387,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
val mangaCategoriesToUpdate = mutableListOf<MangaCategory>() val mangaCategoriesToUpdate = mutableListOf<MangaCategory>()
for (backupCategoryStr in categories) { for (backupCategoryStr in categories) {
for (dbCategory in dbCategories) { for (dbCategory in dbCategories) {
if (backupCategoryStr.toLowerCase() == dbCategory.nameLower) { if (backupCategoryStr == dbCategory.name) {
mangaCategoriesToUpdate.add(MangaCategory.create(manga, dbCategory)) mangaCategoriesToUpdate.add(MangaCategory.create(manga, dbCategory))
break break
} }

3
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Category.kt
View File

@ -16,9 +16,6 @@ interface Category : Serializable {
var mangaOrder: List<Long> var mangaOrder: List<Long>
// SY <-- // SY <--
val nameLower: String
get() = name.toLowerCase()
companion object { companion object {
fun create(name: String): Category = CategoryImpl().apply { fun create(name: String): Category = CategoryImpl().apply {

2
app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryPresenter.kt
View File

@ -101,6 +101,6 @@ class CategoryPresenter(
* Returns true if a category with the given name already exists. * Returns true if a category with the given name already exists.
*/ */
private fun categoryExists(name: String): Boolean { private fun categoryExists(name: String): Boolean {
return categories.any { it.name.equals(name, true) } return categories.any { it.name == name }
} }
} }