X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=include%2Frssfuncs.php;h=f657f8413fffe379bda3d14385ebc57ea02b453d;hb=0084f0d1ba81522b243bb3b9138334ba0a7d2f00;hp=2f570e37e4b4120b2b188298c877cea9b7961e9d;hpb=5d0d3887af6713a8b3a4d46389aa1ff2216f05f5;p=tt-rss.git diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 2f570e37..f657f841 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -2,6 +2,7 @@ define_default('DAEMON_UPDATE_LOGIN_LIMIT', 30); define_default('DAEMON_FEED_LIMIT', 500); define_default('DAEMON_SLEEP_INTERVAL', 120); + define_default('_MIN_CACHE_IMAGE_SIZE', 1024); function update_feedbrowser_cache() { @@ -79,7 +80,7 @@ $login_thresh_qpart = ""; } - // Test if the feed need a update (update interval exceded). + // Test if the feed need a update (update interval exceeded). if (DB_TYPE == "pgsql") { $update_limit_qpart = "AND (( ttrss_feeds.update_interval = 0 @@ -88,8 +89,10 @@ ) OR ( ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL) - ) OR ttrss_feeds.last_updated IS NULL - OR last_updated = '1970-01-01 00:00:00')"; + ) OR (ttrss_feeds.last_updated IS NULL + AND ttrss_user_prefs.value != '-1') + OR (last_updated = '1970-01-01 00:00:00' + AND ttrss_user_prefs.value != '-1'))"; } else { $update_limit_qpart = "AND (( ttrss_feeds.update_interval = 0 @@ -98,8 +101,10 @@ ) OR ( ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) - ) OR ttrss_feeds.last_updated IS NULL - OR last_updated = '1970-01-01 00:00:00')"; + ) OR (ttrss_feeds.last_updated IS NULL + AND ttrss_user_prefs.value != '-1') + OR (last_updated = '1970-01-01 00:00:00' + AND ttrss_user_prefs.value != '-1'))"; } // Test if feed is currently being updated by another process. @@ -118,6 +123,7 @@ ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE ttrss_feeds.owner_uid = ttrss_users.id + AND ttrss_user_prefs.profile IS NULL AND ttrss_users.id = ttrss_user_prefs.owner_uid AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' $login_thresh_qpart $update_limit_qpart @@ -165,6 +171,7 @@ 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 + ttrss_user_prefs.profile IS NULL AND feed_url = '".db_escape_string($feed)."' AND (ttrss_feeds.update_interval > 0 OR ttrss_user_prefs.value != '-1') @@ -172,9 +179,13 @@ ORDER BY ttrss_feeds.id $query_limit"); if (db_num_rows($tmp_result) > 0) { + $rss = false; + while ($tline = db_fetch_assoc($tmp_result)) { if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]); - update_rss_feed($tline["id"], true); + + $rss = update_rss_feed($tline["id"], true, false); + _debug_suppress(false); ++$nf; } } @@ -190,15 +201,15 @@ } // function update_daemon_common // ignore_daemon is not used - function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false, - $override_url = false) { + function update_rss_feed($feed, $ignore_daemon = false, $no_cache = false, $rss = false) { $debug_enabled = defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']; + _debug_suppress(!$debug_enabled); _debug("start", $debug_enabled); $result = db_query("SELECT id,update_interval,auth_login, - feed_url,auth_pass,cache_images,last_updated, + feed_url,auth_pass,cache_images, mark_unread_on_update, owner_uid, pubsub_state, auth_pass_encrypted, (SELECT max(date_entered) FROM @@ -210,11 +221,6 @@ return false; } - // set last update to now so if anything *simplepie* crashes later we won't be - // continuously failing on the same feed - db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'"); - - $last_updated = db_fetch_result($result, 0, "last_updated"); $last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp")); if (defined('_DISABLE_HTTP_304')) @@ -243,45 +249,49 @@ $feed = db_escape_string($feed); - if ($override_url) $fetch_url = $override_url; - $date_feed_processed = date('Y-m-d H:i'); $cache_filename = CACHE_DIR . "/simplepie/" . sha1($fetch_url) . ".xml"; - // Ignore cache if new feed or manual update. - $cache_age = ($no_cache || is_null($last_updated) || strpos($last_updated, '1970-01-01') === 0) ? 30 : get_feed_update_interval($feed) * 60; - - _debug("cache filename: $cache_filename exists: " . file_exists($cache_filename), $debug_enabled); - _debug("cache age: $cache_age; no cache: $no_cache", $debug_enabled); + $pluginhost = new PluginHost(); + $pluginhost->set_debug($debug_enabled); + $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); - $cached_feed_data_hash = false; + $pluginhost->load(PLUGINS, PluginHost::KIND_ALL); + $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); + $pluginhost->load_data(); - $rss = false; - $rss_hash = false; - $cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0; + if ($rss && is_object($rss) && get_class($rss) == "FeedParser") { + _debug("using previously initialized parser object"); + } else { + $rss_hash = false; - $force_refetch = isset($_REQUEST["force_refetch"]); + $force_refetch = isset($_REQUEST["force_refetch"]); - if (file_exists($cache_filename) && - is_readable($cache_filename) && - !$auth_login && !$auth_pass && - filemtime($cache_filename) > time() - $cache_age) { + foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) { + $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass); + } - _debug("using local cache.", $debug_enabled); + // try cache + if (!$feed_data && + file_exists($cache_filename) && + is_readable($cache_filename) && + !$auth_login && !$auth_pass && + filemtime($cache_filename) > time() - 30) { - @$feed_data = file_get_contents($cache_filename); + _debug("using local cache [$cache_filename].", $debug_enabled); - if ($feed_data) { - $rss_hash = sha1($feed_data); - } + @$feed_data = file_get_contents($cache_filename); - } else { - _debug("local cache will not be used for this feed", $debug_enabled); - } + if ($feed_data) { + $rss_hash = sha1($feed_data); + } - if (!$rss) { + } else { + _debug("local cache will not be used for this feed", $debug_enabled); + } + // fetch feed from source if (!$feed_data) { _debug("fetching [$fetch_url]...", $debug_enabled); _debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled); @@ -303,7 +313,7 @@ _debug("fetch done.", $debug_enabled); - if ($feed_data) { + /* if ($feed_data) { $error = verify_feed_xml($feed_data); if ($error) { @@ -319,6 +329,16 @@ if ($error) $feed_data = ''; } } + } */ + + // cache vanilla feed data for re-use + if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) { + $new_rss_hash = sha1($feed_data); + + if ($new_rss_hash != $rss_hash) { + _debug("saving $cache_filename", $debug_enabled); + @file_put_contents($cache_filename, $feed_data); + } } } @@ -345,39 +365,32 @@ } } - $pluginhost = new PluginHost(); - $pluginhost->set_debug($debug_enabled, $debug_enabled); - $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid); - - $pluginhost->load(PLUGINS, PluginHost::KIND_ALL); - $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); - $pluginhost->load_data(); - foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) { - $feed_data = $plugin->hook_feed_fetched($feed_data); + $feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed); } + // set last update to now so if anything *simplepie* crashes later we won't be + // continuously failing on the same feed + //db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'"); + if (!$rss) { $rss = new FeedParser($feed_data); $rss->init(); } + if (DETECT_ARTICLE_LANGUAGE) { + require_once "lib/languagedetect/LanguageDetect.php"; + + $lang = new Text_LanguageDetect(); + $lang->setNameMode(2); + } + // print_r($rss); $feed = db_escape_string($feed); if (!$rss->error()) { - // cache data for later - if (!$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/simplepie")) { - $new_rss_hash = sha1($rss_data); - - if ($new_rss_hash != $rss_hash && count($rss->get_items()) > 0 ) { - _debug("saving $cache_filename", $debug_enabled); - @file_put_contents($cache_filename, $feed_data); - } - } - // We use local pluginhost here because we need to load different per-user feed plugins $pluginhost->run_hooks(PluginHost::HOOK_FEED_PARSED, "hook_feed_parsed", $rss); @@ -419,7 +432,7 @@ _debug("checking favicon...", $debug_enabled); - check_feed_favicon($site_url, $feed, $link); + check_feed_favicon($site_url, $feed); $favicon_modified_new = @filemtime($favicon_file); if ($favicon_modified_new > $favicon_modified) @@ -496,7 +509,20 @@ _debug("feed hub url: $feed_hub_url", $debug_enabled); - if ($feed_hub_url && function_exists('curl_init') && + $feed_self_url = $fetch_url; + + $links = $rss->get_links('self'); + + if ($links && is_array($links)) { + foreach ($links as $l) { + $feed_self_url = $l; + break; + } + } + + _debug("feed self url = $feed_self_url"); + + if ($feed_hub_url && $feed_self_url && function_exists('curl_init') && !ini_get("open_basedir")) { require_once 'lib/pubsubhubbub/subscriber.php'; @@ -506,9 +532,9 @@ $s = new Subscriber($feed_hub_url, $callback_url); - $rc = $s->subscribe($fetch_url); + $rc = $s->subscribe($feed_self_url); - _debug("feed hub url found, subscribe request sent.", $debug_enabled); + _debug("feed hub url found, subscribe request sent. [rc=$rc]", $debug_enabled); db_query("UPDATE ttrss_feeds SET pubsub_state = 1 WHERE id = '$feed'"); @@ -544,9 +570,6 @@ if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) { $entry_timestamp = time(); - $no_orig_date = 'true'; - } else { - $no_orig_date = 'false'; } $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp); @@ -573,6 +596,26 @@ print "\n"; } + $entry_language = ""; + + if (DETECT_ARTICLE_LANGUAGE) { + $entry_language = $lang->detect($entry_title . " " . $entry_content, 1); + + if (count($entry_language) > 0) { + $entry_language = array_keys($entry_language); + + // the fuck? + if (is_array($entry_language)) + $entry_language = ""; + else + $entry_language = db_escape_string(substr($entry_language[0], 0, 2)); + + _debug("detected language: $entry_language", $debug_enabled); + } else { + $entry_language = ""; + } + } + $entry_comments = $item->get_comments_url(); $entry_author = $item->get_author(); @@ -636,10 +679,20 @@ "tags" => $entry_tags, "plugin_data" => $entry_plugin_data, "author" => $entry_author, - "stored" => $stored_article); + "stored" => $stored_article, + "feed" => array("id" => $feed, + "fetch_url" => $fetch_url, + "site_url" => $site_url) + ); foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) { $article = $plugin->hook_article_filter($article); + + $article["stored"] = array("title" => $article["title"], + "content" => $article["content"], + "link" => $article["link"], + "tags" => $article["tags"], + "author" => $article["author"]); } $entry_tags = $article["tags"]; @@ -650,7 +703,6 @@ $entry_plugin_data = db_escape_string($article["plugin_data"]); $entry_content = $article["content"]; // escaped below - _debug("plugin data: $entry_plugin_data", $debug_enabled); if ($cache_images && is_writable(CACHE_DIR . '/images')) @@ -679,13 +731,13 @@ updated, content, content_hash, - cached_content, no_orig_date, date_updated, date_entered, comments, num_comments, plugin_data, + lang, author) VALUES ('$entry_title', @@ -694,13 +746,13 @@ '$entry_timestamp_fmt', '$entry_content', '$content_hash', - '', - $no_orig_date, + false, NOW(), '$date_feed_processed', '$entry_comments', '$num_comments', '$entry_plugin_data', + '$entry_language', '$entry_author')"); $article_labels = array(); @@ -722,9 +774,7 @@ // now it should exist, if not - bad luck then $result = db_query("SELECT - id,content_hash,no_orig_date,title,plugin_data,guid, - ".SUBSTRING_FOR_DATE."(date_updated,1,19) as date_updated, - ".SUBSTRING_FOR_DATE."(updated,1,19) as updated, + id,content_hash,title,plugin_data,guid, num_comments FROM ttrss_entries @@ -741,8 +791,6 @@ $orig_content_hash = db_fetch_result($result, 0, "content_hash"); $orig_title = db_fetch_result($result, 0, "title"); $orig_num_comments = db_fetch_result($result, 0, "num_comments"); - $orig_date_updated = strtotime(db_fetch_result($result, - 0, "date_updated")); $orig_plugin_data = db_fetch_result($result, 0, "plugin_data"); $ref_id = db_fetch_result($result, 0, "id"); @@ -858,7 +906,7 @@ $p = new Publisher(PUBSUBHUBBUB_HUB); - $pubsub_result = $p->publish_update($rss_link); + /* $pubsub_result = */ $p->publish_update($rss_link); } $result = db_query( @@ -946,7 +994,7 @@ if (is_array($encs)) { foreach ($encs as $e) { $e_item = array( - $e->link, $e->type, $e->length); + $e->link, $e->type, $e->length, $e->title, $e->width, $e->height); array_push($enclosures, $e_item); } } @@ -958,18 +1006,24 @@ db_query("BEGIN"); +// debugging +// db_query("DELETE FROM ttrss_enclosures WHERE post_id = '$entry_ref_id'"); + foreach ($enclosures as $enc) { $enc_url = db_escape_string($enc[0]); $enc_type = db_escape_string($enc[1]); $enc_dur = db_escape_string($enc[2]); + $enc_title = db_escape_string($enc[3]); + $enc_width = intval($enc[4]); + $enc_height = intval($enc[5]); $result = db_query("SELECT id FROM ttrss_enclosures WHERE content_url = '$enc_url' AND post_id = '$entry_ref_id'"); if (db_num_rows($result) == 0) { db_query("INSERT INTO ttrss_enclosures - (content_url, content_type, title, duration, post_id) VALUES - ('$enc_url', '$enc_type', '', '$enc_dur', '$entry_ref_id')"); + (content_url, content_type, title, duration, post_id, width, height) VALUES + ('$enc_url', '$enc_type', '$enc_title', '$enc_dur', '$entry_ref_id', $enc_width, $enc_height)"); } } @@ -1070,11 +1124,6 @@ _debug("article processed", $debug_enabled); } - if (!$last_updated) { - _debug("new feed, catching it up...", $debug_enabled); - catchup_feed($feed, false, $owner_uid); - } - _debug("purging feed...", $debug_enabled); purge_feed($feed, 0, $debug_enabled); @@ -1088,21 +1137,27 @@ $error_msg = db_escape_string(mb_substr($rss->error(), 0, 245)); - _debug("error fetching feed: $error_msg", $debug_enabled); + _debug("fetch error: $error_msg", $debug_enabled); + + if (count($rss->errors()) > 1) { + foreach ($rss->errors() as $error) { + _debug("+ $error"); + } + } db_query( "UPDATE ttrss_feeds SET last_error = '$error_msg', - last_updated = NOW() WHERE id = '$feed'"); - } + last_updated = NOW() WHERE id = '$feed'"); - unset($rss); + unset($rss); + } _debug("done", $debug_enabled); + + return $rss; } function cache_images($html, $site_url, $debug) { - $cache_dir = CACHE_DIR . "/images"; - libxml_use_internal_errors(true); $charset_hack = ' @@ -1126,21 +1181,20 @@ if (!file_exists($local_filename)) { $file_content = fetch_file_contents($src); - if ($file_content && strlen($file_content) > 1024) { + if ($file_content && strlen($file_content) > _MIN_CACHE_IMAGE_SIZE) { file_put_contents($local_filename, $file_content); } } - if (file_exists($local_filename)) { + /* if (file_exists($local_filename)) { $entry->setAttribute('src', SELF_URL_PATH . '/image.php?url=' . base64_encode($src)); - } + } */ } } - $node = $doc->getElementsByTagName('body')->item(0); - - return $doc->saveXML($node); + //$node = $doc->getElementsByTagName('body')->item(0); + //return $doc->saveXML($node); } function expire_error_log($debug) { @@ -1357,14 +1411,14 @@ mb_strtolower(strip_tags($title), 'utf-8')); } - function verify_feed_xml($feed_data) { + /* function verify_feed_xml($feed_data) { libxml_use_internal_errors(true); $doc = new DOMDocument(); $doc->loadXML($feed_data); $error = libxml_get_last_error(); libxml_clear_errors(); return $error; - } + } */ function housekeeping_common($debug) { expire_cached_files($debug); @@ -1378,5 +1432,8 @@ $rc = cleanup_tags( 14, 50000); _debug("Cleaned $rc cached tags."); + + PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", ""); + } ?>