From: Olaf Wintermann Date: Sun, 7 Dec 2025 18:35:10 +0000 (+0100) Subject: don't update disabled feeds X-Git-Url: https://uap-core.de/gitweb/?a=commitdiff_plain;h=c3434dbdc4f3d21f99d1a59ddfa98c6577c6dee5;p=rssreader.git don't update disabled feeds --- diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt index 92e26d4..7defdf6 100644 --- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt +++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt @@ -13,7 +13,7 @@ object Database { init { val config = HikariConfig() - config.jdbcUrl = "jdbc:h2:~/.rssreader/feeds;TIME ZONE=UTC" + config.jdbcUrl = "jdbc:h2:~/.config/rssreader/feeds;TIME ZONE=UTC" config.maximumPoolSize = 16 dataSource = HikariDataSource(config) @@ -378,7 +378,7 @@ object Database { dataSource.connection.use { conn -> conn.prepareStatement(""" - select * from feeds + select * from feeds where disabled = FALSE """.trimIndent()).use { stmt -> stmt.executeQuery().use { rs -> while(rs.next()) { @@ -406,7 +406,7 @@ object Database { dataSource.connection.use { conn -> conn.prepareStatement(""" - select * from feeds where feedcollection_id = ? + select * from feeds where feedcollection_id = ? and disabled = FALSE """.trimIndent()).use { stmt -> stmt.setInt(1, feed.id) stmt.executeQuery().use { rs -> @@ -436,7 +436,7 @@ object Database { conn.prepareStatement(""" select f.* from feeds f inner join feedcollections c on f.feedcollection_id = c.feedcollection_id - where c.group_id = ? + where c.group_id = ? and disabled = FALSE """.trimIndent()).use { stmt -> stmt.setInt(1, group.id) stmt.executeQuery().use { rs -> @@ -502,6 +502,7 @@ object Database { select f.* from feeds f inner join feedcollections c on f.feedcollection_id = c.feedcollection_id where datediff(ss, coalesce(last_update, '1970-01-01'), now()) + 45 > case when c.update_interval > 0 then c.update_interval else ? end + and disabled = FALSE """.trimIndent()).use { stmt -> stmt.setInt(1, defaultInterval) stmt.executeQuery().use { rs ->