yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Don't validate the page number and extension when saving a page

Browse Source
This commit is contained in:
len 2016-11-26 12:34:54 +01:00
parent ea790faeb3
commit bb89b72a81
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,8 +578,9 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
// Build destination file. // Build destination file.
val ext = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg" val ext = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg"
val filename = "${manga.title} - ${chapter.name} - ${page.index + 1}" val filename = DiskUtil.buildValidFilename(
val destFile = File(destDir, DiskUtil.buildValidFilename(filename) + ".$ext") "${manga.title} - ${chapter.name}") + " - ${page.index + 1}.$ext"
val destFile = File(destDir, filename)
context.contentResolver.openInputStream(page.uri).use { input -> context.contentResolver.openInputStream(page.uri).use { input ->
destFile.outputStream().use { output -> destFile.outputStream().use { output ->

4
app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
View File

@ -50,8 +50,8 @@ object DiskUtil {
} }
} }
// Even though vfat allows 255 UCS-2 chars, we might eventually write to // Even though vfat allows 255 UCS-2 chars, we might eventually write to
// ext4 through a FUSE layer, so use that limit minus 5 reserved characters. // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
return sb.toString().take(250) return sb.toString().take(240)
} }
/** /**