From 43d3b981df594f41f3469776be8dd869db875704 Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 28 Jan 2020 20:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/help/BookHelp.kt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/BookHelp.kt b/app/src/main/java/io/legado/app/help/BookHelp.kt index ff5ee0b7d..9225cf0ac 100644 --- a/app/src/main/java/io/legado/app/help/BookHelp.kt +++ b/app/src/main/java/io/legado/app/help/BookHelp.kt @@ -1,5 +1,6 @@ package io.legado.app.help +import android.net.Uri import io.legado.app.App import io.legado.app.constant.PreferKey import io.legado.app.data.entities.Book @@ -26,6 +27,16 @@ object BookHelp { ?: App.INSTANCE.cacheDir.absolutePath } + private val dwnloadUri get() = Uri.parse(downloadPath) + + private fun bookFolderName(book: Book): String { + return formatFolderName(book.name) + MD5Utils.md5Encode16(book.bookUrl) + } + + private fun bookChapterName(bookChapter: BookChapter): String { + return String.format("%05d-%s", bookChapter.index, MD5Utils.md5Encode(bookChapter.title)) + } + private fun getBookCachePath(): String { return "$downloadPath${File.separator}book_cache" } @@ -86,14 +97,11 @@ object BookHelp { } private fun getBookFolder(book: Book): String { - val bookFolder = formatFolderName(book.name + MD5Utils.md5Encode16(book.bookUrl)) - return "${getBookCachePath()}${File.separator}$bookFolder" + return "${getBookCachePath()}${File.separator}${bookFolderName(book)}" } private fun getChapterPath(book: Book, bookChapter: BookChapter): String { - val chapterFile = - String.format("%05d-%s", bookChapter.index, MD5Utils.md5Encode(bookChapter.title)) - return "${getBookFolder(book)}${File.separator}$chapterFile.nb" + return "${getBookFolder(book)}${File.separator}${bookChapterName(bookChapter)}.nb" } private fun formatFolderName(folderName: String): String {