function hook_prefs_tab($args) {
if ($args != "prefFeeds") return;
- print "<div id=\"af_redditimgur_prefs\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('af_redditimgur settings')."\">";
+ print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Reddit content settings (af_redditimgur)')."\">";
$enable_readability = $this->host->get($this, "enable_readability");
- $enable_readability_checked = $enable_readability ? "checked" : "";
-
$enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
- $enable_content_dupcheck_checked = $enable_content_dupcheck ? "checked" : "";
print "<form dojoType=\"dijit.form.Form\">";
}
</script>";
- print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
- print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
- print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_redditimgur\">";
+ print_hidden("op", "pluginhandler");
+ print_hidden("method", "save");
+ print_hidden("plugin", "af_redditimgur");
print "<p>" . __("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
print "<p/>";
- print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_readability\"
- $enable_readability_checked name=\"enable_readability\"> ";
-
- print "<label for=\"enable_readability\">" . __("Extract missing content using Readability") . "</label>";
+ print_checkbox("enable_readability", $enable_readability);
+ print " <label for=\"enable_readability\">" . __("Extract missing content using Readability") . "</label>";
print "<br/>";
- print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_content_dupcheck\"
- $enable_content_dupcheck_checked name=\"enable_content_dupcheck\"> ";
-
- print "<label for=\"enable_content_dupcheck\">" . __("Enable additional duplicate checking") . "</label>";
- print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
- __("Save")."</button>";
-
+ print_checkbox("enable_content_dupcheck", $enable_content_dupcheck);
+ print " <label for=\"enable_content_dupcheck\">" . __("Enable additional duplicate checking") . "</label>";
+ print "<p>"; print_button("submit", __("Save"));
print "</form>";
print "</div>";
echo __("Configuration saved");
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
private function inline_stuff($article, &$doc, $xpath, $debug = false) {
$entries = $xpath->query('(//a[@href]|//img[@src])');
+ $img_entries = $xpath->query("(//img[@src])");
$found = false;
if ($oembed_result && isset($oembed_result["html"])) {
$tmp = new DOMDocument();
- if ($tmp->loadHTML($oembed_result["html"])) {
+ if ($tmp->loadHTML('<?xml encoding="utf-8" ?>' . $oembed_result["html"])) {
$p = $doc->createElement("p");
$p->appendChild($doc->importNode(
if (@$tmpdoc->loadHTML($tmp)) {
$tmpxpath = new DOMXPath($tmpdoc);
- $source_meta = $tmpxpath->query("//meta[@name='twitter:player:stream' and contains(@content, '.mp4')]")->item(0);
- $poster_meta = $tmpxpath->query("//meta[@property='og:image' and contains(@content,'thumbs.gfycat.com')]")->item(0);
+ $source_node = $tmpxpath->query("//video[contains(@class,'share-video')]//source[contains(@src, '.mp4')]")->item(0);
+ $poster_node = $tmpxpath->query("//video[contains(@class,'share-video') and @poster]")->item(0);
- if ($source_meta) {
- $source_stream = $source_meta->getAttribute("content");
- $poster_url = false;
+ if ($source_node && $poster_node) {
+ $source_stream = $source_node->getAttribute("src");
+ $poster_url = $poster_node->getAttribute("poster");
- if ($source_stream) {
+ $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+ $found = 1;
+ }
+ }
+ }
+ }
+
+ if (!$found && preg_match("/https?:\/\/v\.redd\.it\/(.*)$/i", $entry->getAttribute("href"), $matches)) {
- if ($poster_meta)
- $poster_url = $poster_meta->getAttribute("content");
+ _debug("Handling as reddit inline video", $debug);
- $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
- $found = 1;
+ $img = $img_entries->item(0);
+
+ if ($img) {
+ $poster_url = $img->getAttribute("src");
+ } else {
+ $poster_url = false;
+ }
+
+ // Get original article URL from v.redd.it redirects
+ $source_article_url = $this->get_location($matches[0]);
+ _debug("Resolved ".$matches[0]." to ".$source_article_url, $debug);
+
+ $source_stream = false;
+
+ if ($source_article_url) {
+ $j = json_decode(fetch_file_contents($source_article_url.".json"), true);
+
+ if ($j) {
+ foreach ($j as $listing) {
+ foreach ($listing["data"]["children"] as $child) {
+ if ($child["data"]["url"] == $matches[0]) {
+ try {
+ $source_stream = $child["data"]["media"]["reddit_video"]["fallback_url"];
+ }
+ catch (Exception $e) {
+ }
+ break 2;
+ }
}
}
}
}
+ if (!$source_stream) {
+ $source_stream = "https://v.redd.it/" . $matches[1] . "/DASH_600_K";
+ }
+
+ $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+ $found = 1;
+ }
+
+ if (!$found && preg_match("/https?:\/\/(www\.)?streamable.com\//i", $entry->getAttribute("href"))) {
+
+ _debug("Handling as Streamable", $debug);
+
+ $tmp = fetch_file_contents($entry->getAttribute("href"));
+
+ if ($tmp) {
+ $tmpdoc = new DOMDocument();
+
+ if (@$tmpdoc->loadHTML($tmp)) {
+ $tmpxpath = new DOMXPath($tmpdoc);
+
+ $source_node = $tmpxpath->query("//video[contains(@class,'video-player-tag')]//source[contains(@src, '.mp4')]")->item(0);
+ $poster_node = $tmpxpath->query("//video[contains(@class,'video-player-tag') and @poster]")->item(0);
+
+ if ($source_node && $poster_node) {
+ $source_stream = $source_node->getAttribute("src");
+ $poster_url = $poster_node->getAttribute("poster");
+
+ $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+ $found = 1;
+ }
+ }
+ }
}
// imgur .gif -> .gifv
str_replace(".gif", ".gifv", $entry->getAttribute("href")));
}
- if (!$found && preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
+ if (!$found && preg_match("/\.(gifv|mp4)$/i", $entry->getAttribute("href"))) {
_debug("Handling as imgur gifv", $debug);
$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
- if (strpos($source_stream, "i.imgur.com") !== FALSE)
+ if (strpos($source_stream, "imgur.com") !== FALSE)
$poster_url = str_replace(".mp4", "h.jpg", $source_stream);
$this->handle_as_video($doc, $entry, $source_stream, $poster_url, $debug);
$entry->parentNode->insertBefore($br, $entry);
} else if ($aentry->tagName == "source") {
- if (strpos($url, "i.imgur.com") !== FALSE)
+ if (strpos($url, "imgur.com") !== FALSE)
$poster_url = str_replace(".mp4", "h.jpg", $url);
else
$poster_url = "";
$found = $this->inline_stuff($article, $doc, $xpath);
- if (!defined('NO_CURL') && function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
- mb_strlen(strip_tags($article["content"])) <= 150) {
-
- if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
-
- if ($content_link &&
- strpos($content_link->getAttribute("href"), "twitter.com") === FALSE &&
- strpos($content_link->getAttribute("href"), "youtube.com") === FALSE &&
- strpos($content_link->getAttribute("href"), "reddit.com") === FALSE) {
-
- /* link may lead to a huge video file or whatever, we need to check content type before trying to
- parse it which p much requires curl */
-
- $useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
-
- $content_type = $this->get_content_type($content_link->getAttribute("href"), $useragent_compat);
-
- if ($content_type && strpos($content_type, "text/html") !== FALSE) {
-
- $tmp = fetch_file_contents(array("url" => $content_link->getAttribute("href"),
- "useragent" => $useragent_compat));
-
- //_debug("tmplen: " . mb_strlen($tmp));
-
- if ($tmp && mb_strlen($tmp) < 1024 * 250) {
-
- $r = new Readability($tmp, $content_link->getAttribute("href"));
-
- if ($r->init()) {
-
- $tmpxpath = new DOMXPath($r->dom);
-
- $entries = $tmpxpath->query('(//a[@href]|//img[@src])');
-
- foreach ($entries as $entry) {
- if ($entry->hasAttribute("href")) {
- $entry->setAttribute("href",
- rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("href")));
-
- }
-
- if ($entry->hasAttribute("src")) {
- $entry->setAttribute("src",
- rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("src")));
-
- }
-
- }
-
- $article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
-
- // prob not a very good idea (breaks wikipedia pages, etc) -
- // inliner currently is not really fit for any random web content
-
- //$doc = new DOMDocument();
- //@$doc->loadHTML($article["content"]);
- //$xpath = new DOMXPath($doc);
- //$found = $this->inline_stuff($article, $doc, $xpath);
- }
- }
- }
- }
-
- }
-
$node = $doc->getElementsByTagName('body')->item(0);
if ($node && $found) {
- $article["content"] = $doc->saveXML($node);
+ $article["content"] = $doc->saveHTML($node);
+ } else if ($content_link) {
+ $article = $this->readability($article, $content_link->getAttribute("href"), $doc, $xpath);
}
}
@$doc->loadHTML("<html><body><a href=\"$url\">[link]</a></body>");
$xpath = new DOMXPath($doc);
- print "Inline result: " . $this->inline_stuff([], $doc, $xpath, true) . "\n";
+ $found = $this->inline_stuff([], $doc, $xpath, true);
- print "\nResulting HTML:\n";
+ print "Inline result: $found\n";
- print $doc->saveHTML();
+ if (!$found) {
+ print "\nReadability result:\n";
+ $article = $this->readability([], $url, $doc, $xpath, true);
+
+ print_r($article);
+ } else {
+ print "\nResulting HTML:\n";
+
+ print $doc->saveHTML();
+ }
}
private function get_content_type($url, $useragent = SELF_USER_AGENT) {
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
- @$result = curl_exec($ch);
+ @curl_exec($ch);
$content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
}
return $content_type;
}
+
+ private function get_location($url, $useragent = SELF_USER_AGENT) {
+ $location = false;
+
+ if (function_exists("curl_init") && !defined("NO_CURL")) {
+ $ch = curl_init($url);
+ curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_HEADER, true);
+ curl_setopt($ch, CURLOPT_NOBODY, true);
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
+ curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
+
+ @curl_exec($ch);
+ $location = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
+ }
+
+ return $location;
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ private function readability($article, $url, $doc, $xpath, $debug = false) {
+
+ if (!defined('NO_CURL') && function_exists("curl_init") && $this->host->get($this, "enable_readability") &&
+ mb_strlen(strip_tags($article["content"])) <= 150) {
+
+ if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
+
+ if ($url &&
+ strpos($url, "twitter.com") === FALSE &&
+ strpos($url, "youtube.com") === FALSE &&
+ strpos($url, "reddit.com") === FALSE) {
+
+ /* link may lead to a huge video file or whatever, we need to check content type before trying to
+ parse it which p much requires curl */
+
+ $useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
+
+ $content_type = $this->get_content_type($url, $useragent_compat);
+
+ if ($content_type && strpos($content_type, "text/html") !== FALSE) {
+
+ $tmp = fetch_file_contents(array("url" => $url,
+ "useragent" => $useragent_compat));
+
+ if ($debug) _debug("tmplen: " . mb_strlen($tmp));
+
+ if ($tmp && mb_strlen($tmp) < 1024 * 500) {
+
+ $r = new Readability($tmp, $url);
+
+ if ($r->init()) {
+
+ $tmpxpath = new DOMXPath($r->dom);
+
+ $entries = $tmpxpath->query('(//a[@href]|//img[@src])');
+
+ foreach ($entries as $entry) {
+ if ($entry->hasAttribute("href")) {
+ $entry->setAttribute("href",
+ rewrite_relative_url($url, $entry->getAttribute("href")));
+
+ }
+
+ if ($entry->hasAttribute("src")) {
+ $entry->setAttribute("src",
+ rewrite_relative_url($url, $entry->getAttribute("src")));
+
+ }
+
+ }
+
+ $article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
+ }
+ }
+ }
+ }
+ }
+
+ return $article;
+ }
}
-?>
git.wh0rd.org / tt-rss.git / blobdiff