Merge branch 'master' into tunable-fetches

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index d9a907c1840eea880b6cd64331b9e74cc922a37d..ce197156c4603110d4c6c8d92f629fd16c5004ee 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -77,6 +77,7 @@
                if (DB_TYPE == "pgsql") {
                        $update_limit_qpart = "AND ((
                                        ttrss_feeds.update_interval = 0
+                                       AND ttrss_user_prefs.value != '-1'
                                        AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
                                ) OR (
                                        ttrss_feeds.update_interval > 0
@@ -86,6 +87,7 @@
                } else {
                        $update_limit_qpart = "AND ((
                                        ttrss_feeds.update_interval = 0
+                                       AND ttrss_user_prefs.value != '-1'
                                        AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
                                ) OR (
                                        ttrss_feeds.update_interval > 0
@@ -108,7 +110,7 @@
                $random_qpart = sql_random_function();
 
                // We search for feed needing update.
-               $result = db_query($link, "SELECT DISTINCT ttrss_feeds.feed_url
+               $result = db_query($link, "SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
                        FROM
                                ttrss_feeds, ttrss_users, ttrss_user_prefs
                        WHERE
@@ -117,7 +119,7 @@
                                AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
                                $login_thresh_qpart $update_limit_qpart
                                $updstart_thresh_qpart
-                       ORDER BY feed_url $query_limit");
+                       ORDER BY $random_qpart $query_limit");
 
                $user_prefs_cache = array();
 
@@ -147,6 +149,8 @@
                expire_cached_files($debug);
                expire_lock_files($debug);
 
+               $nf = 0;
+
                // For each feed, we call the feed update function.
                foreach ($feeds_to_update as $feed) {
                        if($debug) _debug("Base feed: $feed");
@@ -156,17 +160,21 @@
                        // since we have the data cached, we can deal with other feeds with the same url
 
                        $tmp_result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id,last_updated
-                       FROM ttrss_feeds, ttrss_users WHERE
-                               ttrss_users.id = ttrss_feeds.owner_uid AND
+                       FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
+                               ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
+                               ttrss_users.id = ttrss_user_prefs.owner_uid AND
+                               ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
                                feed_url = '".db_escape_string($link, $feed)."' AND
-                               ttrss_feeds.update_interval != -1
+                               (ttrss_feeds.update_interval > 0 OR
+                                       ttrss_user_prefs.value != '-1')
                                $login_thresh_qpart
                        ORDER BY feed_url $query_limit");
 
                        if (db_num_rows($tmp_result) > 0) {
                                while ($tline = db_fetch_assoc($tmp_result)) {
-                                       if($debug) _debug(" => " . $tline["feed_url"] . ", " . $tline["last_updated"] . ", " . $tline["id"]);
+                                       if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"]);
                                        update_rss_feed($link, $tline["id"], true);
+                                       ++$nf;
                                }
                        }
                }
@@ -176,6 +184,8 @@
                // Send feed digests by email if needed.
                send_headlines_digests($link, $debug);
 
+               return $nf;
+
        } // function update_daemon_common
 
        // ignore_daemon is not used
@@ -239,6 +249,8 @@
 
                $rss = false;
                $rss_hash = false;
+               $cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
+               $last_updated_timestamp = strtotime($last_updated);
 
                if (file_exists($cache_filename) &&
                        is_readable($cache_filename) &&
@@ -249,11 +261,18 @@
                                        _debug("update_rss_feed: using local cache.");
                                }
 
-                               @$rss_data = file_get_contents($cache_filename);
+                               if ($cache_timestamp > $last_updated_timestamp) {
+                                       @$rss_data = file_get_contents($cache_filename);
 
-                               if ($rss_data) {
-                                       $rss_hash = sha1($rss_data);
-                                       @$rss = unserialize($rss_data);
+                                       if ($rss_data) {
+                                               $rss_hash = sha1($rss_data);
+                                               @$rss = unserialize($rss_data);
+                                       }
+                               } else {
+                                       if ($debug_enabled) {
+                                               _debug("update_rss_feed: local cache valid and older than last_updated, nothing to do.");
+                                       }
+                                       return;
                                }
                }
 
@@ -261,11 +280,15 @@
 
                        if (!$feed_data) {
                                if ($debug_enabled) {
-                                       _debug("update_rss_feed: fetching [$fetch_url]...");
+                                       _debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
                                }
 
+                               $force_refetch = isset($_REQUEST["force_refetch"]);
+
                                $feed_data = fetch_file_contents($fetch_url, false,
-                                       $auth_login, $auth_pass, false, $no_cache ? 15 : 45);
+                                       $auth_login, $auth_pass, false, 
+                                       $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+                                       $force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
 
                                if ($debug_enabled) {
                                        _debug("update_rss_feed: fetch done.");
@@ -275,12 +298,22 @@
 
                        if (!$feed_data) {
                                global $fetch_last_error;
+                               global $fetch_last_error_code;
 
                                if ($debug_enabled) {
-                                       _debug("update_rss_feed: unable to fetch: $fetch_last_error");
+                                       _debug("update_rss_feed: unable to fetch: $fetch_last_error [$fetch_last_error_code]");
                                }
 
-                               $error_escaped = db_escape_string($link, $fetch_last_error);
+                               $error_escaped = '';
+
+                               // If-Modified-Since
+                               if ($fetch_last_error_code != 304) {
+                                       $error_escaped = db_escape_string($link, $fetch_last_error);
+                               } else {
+                                       if ($debug_enabled) {
+                                               _debug("update_rss_feed: source claims data not modified, nothing to do.");
+                                       }
+                               }
 
                                db_query($link,
                                        "UPDATE ttrss_feeds SET last_error = '$error_escaped',
@@ -1267,6 +1300,9 @@
                        if ($filter_match) {
                                foreach ($filter["actions"] AS $action) {
                                        array_push($matches, $action);
+
+                                       // if Stop action encountered, perform no further processing
+                                       if ($action["type"] == "stop") return $matches;
                                }
                        }
                }