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

store favicon color as #rrggbb; process existing favicons

This commit is contained in:
Andrew Dolgov 2013-04-15 15:08:00 +04:00
parent 14118af36f
commit 687a4f59c8
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/rssfuncs.php
View File

@ -259,6 +259,8 @@
$cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0; $cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
$last_updated_timestamp = strtotime($last_updated); $last_updated_timestamp = strtotime($last_updated);
$force_refetch = isset($_REQUEST["force_refetch"]);
if (file_exists($cache_filename) && if (file_exists($cache_filename) &&
is_readable($cache_filename) && is_readable($cache_filename) &&
!$auth_login && !$auth_pass && !$auth_login && !$auth_pass &&
@ -275,7 +277,7 @@
$rss_hash = sha1($rss_data); $rss_hash = sha1($rss_data);
@$rss = unserialize($rss_data); @$rss = unserialize($rss_data);
} }
} else { } else if (!$force_refetch) {
if ($debug_enabled) { if ($debug_enabled) {
_debug("update_rss_feed: local cache valid and older than last_updated, nothing to do."); _debug("update_rss_feed: local cache valid and older than last_updated, nothing to do.");
} }
@ -290,8 +292,6 @@
_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)"); _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, $feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false, $auth_login, $auth_pass, false,
$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT, $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
@ -403,16 +403,22 @@
$site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245)); $site_url = db_escape_string($link, mb_substr(rewrite_relative_url($fetch_url, $rss->get_link()), 0, 245));
if ($debug_enabled) { if ($favicon_needs_check || $force_refetch) {
_debug("update_rss_feed: checking favicon..."); if ($debug_enabled) {
} _debug("update_rss_feed: checking favicon...");
}
if ($favicon_needs_check) { check_feed_favicon($site_url, $feed, $link);
$favicon_file = check_feed_favicon($site_url, $feed, $link); $favicon_file = ICONS_DIR . "/$feed.ico";
if ($favicon_file) {
$favicon_color = calculate_avg_color($favicon_file); if (file_exists($favicon_file)) {
if (is_array($favicon_color)) $favicon_color = calculate_avg_color($favicon_file);
$favicon_colorstring = ",favicon_avg_color = '" . implode("|", array_slice($favicon_color, 0, 3)) . "'";
require_once "colors.php";
if (is_array($favicon_color))
$favicon_colorstring = ",favicon_avg_color = '" .
_color_pack(array_slice($favicon_color, 0, 3)) . "'";
} }
db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring