From a5fbce7963b8c5158fa03a419599130f1e534139 Mon Sep 17 00:00:00 2001 From: gedoor Date: Sun, 26 Dec 2021 20:44: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 --- .../legado/app/model/localBook/LocalBook.kt | 22 +++++++++------ .../io/legado/app/model/localBook/TextFile.kt | 28 +++++++++++++------ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt index e38b89c1a..e0f9fa293 100644 --- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt +++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt @@ -44,16 +44,20 @@ object LocalBook { } fun getContent(book: Book, chapter: BookChapter): String? { - return when { - book.isEpub() -> { - EpubFile.getContent(book, chapter) - } - book.isUmd() -> { - UmdFile.getContent(book, chapter) - } - else -> { - TextFile.getContent(book, chapter) + return try { + when { + book.isEpub() -> { + EpubFile.getContent(book, chapter) + } + book.isUmd() -> { + UmdFile.getContent(book, chapter) + } + else -> { + TextFile.getContent(book, chapter) + } } + } catch (e: Exception) { + e.localizedMessage } } diff --git a/app/src/main/java/io/legado/app/model/localBook/TextFile.kt b/app/src/main/java/io/legado/app/model/localBook/TextFile.kt index 166a9c90c..a0eeb4d43 100644 --- a/app/src/main/java/io/legado/app/model/localBook/TextFile.kt +++ b/app/src/main/java/io/legado/app/model/localBook/TextFile.kt @@ -1,6 +1,8 @@ package io.legado.app.model.localBook import android.net.Uri +import android.system.Os +import androidx.documentfile.provider.DocumentFile import io.legado.app.data.appDb import io.legado.app.data.entities.Book import io.legado.app.data.entities.BookChapter @@ -8,8 +10,7 @@ import io.legado.app.data.entities.TxtTocRule import io.legado.app.help.DefaultData import io.legado.app.utils.* import splitties.init.appCtx -import java.io.File -import java.io.RandomAccessFile +import java.io.* import java.nio.charset.Charset import java.util.regex.Matcher import java.util.regex.Pattern @@ -253,22 +254,33 @@ class TextFile(private val book: Book) { return TextFile(book).getChapterList() } + @Throws(FileNotFoundException::class) fun getContent(book: Book, bookChapter: BookChapter): String { - val bookFile = getBookFile(book) - //获取文件流 - val bookStream = RandomAccessFile(bookFile, "r") - val content = ByteArray((bookChapter.end!! - bookChapter.start!!).toInt()) - bookStream.seek(bookChapter.start!!) - bookStream.read(content) + val count = (bookChapter.end!! - bookChapter.start!!).toInt() + val content = ByteArray(count) + Os.read(getBookFD(book), content, bookChapter.start!!.toInt(), count) return String(content, book.fileCharset()) .substringAfter(bookChapter.title) .replace("^[\\n\\s]+".toRegex(), "  ") } + @Throws(FileNotFoundException::class) + private fun getBookFD(book: Book): FileDescriptor? { + if (book.bookUrl.isContentScheme()) { + val uri = Uri.parse(book.bookUrl) + return appCtx.contentResolver.openFileDescriptor(uri, "r")?.fileDescriptor + } + return FileInputStream(File(book.bookUrl)).fd + } + private fun getBookFile(book: Book): File { if (book.bookUrl.isContentScheme()) { val uri = Uri.parse(book.bookUrl) val bookFile = LocalBook.cacheFolder.getFile(book.originName) + val doc = DocumentFile.fromSingleUri(appCtx, uri)!! + if (bookFile.exists() && bookFile.lastModified() >= doc.lastModified()) { + return bookFile + } if (!bookFile.exists()) { bookFile.createNewFile() DocumentUtils.readBytes(appCtx, uri).let {