valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't try to update manually disabled feeds even if they haven't been updated before or are marked for a manual update

This commit is contained in:
Andrew Dolgov 2020-09-17 15:40:50 +03:00
parent f41fdef389
commit afa0023c51
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/rpc.php
View File

@ -436,7 +436,10 @@ class RPC extends Handler_Protected {
ttrss_feeds.update_interval > 0 ttrss_feeds.update_interval > 0
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL) AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
) OR ttrss_feeds.last_updated IS NULL ) OR ttrss_feeds.last_updated IS NULL
OR last_updated = '1970-01-01 00:00:00')"; OR (
ttrss_feeds.update_interval > 0
AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL)
))";
} else { } else {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
ttrss_feeds.update_interval = 0 ttrss_feeds.update_interval = 0
@ -445,7 +448,10 @@ class RPC extends Handler_Protected {
ttrss_feeds.update_interval > 0 ttrss_feeds.update_interval > 0
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
) OR ttrss_feeds.last_updated IS NULL ) OR ttrss_feeds.last_updated IS NULL
OR last_updated = '1970-01-01 00:00:00')"; OR (
ttrss_feeds.update_interval > 0
AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL)
))";
} }
// Test if feed is currently being updated by another process. // Test if feed is currently being updated by another process.

4
classes/rssutils.php
View File

@ -57,8 +57,10 @@ class RSSUtils {
ttrss_feeds.update_interval > 0 ttrss_feeds.update_interval > 0
AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL) AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
) OR (ttrss_feeds.last_updated IS NULL ) OR (ttrss_feeds.last_updated IS NULL
AND ttrss_feeds.update_interval > 0
AND ttrss_user_prefs.value != '-1') AND ttrss_user_prefs.value != '-1')
OR (last_updated = '1970-01-01 00:00:00' OR (last_updated = '1970-01-01 00:00:00'
AND ttrss_feeds.update_interval > 0
AND ttrss_user_prefs.value != '-1'))"; AND ttrss_user_prefs.value != '-1'))";
} else { } else {
$update_limit_qpart = "AND (( $update_limit_qpart = "AND ((
@ -69,8 +71,10 @@ class RSSUtils {
ttrss_feeds.update_interval > 0 ttrss_feeds.update_interval > 0
AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
) OR (ttrss_feeds.last_updated IS NULL ) OR (ttrss_feeds.last_updated IS NULL
AND ttrss_feeds.update_interval > 0
AND ttrss_user_prefs.value != '-1') AND ttrss_user_prefs.value != '-1')
OR (last_updated = '1970-01-01 00:00:00' OR (last_updated = '1970-01-01 00:00:00'
AND ttrss_feeds.update_interval > 0
AND ttrss_user_prefs.value != '-1'))"; AND ttrss_user_prefs.value != '-1'))";
} }