Refresh articles based on filter

jocmp · Dec 30, 2023 · 3bb432e · 3bb432e
1 parent 1dcee77
commit 3bb432e
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 51 deletions.
diff --git a/app/src/main/java/com/jocmp/basilreader/ui/accounts/AccountViewModel.kt b/app/src/main/java/com/jocmp/basilreader/ui/accounts/AccountViewModel.kt
@@ -82,9 +82,11 @@ class AccountViewModel(
     }
 
     suspend fun refreshFeed() {
-//        val id = feedID.value ?: return
-//
-//        account?.refreshFeed(id)
+        when (val currentFilter = filter.value) {
+            is ArticleFilter.Feeds -> account?.refreshFeed(currentFilter.feed)
+            is ArticleFilter.Folders ->  account?.refreshFeeds(currentFilter.folder.feeds)
+            is ArticleFilter.Articles -> account?.refreshAll()
+        }
     }
 
     fun selectArticle(articleID: String) {

diff --git a/basil/src/main/java/com/jocmp/basil/Account.kt b/basil/src/main/java/com/jocmp/basil/Account.kt
@@ -5,6 +5,7 @@ import com.jocmp.basil.accounts.LocalAccountDelegate
 import com.jocmp.basil.accounts.ParsedItem
 import com.jocmp.basil.accounts.asOPML
 import com.jocmp.basil.db.Database
+import com.jocmp.basil.db.Feeds
 import com.jocmp.basil.opml.Outline
 import com.jocmp.basil.opml.asFeed
 import com.jocmp.basil.opml.asFolder
@@ -13,6 +14,8 @@ import com.jocmp.basil.persistence.articleMapper
 import com.jocmp.basil.shared.nowUTC
 import com.jocmp.feedfinder.FeedFinder
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -115,12 +118,18 @@ data class Account(
         return Result.success(feed)
     }
 
-    suspend fun refreshFeed(feedID: String) {
-        val feed = flattenedFeeds.find { it.id == feedID } ?: return
+    suspend fun refreshAll() {
+        refreshCompactedFeeds(flattenedFeeds)
+    }
+
+    suspend fun refreshFeed(feed: Feed) {
+        refreshFeeds(listOf(feed))
+    }
 
-        val items = delegate.fetchAll(feed)
+    suspend fun refreshFeeds(feeds: List<Feed>) {
+        val ids = feeds.map { it.id }.toSet()
 
-        updateArticles(feed, items)
+        refreshCompactedFeeds(flattenedFeeds.filter { ids.contains(it.id) })
     }
 
     fun findFeed(feedID: String): Feed? {
@@ -144,20 +153,38 @@ data class Account(
         items.forEach { item ->
             val publishedAt = item.publishedAt?.toEpochSecond()
 
-            database.articlesQueries.create(
-                feed_id = feed.primaryKey,
-                external_id = item.externalID,
-                title = item.title,
-                content_html = item.contentHTML,
-                url = item.url,
-                summary = item.summary,
-                image_url = item.imageURL,
-                published_at = publishedAt,
-                arrived_at = publishedAt ?: nowUTC()
-            )
+            database.transaction {
+                database.articlesQueries.create(
+                    feed_id = feed.primaryKey,
+                    external_id = item.externalID,
+                    title = item.title,
+                    content_html = item.contentHTML,
+                    url = item.url,
+                    summary = item.summary,
+                    image_url = item.imageURL,
+                    published_at = publishedAt,
+                )
+
+                database.articlesQueries.updateStatus(
+                    feed_id = feed.primaryKey,
+                    external_id = item.externalID,
+                    arrived_at = publishedAt ?: nowUTC()
+                )
+            }
+
         }
     }
 
+    private suspend fun refreshCompactedFeeds(feeds: Collection<Feed>) =
+        withContext(Dispatchers.IO) {
+            feeds.map { feed ->
+                async {
+                    val items = delegate.fetchAll(feed)
+                    updateArticles(feed, items)
+                }
+            }.awaitAll()
+        }
+
     private fun entrySiteURL(url: URL?): String {
         return url?.toString() ?: ""
     }

diff --git a/basil/src/main/sqldelight/com/jocmp/basil/db/article_statuses.sq b/basil/src/main/sqldelight/com/jocmp/basil/db/article_statuses.sq
@@ -2,7 +2,7 @@ import kotlin.Boolean;
 
 CREATE TABLE article_statuses (
   feed_id INTEGER NOT NULL REFERENCES feeds(id),
-  external_id INTEGER NOT NULL REFERENCES articles(external_id),
+  external_id TEXT NOT NULL REFERENCES articles(external_id),
   read INTEGER AS Boolean DEFAULT 0,
   starred INTEGER AS Boolean DEFAULT 0,
   arrived_at INTEGER NOT NULL,

diff --git a/basil/src/main/sqldelight/com/jocmp/basil/db/articles.sq b/basil/src/main/sqldelight/com/jocmp/basil/db/articles.sq
@@ -65,36 +65,36 @@ JOIN article_statuses ON articles.external_id = article_statuses.external_id AND
 WHERE articles.id = :articleID
 LIMIT 1;
 
-create {
-    REPLACE INTO articles(
-        feed_id,
-        external_id,
-        title,
-        content_html,
-        url,
-        summary,
-        image_url,
-        published_at
-    )
-    VALUES (
-    :feed_id,
-  :external_id,
-    :title,
-    :content_html,
-    :url,
-    :summary,
-    :image_url,
-    :published_at
-    );
+create:
+INSERT OR IGNORE INTO articles(
+    feed_id,
+    external_id,
+    title,
+    content_html,
+    url,
+    summary,
+    image_url,
+    published_at
+)
+VALUES (
+:feed_id,
+:external_id,
+:title,
+:content_html,
+:url,
+:summary,
+:image_url,
+:published_at
+);
 
-    INSERT OR IGNORE INTO article_statuses(
-      feed_id,
-      external_id,
-      arrived_at
-    )
-    VALUES (
-    :feed_id,
-    :external_id,
-    :arrived_at
-    );
-}
+updateStatus:
+INSERT OR IGNORE INTO article_statuses(
+  feed_id,
+  external_id,
+  arrived_at
+)
+VALUES (
+:feed_id,
+:external_id,
+:arrived_at
+);