mention that language passed is read only

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 754b4f4cc97fad7808241da9cd428c006b525eef..614cdaa839535af7fe7eb74b5dfef693ad95d7d9 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -4,7 +4,7 @@
        define_default('DAEMON_SLEEP_INTERVAL', 120);
        define_default('_MIN_CACHE_IMAGE_SIZE', 1024);
 
-       function calculate_article_hash($article) {
+       function calculate_article_hash($article, $pluginhost) {
                $tmp = "";
 
                foreach ($article as $k => $v) {
@@ -13,7 +13,7 @@
                        }
                }
 
-               return sha1(implode(",", PluginHost::getInstance()->get_plugin_names())) . ":" . sha1($tmp);
+               return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
        }
 
        function update_feedbrowser_cache() {
@@ -169,6 +169,7 @@
                }
 
                $nf = 0;
+               $bstarted = microtime(true);
 
                // For each feed, we call the feed update function.
                foreach ($feeds_to_update as $feed) {
@@ -196,13 +197,22 @@
                                while ($tline = db_fetch_assoc($tmp_result)) {
                                        if($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
+                                       $fstarted = microtime(true);
                                        $rss = update_rss_feed($tline["id"], true, false);
                                        _debug_suppress(false);
+
+                                       _debug(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
+
                                        ++$nf;
                                }
                        }
                }
 
+               if ($nf > 0) {
+                       _debug(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
+                               microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
+               }
+
                require_once "digest.php";
 
                // Send feed digests by email if needed.
@@ -563,9 +573,6 @@
                                $entry_guid = $item->get_id();
                                if (!$entry_guid) $entry_guid = $item->get_link();
                                if (!$entry_guid) $entry_guid = make_guid_from_title($item->get_title());
-
-                               _debug("f_guid $entry_guid", $debug_enabled);
-
                                if (!$entry_guid) continue;
 
                                $entry_guid = "$owner_uid,$entry_guid";
@@ -614,13 +621,7 @@
                                        $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));
+                                               @$entry_language = array_keys($entry_language)[0];
 
                                                _debug("detected language: $entry_language", $debug_enabled);
                                        } else {
@@ -681,13 +682,14 @@
                                        "link" => $entry_link,
                                        "tags" => $entry_tags,
                                        "author" => $entry_author,
+                                       "language" => $entry_language, // read only
                                        "feed" => array("id" => $feed,
                                                "fetch_url" => $fetch_url,
                                                "site_url" => $site_url)
                                        );
 
                                $entry_plugin_data = "";
-                               $entry_current_hash = calculate_article_hash($article);
+                               $entry_current_hash = calculate_article_hash($article, $pluginhost);
 
                                _debug("article hash: $entry_current_hash [stored=$entry_stored_hash]", $debug_enabled);