|
|
@@ -12,7 +12,6 @@ import io.legado.app.constant.AppPattern
|
|
|
import io.legado.app.constant.BookSourceType
|
|
|
import io.legado.app.constant.BookType
|
|
|
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.entities.Book
|
|
|
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) {
|
|
|
execute {
|
|
|
- ArchiveUtils.deCompress(archiveFileUri, defaultBookTreeUri!!).list {
|
|
|
+ ArchiveUtils.deCompress(archiveFileUri).list {
|
|
|
AppPattern.bookFileRegex.matches(it.name)
|
|
|
} ?: emptyList()
|
|
|
}.onError {
|
|
|
@@ -286,7 +285,11 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
|
|
|
}
|
|
|
|
|
|
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>) {
|