Skip to content

Commit c4a35b1

Browse files
jocmpjocmp
committed
Fetch articles under 'All' category
1 parent b7e1eaf commit c4a35b1

File tree

17 files changed

+546
-52
lines changed

17 files changed

+546
-52
lines changed

‎.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/capyreader/app/ui/accounts/AddAccountView.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ fun AddAccountView(
6969
onSelectService,
7070
source = Source.FRESHRSS
7171
)
72+
SyncServiceRow(
73+
onSelectService,
74+
source = Source.MINIFLUX
75+
)
7276
SyncServiceRow(
7377
onSelectService,
7478
source = Source.READER

‎app/src/main/java/com/capyreader/app/ui/accounts/LoginViewModel.kt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import com.capyreader.app.ui.Route
1414
import com.jocmp.capy.AccountManager
1515
import com.jocmp.capy.ClientCertManager
1616
import com.jocmp.capy.accounts.Credentials
17+
import com.jocmp.capy.accounts.Source
1718
import com.jocmp.capy.accounts.withFreshRSSPath
19+
import com.jocmp.capy.accounts.withMinifluxPath
1820
import com.jocmp.capy.common.Async
1921
import com.jocmp.capy.common.launchIO
2022
import com.jocmp.capy.common.withTrailingSeparator
@@ -107,7 +109,12 @@ class LoginViewModel(
107109
_url = _url
108110
.withProtocol
109111
.withTrailingSeparator
110-
.let { withFreshRSSPath(it, source) }
112+
.let {
113+
when (source) {
114+
Source.MINIFLUX -> withMinifluxPath(it)
115+
else -> withFreshRSSPath(it, source)
116+
}
117+
}
111118
}
112119

113120
private val credentials: Credentials

‎capy/src/main/java/com/jocmp/capy/Account.kt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ import com.jocmp.capy.accounts.Source
1111
import com.jocmp.capy.accounts.asOPML
1212
import com.jocmp.capy.accounts.feedbin.FeedbinAccountDelegate
1313
import com.jocmp.capy.accounts.feedbin.FeedbinOkHttpClient
14+
import com.jocmp.capy.accounts.forAccount
1415
import com.jocmp.capy.accounts.local.LocalAccountDelegate
16+
import com.jocmp.capy.accounts.miniflux.MinifluxAccountDelegate
1517
import com.jocmp.capy.accounts.reader.buildReaderDelegate
1618
import com.jocmp.capy.articles.ArticleContent
1719
import com.jocmp.capy.articles.UnreadSortOrder
@@ -32,6 +34,7 @@ import com.jocmp.capy.persistence.SavedSearchRecords
3234
import com.jocmp.capy.persistence.TaggingRecords
3335
import com.jocmp.feedbinclient.Feedbin
3436
import kotlinx.coroutines.Dispatchers
37+
import com.jocmp.minifluxclient.Miniflux
3538
import kotlinx.coroutines.async
3639
import kotlinx.coroutines.awaitAll
3740
import kotlinx.coroutines.flow.Flow
@@ -68,8 +71,15 @@ data class Account(
6871
)
6972
)
7073

