Always save articles on feed add

jocmp · Sep 10, 2024 · eda7e09 · eda7e09
1 parent a9bbe3f
commit eda7e09
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/app/src/main/java/com/capyreader/app/ui/articles/ArticleLayout.kt b/app/src/main/java/com/capyreader/app/ui/articles/ArticleLayout.kt
@@ -184,8 +184,6 @@ fun ArticleLayout(
             openNextList()
 
             showSnackbar(addFeedSuccessMessage)
-
-            refreshFeeds()
         }
     }
 

diff --git a/capy/src/main/java/com/jocmp/capy/Account.kt b/capy/src/main/java/com/jocmp/capy/Account.kt
@@ -19,7 +19,6 @@ import com.jocmp.feedbinclient.Feedbin
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import java.io.File
 import java.io.InputStream
 import java.net.URI
 import java.time.ZonedDateTime

diff --git a/capy/src/main/java/com/jocmp/capy/accounts/FeedbinAccountDelegate.kt b/capy/src/main/java/com/jocmp/capy/accounts/FeedbinAccountDelegate.kt
@@ -24,6 +24,7 @@ import com.jocmp.feedbinclient.Subscription
 import com.jocmp.feedbinclient.UnreadEntriesRequest
 import com.jocmp.feedbinclient.UpdateSubscriptionRequest
 import com.jocmp.feedbinclient.pagingInfo
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
@@ -162,6 +163,10 @@ internal class FeedbinAccountDelegate(
                 val feed = feedRecords.findBy(subscription.feed_id.toString())
 
                 if (feed != null) {
+                    coroutineScope {
+                        launch(Dispatchers.IO) { refreshFeeds() }
+                    }
+
                     AddFeedResult.Success(feed)
                 } else {
                     AddFeedResult.Failure(AddFeedError.SaveFailure())

diff --git a/capy/src/main/java/com/jocmp/capy/accounts/LocalAccountDelegate.kt b/capy/src/main/java/com/jocmp/capy/accounts/LocalAccountDelegate.kt
@@ -13,6 +13,7 @@ import com.jocmp.capy.persistence.TaggingRecords
 import com.jocmp.feedfinder.DefaultFeedFinder
 import com.jocmp.feedfinder.FeedFinder
 import com.prof18.rssparser.model.RssItem
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
@@ -62,6 +63,7 @@ class LocalAccountDelegate(
 
                 return if (feed != null) {
                     upsertFolders(feed, folderTitles)
+                    saveArticles(resultFeed.items, cutoffDate = null, feed = feed)
 
                     AddFeedResult.Success(feed)
                 } else {

diff --git a/feedfinder/src/main/java/com/jocmp/feedfinder/parser/Feed.kt b/feedfinder/src/main/java/com/jocmp/feedfinder/parser/Feed.kt
@@ -1,5 +1,6 @@
 package com.jocmp.feedfinder.parser
 
+import com.prof18.rssparser.model.RssItem
 import java.net.URL
 
 interface Feed {
@@ -12,4 +13,6 @@ interface Feed {
     val siteURL: URL?
 
     val faviconURL: URL?
+
+    val items: List<RssItem>
 }
diff --git a/feedfinder/src/main/java/com/jocmp/feedfinder/parser/XMLFeed.kt b/feedfinder/src/main/java/com/jocmp/feedfinder/parser/XMLFeed.kt
@@ -3,6 +3,7 @@ package com.jocmp.feedfinder.parser
 import com.jocmp.feedfinder.optionalURL
 import com.prof18.rssparser.RssParser
 import com.prof18.rssparser.model.RssChannel
+import com.prof18.rssparser.model.RssItem
 import java.net.URL
 
 internal class XMLFeed(
@@ -24,6 +25,9 @@ internal class XMLFeed(
     override val faviconURL: URL?
         get() = channel?.image?.url?.let { optionalURL(it) }
 
+    override val items: List<RssItem>
+        get() = channel?.items.orEmpty()
+
     private fun hasEntries(): Boolean {
         return channel != null &&
                 channel.items.isNotEmpty()
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,8 +184,6 @@ fun ArticleLayout( @@
                 openNextList()
                 showSnackbar(addFeedSuccessMessage)
-                refreshFeeds()
             }
         }
@@ Expand Down @@