yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

文件类书源解压位置改到保存书籍目录的地方

Browse Source
This commit is contained in:
Xwite
2023-03-13 18:23:46 +08:00
parent a76d160f13
commit 1970abff13
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
+1
View File
@@ -160,6 +160,7 @@ object LocalBook {
//updateTime变量不要修改,否则会导致读取不到缓存 //updateTime变量不要修改,否则会导致读取不到缓存
val (fileName, _, _, updateTime, _) = FileDoc.fromUri(uri, false).apply { val (fileName, _, _, updateTime, _) = FileDoc.fromUri(uri, false).apply {
if (size == 0L) throw EmptyFileException("Unexpected empty File") if (size == 0L) throw EmptyFileException("Unexpected empty File")
bookUrl = toString() bookUrl = toString()
} }
var book = appDb.bookDao.getBook(bookUrl) var book = appDb.bookDao.getBook(bookUrl)
app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
+6 -3
View File
@@ -12,7 +12,6 @@ import io.legado.app.constant.AppPattern
import io.legado.app.constant.BookSourceType import io.legado.app.constant.BookSourceType
import io.legado.app.constant.BookType import io.legado.app.constant.BookType
import io.legado.app.constant.EventBus import io.legado.app.constant.EventBus
import io.legado.app.help.config.AppConfig.defaultBookTreeUri
import io.legado.app.data.appDb import io.legado.app.data.appDb
import io.legado.app.data.entities.Book import io.legado.app.data.entities.Book
import io.legado.app.data.entities.BookChapter import io.legado.app.data.entities.BookChapter
@@ -275,7 +274,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
fun deCompress(archiveFileUri: Uri, onSuccess: (List<FileDoc>) -> Unit) { fun deCompress(archiveFileUri: Uri, onSuccess: (List<FileDoc>) -> Unit) {
execute { execute {
ArchiveUtils.deCompress(archiveFileUri, defaultBookTreeUri!!).list { ArchiveUtils.deCompress(archiveFileUri).list {
AppPattern.bookFileRegex.matches(it.name) AppPattern.bookFileRegex.matches(it.name)
} ?: emptyList() } ?: emptyList()
}.onError { }.onError {
@@ -286,7 +285,11 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
} }
fun importBook(fileDoc: FileDoc) { fun importBook(fileDoc: FileDoc) {
LocalBook.importFile(fileDoc.uri).let { changeToLocalBook(it) } val uri = LocalBook.saveBookFile(
fileDoc.uri.inputstream(context),
fileDoc.name
)
LocalBook.importFile(uri).let { changeToLocalBook(it) }
} }
fun changeTo(source: BookSource, book: Book, toc: List<BookChapter>) { fun changeTo(source: BookSource, book: Book, toc: List<BookChapter>) {