74+
Source.MINIFLUX -> MinifluxAccountDelegate(
75+
database = database,
76+
miniflux = Miniflux.forAccount(
77+
path = cacheDirectory,
78+
preferences = preferences
79+
)
80+
)
81+
7182
Source.FRESHRSS,
72-
Source.MINIFLUX,
7383
Source.READER -> buildReaderDelegate(
7484
source = source,
7585
database = database,

‎capy/src/main/java/com/jocmp/capy/accounts/Credentials.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.jocmp.capy.accounts
22

33
import com.jocmp.capy.ClientCertManager
44
import com.jocmp.capy.accounts.feedbin.FeedbinCredentials
5+
import com.jocmp.capy.accounts.miniflux.MinifluxCredentials
56
import com.jocmp.capy.accounts.reader.ReaderCredentials
67
import com.jocmp.capy.common.optionalURL
78

@@ -25,8 +26,12 @@ interface Credentials {
2526
): Credentials {
2627
return when (source) {
2728
Source.FEEDBIN -> FeedbinCredentials(username, password)
29+
Source.MINIFLUX -> MinifluxCredentials(
30+
username = username,
31+
secret = password,
32+
url = normalizeURL(url)
33+
)
2834
Source.FRESHRSS,
29-
Source.MINIFLUX,
3035
Source.READER -> ReaderCredentials(
3136
username,
3237
password,

‎capy/src/main/java/com/jocmp/capy/accounts/MinifluxExt.kt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.jocmp.capy.accounts
2+
3+
import com.jocmp.capy.AccountPreferences
4+
import com.jocmp.capy.accounts.miniflux.MinifluxOkHttpClient
5+
import com.jocmp.minifluxclient.Miniflux
6+
import java.net.URI
7+
8+
9+
fun Miniflux.Companion.forAccount(path: URI, preferences: AccountPreferences) =
10+
create(
11+
client = MinifluxOkHttpClient.forAccount(path, preferences),
12+
baseURL = preferences.url.get()
13+
)
14+
15+
fun withMinifluxPath(url: String): String {
16+
return if (url.endsWith("/v1") || url.endsWith("/v1/")) {
17+
url
18+
} else {
19+
url.trimEnd('/') + "/v1/"
20+
}
21+
}

‎capy/src/main/java/com/jocmp/capy/accounts/miniflux/MinifluxAccountDelegate.kt‎

Lines changed: 54 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ import com.jocmp.capy.accounts.AddFeedResult
77
import com.jocmp.capy.accounts.withErrorHandling
88
import com.jocmp.capy.common.TimeHelpers
99
import com.jocmp.capy.common.UnauthorizedError
10-
import com.jocmp.capy.common.host
1110
import com.jocmp.capy.common.toDateTime
1211
import com.jocmp.capy.common.transactionWithErrorHandling
1312
import com.jocmp.capy.common.withResult
1413
import com.jocmp.capy.db.Database
1514
import com.jocmp.capy.persistence.ArticleRecords
1615
import com.jocmp.capy.persistence.EnclosureRecords
1716
import com.jocmp.capy.persistence.FeedRecords
18-
import com.jocmp.minifluxclient.Category
1917
import com.jocmp.minifluxclient.CreateCategoryRequest
2018
import com.jocmp.minifluxclient.CreateFeedRequest
2119
import com.jocmp.minifluxclient.Entry
20+
import com.jocmp.minifluxclient.EntryStatus
2221
import com.jocmp.minifluxclient.Miniflux
2322
import com.jocmp.minifluxclient.UpdateCategoryRequest
2423
import com.jocmp.minifluxclient.UpdateEntriesRequest
@@ -40,7 +39,6 @@ internal class MinifluxAccountDelegate(
4039
override suspend fun refresh(filter: ArticleFilter, cutoffDate: ZonedDateTime?): Result<Unit> {
4140
return try {
4241
refreshFeeds()
43-
refreshCategories()
4442
refreshArticles()
4543

4644
Result.success(Unit)
@@ -55,7 +53,7 @@ internal class MinifluxAccountDelegate(
5553
val entryIDs = articleIDs.map { it.toLong() }
5654

5755
return withErrorHandling {
58-
miniflux.updateEntries(UpdateEntriesRequest(entry_ids = entryIDs, status = "read"))
56+
miniflux.updateEntries(UpdateEntriesRequest(entry_ids = entryIDs, status = EntryStatus.READ))
5957
Unit
6058
}
6159
}
@@ -64,7 +62,7 @@ internal class MinifluxAccountDelegate(
6462
val entryIDs = articleIDs.map { it.toLong() }
6563

6664
return withErrorHandling {
67-
miniflux.updateEntries(UpdateEntriesRequest(entry_ids = entryIDs, status = "unread"))
65+
miniflux.updateEntries(UpdateEntriesRequest(entry_ids = entryIDs, status = EntryStatus.UNREAD))
6866
Unit
6967
}
7068
}
@@ -114,7 +112,8 @@ internal class MinifluxAccountDelegate(
114112
val feed = feedResponse.body()
115113

116114
return if (feed != null) {
117-
upsertFeed(feed)
115+
val icons = fetchIcons(listOf(feed))
116+
upsertFeed(feed, icons)
118117

119118
val localFeed = feedRecords.find(feed.id.toString())
120119

@@ -193,30 +192,23 @@ internal class MinifluxAccountDelegate(
193192
}
194193

195194
private suspend fun refreshFeeds() {
196-
withResult(miniflux.feeds()) { feeds ->
197-
database.transactionWithErrorHandling {
198-
feeds.forEach { feed ->
199-
upsertFeed(feed)
200-
}
201-
}
195+
val feedsResponse = miniflux.feeds()
196+
val feeds = feedsResponse.body()
202197

203-
val feedsToKeep = feeds.map { it.id.toString() }
204-
database.feedsQueries.deleteAllExcept(feedsToKeep)
198+
if (!feedsResponse.isSuccessful || feeds == null) {
199+
return
205200
}
206-
}
207201

208-
private suspend fun refreshCategories() {
209-
withResult(miniflux.categories()) { categories ->
210-
database.transactionWithErrorHandling {
211-
categories.forEach { category ->
212-
database.taggingsQueries.upsert(
213-
id = category.id.toString(),
214-
feed_id = "", // Miniflux categories are not directly tied to a single feed
215-
name = category.title,
216-
)
217-
}
202+
val icons = fetchIcons(feeds)
203+
204+
database.transactionWithErrorHandling {
205+
feeds.forEach { feed ->
206+
upsertFeed(feed, icons)
218207
}
219208
}
209+
210+
val feedsToKeep = feeds.map { it.id.toString() }
211+
database.feedsQueries.deleteAllExcept(feedsToKeep)
220212
}
221213

222214
private suspend fun refreshArticles() {
@@ -233,7 +225,7 @@ internal class MinifluxAccountDelegate(
233225
}
234226

235227
private suspend fun refreshUnreadEntries() {
236-
withResult(miniflux.entries(status = "unread")) { result ->
228+
withResult(miniflux.entries(status = EntryStatus.UNREAD)) { result ->
237229
val ids = result.entries.map { it.id.toString() }
238230
articleRecords.markAllUnread(articleIDs = ids)
239231
}
@@ -288,7 +280,7 @@ internal class MinifluxAccountDelegate(
288280
articleRecords.createStatus(
289281
articleID = articleID,
290282
updatedAt = updated,
291-
read = entry.status == "read"
283+
read = entry.status == EntryStatus.READ
292284
)
293285

294286
entry.enclosures?.forEach { enclosure ->
@@ -304,15 +296,27 @@ internal class MinifluxAccountDelegate(
304296
}
305297
}
306298

307-
private fun upsertFeed(feed: com.jocmp.minifluxclient.Feed) {
299+
private fun upsertFeed(feed: com.jocmp.minifluxclient.Feed, icons: Map<Long, String>) {
300+
val icon = feed.icon?.icon_id?.let { icons[it] }
301+
308302
database.feedsQueries.upsert(
309303
id = feed.id.toString(),
310304
subscription_id = feed.id.toString(),
311305
title = feed.title,
312306
feed_url = feed.feed_url,
313307
site_url = feed.site_url,
314-
favicon_url = feed.icon?.data
308+
favicon_url = icon,
309+
priority = null
315310
)
311+
312+
// Create tagging for the feed's category
313+
feed.category?.let { category ->
314+
database.taggingsQueries.upsert(
315+
id = "${feed.id}-${category.id}",
316+
feed_id = feed.id.toString(),
317+
name = category.title
318+
)
319+
}
316320
}
317321

318322
private suspend fun getOrCreateCategory(title: String): Long {
@@ -327,6 +331,27 @@ internal class MinifluxAccountDelegate(
327331
}
328332
}
329333

334+
private suspend fun fetchIcons(feeds: List<com.jocmp.minifluxclient.Feed>): Map<Long, String> {
335+
val iconMap = mutableMapOf<Long, String>()
336+
337+
feeds.forEach { feed ->
338+
feed.icon?.icon_id?.let { iconId ->
339+
try {
340+
val response = miniflux.icon(iconId)
341+
val iconData = response.body()
342+
343+
if (response.isSuccessful && iconData != null) {
344+
iconMap[iconId] = iconData.data
345+
}
346+
} catch (_: Exception) {
347+
// Ignore icon fetch failures
348+
}
349+
}
350+
}
351+
352+
return iconMap
353+
}
354+
330355
companion object {
331356
const val MAX_ENTRY_LIMIT = 100
332357
}

0 commit comments

Comments
 (0)