From 051f958199bd1f85588b45131c05d13d7c16873c Mon Sep 17 00:00:00 2001 From: kunfei Date: Tue, 1 Feb 2022 18:23:22 +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 --- .../java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt | 2 +- app/src/main/java/io/legado/app/model/localBook/TextFile.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt index 05851b423..161bde603 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByRegex.kt @@ -45,7 +45,7 @@ object AnalyzeByRegex { // 新建容器 val info = arrayListOf() for (groupIndex in 0..resM.groupCount()) { - info.add(resM.group(groupIndex)!!) + info.add(resM.group(groupIndex) ?: "") } books.add(info) } while (resM.find()) 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 ed8879eaa..1db2093df 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 @@ -124,7 +124,6 @@ class TextFile(private val book: Book) { val chapterStart = matcher.start() //获取章节内容 val chapterContent = blockContent.substring(seekPos, chapterStart) - var mChapterContent = chapterContent val chapterLength = chapterContent.toByteArray(charset).size val lastStart = toc.lastOrNull()?.start ?: curOffset if (curOffset + chapterLength - lastStart > 50000) { @@ -151,7 +150,7 @@ class TextFile(private val book: Book) { } else { //否则就block分割之后，上一个章节的剩余内容 //获取上一章节 val lastChapter = toc.last() - toc.last().isVolume = mChapterContent.substringAfter(lastChapter.title).isBlank() + toc.last().isVolume = chapterContent.substringAfter(lastChapter.title).isBlank() //将当前段落添加上一章去 lastChapter.end = lastChapter.end!! + chapterLength.toLong() @@ -165,7 +164,7 @@ class TextFile(private val book: Book) { if (toc.isNotEmpty()) { //获取章节内容 //获取上一章节 val lastChapter = toc.last() - toc.last().isVolume = mChapterContent.substringAfter(lastChapter.title).isBlank() + toc.last().isVolume = chapterContent.substringAfter(lastChapter.title).isBlank() lastChapter.end = lastChapter.start!! + chapterContent.toByteArray(charset).size.toLong() //创建当前章节