public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-19 07:01:29 +00:00
Code Issues Releases Wiki Activity

subscribe_to_feed: stop fetching URL multiple times while subscribing, various other speedups

Browse Source
This commit is contained in:
Andrew Dolgov
2012-09-23 13:38:58 +04:00
parent 386c4ce63c
commit 759e5132a1
4 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/functions.php
View File

@@ -1810,15 +1810,19 @@
$update_method = 0;
if (!fetch_file_contents($url, false, $auth_login, $auth_pass))
return array("code" => 5, "message" => $fetch_last_error);
$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
if (!$contents) {
return array("code" => 5, "message" => $fetch_last_error);
}
if (is_html($contents)) {
$feedUrls = get_feeds_from_html($url, $contents);
if (url_is_html($url, $auth_login, $auth_pass)) {
$feedUrls = get_feeds_from_html($url, $auth_login, $auth_pass);
if (count($feedUrls) == 0) {
return array("code" => 3);
} else if (count($feedUrls) > 1) {
return array("code" => 4);
return array("code" => 4, "feeds" => $feedUrls);
}
//use feed url as new URL
$url = key($feedUrls);
@@ -4758,22 +4762,13 @@
return false;
}
/**
* Extracts RSS/Atom feed URLs from the given HTML URL.
*
* @param string $url HTML page URL
*
* @return array Array of feeds. Key is the full URL, value the title
*/
function get_feeds_from_html($url, $login = false, $pass = false)
function get_feeds_from_html($url, $content)
{
$url = fix_url($url);
$baseUrl = substr($url, 0, strrpos($url, '/') + 1);
libxml_use_internal_errors(true);
$content = @fetch_file_contents($url, false, $login, $pass);
$doc = new DOMDocument();
$doc->loadHTML($content);
$xpath = new DOMXPath($doc);
@@ -4794,23 +4789,12 @@
return $feedUrls;
}
/**
* Checks if the content behind the given URL is a HTML file
*
* @param string $url URL to check
*
* @return boolean True if the URL contains HTML content
*/
function is_html($content) {
return preg_match("/<html|DOCTYPE html/i", $content) !== 0;
}
function url_is_html($url, $login = false, $pass = false) {
$content = substr(fetch_file_contents($url, false, $login, $pass), 0, 1000);
if (stripos($content, '<html>') === false
&& stripos($content, '<html ') === false
) {
return false;
}
return true;
return is_html(fetch_file_contents($url, false, $login, $pass));
}
function print_label_select($link, $name, $value, $attributes = "") {