Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add all highlights before inserting cross refs

Browse Source
This commit is contained in:
Jackson Harper
2023-05-06 00:06:24 +08:00
parent 135ecbaa11
commit bf4b3d5b79
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/Omnivore/app/build.gradle
View File

@ -17,8 +17,8 @@ android {
applicationId "app.omnivore.omnivore"
minSdk 26
targetSdk 33
versionCode 61
versionName "0.0.61"
versionCode 66
versionName "0.0.66"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {

1
android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/Highlight.kt
View File

@ -34,7 +34,6 @@ data class Highlight(
entity = Highlight::class,
parentColumns = arrayOf("highlightId"),
childColumns = arrayOf("highlightId"),
onDelete = ForeignKey.CASCADE
),
ForeignKey(
entity = SavedItem::class,

6
android/Omnivore/app/src/main/java/app/omnivore/omnivore/persistence/entities/SavedItem.kt
View File

@ -1,5 +1,6 @@
package app.omnivore.omnivore.persistence.entities
import android.util.Log
import androidx.core.net.toUri
import androidx.lifecycle.LiveData
import androidx.room.*
@ -90,7 +91,6 @@ abstract class SavedItemWithLabelsAndHighlightsDao {
@Insert(onConflict = OnConflictStrategy.REPLACE)
abstract fun insertHighlightCrossRefs(items: List<SavedItemAndHighlightCrossRef>)
@Transaction
open fun insertAll(savedItems: List<SavedItemWithLabelsAndHighlights>) {
insertSavedItems(savedItems.map { it.savedItem })
@ -103,6 +103,7 @@ abstract class SavedItemWithLabelsAndHighlightsDao {
for (searchItem in savedItems) {
labels.addAll(searchItem.labels)
highlights.addAll(searchItem.highlights)
val newLabelCrossRefs = searchItem.labels.map {
SavedItemAndSavedItemLabelCrossRef(savedItemLabelId = it.savedItemLabelId, savedItemId = searchItem.savedItem.savedItemId)
@ -190,7 +191,7 @@ interface SavedItemDao {
fun _filteredLibraryData(allowedArchiveStates: List<Int>, sortKey: String, hasRequiredLabels: Int, hasExcludedLabels: Int, requiredLabels: List<String>, excludedLabels: List<String>, allowedContentReaders: List<String>): LiveData<List<SavedItemWithLabelsAndHighlights>>
fun filteredLibraryData(allowedArchiveStates: List<Int>, sortKey: String, requiredLabels: List<String>, excludedLabels: List<String>, allowedContentReaders: List<String>): LiveData<List<SavedItemWithLabelsAndHighlights>> {
return _filteredLibraryData(
val result = _filteredLibraryData(
allowedArchiveStates = allowedArchiveStates,
sortKey = sortKey,
hasRequiredLabels = requiredLabels.size,
@ -199,6 +200,7 @@ interface SavedItemDao {
excludedLabels = excludedLabels,
allowedContentReaders = allowedContentReaders
)
return result
}
}