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

Rename downloaded chapters (#3216)

Browse Source 
(cherry picked from commit 0fccbbc0ca28c8a026a9dbf595cd59110c492ed9)
This commit is contained in:
Chris Allan 2020-05-20 19:42:30 -07:00 committed by Jobobby04
parent 19dc859ef2
commit 60706e8b8b
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
View File

@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.model.Page
import rx.Observable
import timber.log.Timber
import uy.kohesive.injekt.injectLazy
/**
@ -239,4 +240,26 @@ class DownloadManager(private val context: Context) {
deleteChapters(chapters, manga, source)
}
}
/**
* Renames an already downloaded chapter
*
* @param source the source of the manga.
* @param manga the manga of the chapter.
* @param oldChapter the existing chapter with the old name.
* @param newChapter the target chapter with the new name.
*/
fun renameChapter(source: Source, manga: Manga, oldChapter: Chapter, newChapter: Chapter) {
val oldName = provider.getChapterDirName(oldChapter)
val newName = provider.getChapterDirName(newChapter)
val mangaDir = provider.getMangaDir(manga, source)
val oldFolder = mangaDir.findFile(oldName)
if (oldFolder?.renameTo(newName) == true) {
cache.removeChapter(oldChapter, manga)
cache.addChapter(newName, mangaDir, manga)
} else {
Timber.e("Could not rename downloaded chapter: %s.", oldName)
}
}
}

8
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.util.chapter
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.database.models.Chapter
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.download.DownloadManager
import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.online.HttpSource
@ -10,6 +11,8 @@ import exh.EH_SOURCE_ID
import exh.EXH_SOURCE_ID
import java.util.Date
import java.util.TreeSet
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
/**
* Helper method for syncing the list of chapters from the source with the ones from the database.
@ -30,6 +33,8 @@ fun syncChaptersWithSource(
throw Exception("No chapters found")
}
val downloadManager: DownloadManager = Injekt.get()
// Chapters from db.
val dbChapters = db.getChapters(manga).executeAsBlocking()
@ -62,6 +67,9 @@ fun syncChaptersWithSource(
ChapterRecognition.parseChapterNumber(sourceChapter, manga)
if (shouldUpdateDbChapter(dbChapter, sourceChapter)) {
if (dbChapter.name != sourceChapter.name && downloadManager.isChapterDownloaded(dbChapter, manga)) {
downloadManager.renameChapter(source, manga, dbChapter, sourceChapter)
}
dbChapter.scanlator = sourceChapter.scanlator
dbChapter.name = sourceChapter.name
dbChapter.date_upload = sourceChapter.date_upload