github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix chapter download with empty scanlator (#7844)

Browse source
This commit is contained in:
stevenyomi 2022-08-25 05:19:01 +08:00 committed by GitHub
parent a70b848646
commit 4b9a6541d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadProvider.kt
View file

@ -139,14 +139,15 @@ class DownloadProvider(private val context: Context) {
fun getChapterDirName(chapterName: String, chapterScanlator: String?): String { fun getChapterDirName(chapterName: String, chapterScanlator: String?): String {
return DiskUtil.buildValidFilename( return DiskUtil.buildValidFilename(
when { when {
chapterScanlator != null -> "${chapterScanlator}_$chapterName" chapterScanlator.isNullOrBlank().not() -> "${chapterScanlator}_$chapterName"
else -> chapterName else -> chapterName
}, },
) )
} }
fun isChapterDirNameChanged(oldChapter: DomainChapter, newChapter: DomainChapter): Boolean { fun isChapterDirNameChanged(oldChapter: DomainChapter, newChapter: DomainChapter): Boolean {
return oldChapter.name != newChapter.name || oldChapter.scanlator != newChapter.scanlator return oldChapter.name != newChapter.name ||
oldChapter.scanlator?.takeIf { it.isNotBlank() } != newChapter.scanlator?.takeIf { it.isNotBlank() }
} }
/** /**
@ -164,7 +165,7 @@ class DownloadProvider(private val context: Context) {
// Archived chapters // Archived chapters
add("$chapterDirName.cbz") add("$chapterDirName.cbz")
if (chapterScanlator == null) { if (chapterScanlator.isNullOrBlank()) {
// Previously null scanlator fields were converted to "" due to a bug // Previously null scanlator fields were converted to "" due to a bug
add("_$chapterDirName") add("_$chapterDirName")
add("_$chapterDirName.cbz") add("_$chapterDirName.cbz")