|
@@ -189,8 +189,6 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
|
|
|
appDb.bookChapterDao.insert(*it.toTypedArray())
|
|
appDb.bookChapterDao.insert(*it.toTypedArray())
|
|
|
chapterListData.postValue(it)
|
|
chapterListData.postValue(it)
|
|
|
}
|
|
}
|
|
|
- } else if (book.isWebFile) {
|
|
|
|
|
- chapterListData.postValue(emptyList())
|
|
|
|
|
} else {
|
|
} else {
|
|
|
bookSource?.let { bookSource ->
|
|
bookSource?.let { bookSource ->
|
|
|
val oldBook = book.copy()
|
|
val oldBook = book.copy()
|
|
@@ -276,7 +274,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
|
|
|
bookSource ?: return
|
|
bookSource ?: return
|
|
|
execute {
|
|
execute {
|
|
|
if (webFile.isSupported) {
|
|
if (webFile.isSupported) {
|
|
|
- LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource)
|
|
|
|
|
|
|
+ LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource).let {
|
|
|
|
|
+ changeToLocalBook(it)
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
LocalBook.saveBookFile(webFile.url, webFile.name, bookSource)
|
|
LocalBook.saveBookFile(webFile.url, webFile.name, bookSource)
|
|
|
}
|
|
}
|
|
@@ -401,13 +401,11 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- fun changeToLocalBook(bookUrl: String) {
|
|
|
|
|
- appDb.bookDao.getBook(bookUrl)?.let { localBook ->
|
|
|
|
|
- inBookshelf = true
|
|
|
|
|
- LocalBook.mergeBook(localBook, bookData.value).let {
|
|
|
|
|
- bookData.postValue(it)
|
|
|
|
|
- loadChapter(it)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ private fun changeToLocalBook(localBook: Book) {
|
|
|
|
|
+ inBookshelf = true
|
|
|
|
|
+ LocalBook.mergeBook(localBook, bookData.value).let {
|
|
|
|
|
+ bookData.postValue(it)
|
|
|
|
|
+ loadChapter(it)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|