kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-14 09:57:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improved the books() method to properly return the new books along with the old saved books.

Browse Source
This commit is contained in:
MohitMaliFtechiz 2024-08-25 16:35:27 +05:30
parent 4e3f66243b
commit 1cdd683e79
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/main/java/org/kiwix/kiwixmobile/core/dao/NewBookDao.kt
View File

@ -31,7 +31,19 @@ import javax.inject.Inject
class NewBookDao @Inject constructor(private val box: Box<BookOnDiskEntity>) { class NewBookDao @Inject constructor(private val box: Box<BookOnDiskEntity>) {
fun books() = box.asFlowable() fun books() = box.asFlowable()
.doOnNext(::removeBooksThatDoNotExist) .map { books ->
books.map { bookOnDiskEntity ->
bookOnDiskEntity.file.let { file ->
// set zimReaderSource for previously saved books
val zimReaderSource = ZimReaderSource(file)
if (zimReaderSource.canOpenInLibkiwix()) {
bookOnDiskEntity.zimReaderSource = zimReaderSource
}
}
bookOnDiskEntity
}
}
.doOnNext { removeBooksThatDoNotExist(it.toMutableList()) }
.map { books -> books.filter { it.zimReaderSource.exists() } } .map { books -> books.filter { it.zimReaderSource.exists() } }
.map { it.map(::BookOnDisk) } .map { it.map(::BookOnDisk) }
@ -92,7 +104,7 @@ class NewBookDao @Inject constructor(private val box: Box<BookOnDiskEntity>) {
} }
private fun removeBooksThatDoNotExist(books: MutableList<BookOnDiskEntity>) { private fun removeBooksThatDoNotExist(books: MutableList<BookOnDiskEntity>) {
delete(books.filterNot { it.zimReaderSource.exists() || it.file.exists() }) delete(books.filterNot { it.zimReaderSource.exists() })
} }
private fun delete(books: List<BookOnDiskEntity>) { private fun delete(books: List<BookOnDiskEntity>) {