Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 12:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix filename not having chapter title and page when sharing (#6827)

Browse Source
This commit is contained in:
Andreas 2022-03-26 17:40:29 +01:00 committed by GitHub
parent c581b9eeb9
commit f8eb9f94f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -565,6 +565,20 @@ class ReaderPresenter(
}) })
} }
/**
* Generate a filename for the given [manga] and [page]
*/
private fun generateFilename(
manga: Manga,
page: ReaderPage,
): String {
val chapter = page.chapter.chapter
val filenameSuffix = " - ${page.number}"
return DiskUtil.buildValidFilename(
"${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize())
) + filenameSuffix
}
/** /**
* Saves the image of this [page] on the pictures directory and notifies the UI of the result. * Saves the image of this [page] on the pictures directory and notifies the UI of the result.
* There's also a notification to allow sharing the image somewhere else or deleting it. * There's also a notification to allow sharing the image somewhere else or deleting it.
@ -577,12 +591,7 @@ class ReaderPresenter(
val notifier = SaveImageNotifier(context) val notifier = SaveImageNotifier(context)
notifier.onClear() notifier.onClear()
// Generate filename val filename = generateFilename(manga, page)
val chapter = page.chapter.chapter
val filenameSuffix = " - ${page.number}"
val filename = DiskUtil.buildValidFilename(
"${manga.title} - ${chapter.name}".takeBytes(MAX_FILE_NAME_BYTES - filenameSuffix.byteSize())
) + filenameSuffix
// Pictures directory. // Pictures directory.
val relativePath = if (preferences.folderPerManga()) DiskUtil.buildValidFilename(manga.title) else "" val relativePath = if (preferences.folderPerManga()) DiskUtil.buildValidFilename(manga.title) else ""
@ -624,13 +633,15 @@ class ReaderPresenter(
val context = Injekt.get<Application>() val context = Injekt.get<Application>()
val destDir = context.cacheImageDir val destDir = context.cacheImageDir
val filename = generateFilename(manga, page)
try { try {
presenterScope.launchIO { presenterScope.launchIO {
destDir.deleteRecursively() destDir.deleteRecursively()
val uri = imageSaver.save( val uri = imageSaver.save(
image = Image.Page( image = Image.Page(
inputStream = page.stream!!, inputStream = page.stream!!,
name = manga.title, name = filename,
location = Location.Cache location = Location.Cache
) )
) )