af_redditimgur: fix youtube regexp, try to inline images again if parsed

using readability
master
Andrew Dolgov 10 years ago
parent 99bb8b3bbb
commit 6322fc6870

@ -69,239 +69,230 @@ class Af_RedditImgur extends Plugin {
echo __("Configuration saved"); echo __("Configuration saved");
} }
function hook_article_filter($article) { private function inline_stuff($article, &$doc, $xpath) {
if (strpos($article["link"], "reddit.com/r/") !== FALSE) {
$doc = new DOMDocument();
@$doc->loadHTML($article["content"]);
if ($doc) { $entries = $xpath->query('(//a[@href]|//img[@src])');
$xpath = new DOMXPath($doc);
$entries = $xpath->query('(//a[@href]|//img[@src])');
$found = false; $found = false;
foreach ($entries as $entry) { foreach ($entries as $entry) {
if ($entry->hasAttribute("href")) { if ($entry->hasAttribute("href")) {
$matches = array(); $matches = array();
if (preg_match("/https?:\/\/gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) { if (preg_match("/https?:\/\/gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
$tmp = fetch_file_contents($entry->getAttribute("href")); $tmp = fetch_file_contents($entry->getAttribute("href"));
if ($tmp) { if ($tmp) {
$tmpdoc = new DOMDocument(); $tmpdoc = new DOMDocument();
@$tmpdoc->loadHTML($tmp); @$tmpdoc->loadHTML($tmp);
if ($tmpdoc) { if ($tmpdoc) {
$tmpxpath = new DOMXPath($tmpdoc); $tmpxpath = new DOMXPath($tmpdoc);
$source_meta = $tmpxpath->query("//meta[@property='og:video']")->item(0); $source_meta = $tmpxpath->query("//meta[@property='og:video']")->item(0);
if ($source_meta) { if ($source_meta) {
$source_stream = $source_meta->getAttribute("content"); $source_stream = $source_meta->getAttribute("content");
if ($source_stream) { if ($source_stream) {
$this->handle_as_video($doc, $entry, $source_stream); $this->handle_as_video($doc, $entry, $source_stream);
$found = 1; $found = 1;
}
}
}
} }
} }
}
}
if (preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) { }
/*$video = $doc->createElement('video');
$video->setAttribute("autoplay", "1");
$video->setAttribute("loop", "1");
$source = $doc->createElement('source');
$source->setAttribute("src", str_replace(".gifv", ".mp4", $entry->getAttribute("href")));
$source->setAttribute("type", "video/mp4");
$video->appendChild($source);
$br = $doc->createElement('br');
$entry->parentNode->insertBefore($video, $entry);
$entry->parentNode->insertBefore($br, $entry);
$img = $doc->createElement('img');
$img->setAttribute("src",
"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D");
$entry->parentNode->insertBefore($img, $entry);*/ if (preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href")); $source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
$this->handle_as_video($doc, $entry, $source_stream); $this->handle_as_video($doc, $entry, $source_stream);
$found = true; $found = true;
} }
$matches = array(); $matches = array();
if (preg_match("/\/\/www\.youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) || if (preg_match("/\/\/www\.youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
preg_match("/\/\/www\.youtube\.com\/watch?v=([\w-]+)/", $entry->getAttribute("href"), $matches) || preg_match("/\/\/www\.youtube\.com\/watch\?v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches)) { preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches)) {
$vid_id = $matches[1]; $vid_id = $matches[1];
$iframe = $doc->createElement("iframe"); $iframe = $doc->createElement("iframe");
$iframe->setAttribute("class", "youtube-player"); $iframe->setAttribute("class", "youtube-player");
$iframe->setAttribute("type", "text/html"); $iframe->setAttribute("type", "text/html");
$iframe->setAttribute("width", "640"); $iframe->setAttribute("width", "640");
$iframe->setAttribute("height", "385"); $iframe->setAttribute("height", "385");
$iframe->setAttribute("src", "https://www.youtube.com/embed/$vid_id"); $iframe->setAttribute("src", "https://www.youtube.com/embed/$vid_id");
$iframe->setAttribute("allowfullscreen", "1"); $iframe->setAttribute("allowfullscreen", "1");
$iframe->setAttribute("frameborder", "0"); $iframe->setAttribute("frameborder", "0");
$br = $doc->createElement('br'); $br = $doc->createElement('br');
$entry->parentNode->insertBefore($iframe, $entry); $entry->parentNode->insertBefore($iframe, $entry);
$entry->parentNode->insertBefore($br, $entry); $entry->parentNode->insertBefore($br, $entry);
$found = true; $found = true;
} }
if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href"))) { if (preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href"))) {
$img = $doc->createElement('img'); $img = $doc->createElement('img');
$img->setAttribute("src", $entry->getAttribute("href")); $img->setAttribute("src", $entry->getAttribute("href"));
$br = $doc->createElement('br'); $br = $doc->createElement('br');
$entry->parentNode->insertBefore($img, $entry); $entry->parentNode->insertBefore($img, $entry);
$entry->parentNode->insertBefore($br, $entry); $entry->parentNode->insertBefore($br, $entry);
$found = true; $found = true;
} }
// links to imgur pages // links to imgur pages
$matches = array(); $matches = array();
if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) { if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
$token = $matches[2]; $token = $matches[2];
$album_content = fetch_file_contents($entry->getAttribute("href"), $album_content = fetch_file_contents($entry->getAttribute("href"),
false, false, false, false, 10); false, false, false, false, 10);
if ($album_content && $token) { if ($album_content && $token) {
$adoc = new DOMDocument(); $adoc = new DOMDocument();
@$adoc->loadHTML($album_content); @$adoc->loadHTML($album_content);
if ($adoc) { if ($adoc) {
$axpath = new DOMXPath($adoc); $axpath = new DOMXPath($adoc);
$aentries = $axpath->query('(//img[@src])'); $aentries = $axpath->query('(//img[@src])');
foreach ($aentries as $aentry) { foreach ($aentries as $aentry) {
if (preg_match("/\/\/i.imgur.com\/$token\./", $aentry->getAttribute("src"))) { if (preg_match("/\/\/i.imgur.com\/$token\./", $aentry->getAttribute("src"))) {
$img = $doc->createElement('img'); $img = $doc->createElement('img');
$img->setAttribute("src", $aentry->getAttribute("src")); $img->setAttribute("src", $aentry->getAttribute("src"));
$br = $doc->createElement('br'); $br = $doc->createElement('br');
$entry->parentNode->insertBefore($img, $entry); $entry->parentNode->insertBefore($img, $entry);
$entry->parentNode->insertBefore($br, $entry); $entry->parentNode->insertBefore($br, $entry);
$found = true; $found = true;
break; break;
}
}
}
} }
} }
}
}
}
// linked albums, ffs // linked albums, ffs
if (preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) { if (preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
$album_content = fetch_file_contents($entry->getAttribute("href"), $album_content = fetch_file_contents($entry->getAttribute("href"),
false, false, false, false, 10); false, false, false, false, 10);
if ($album_content) { if ($album_content) {
$adoc = new DOMDocument(); $adoc = new DOMDocument();
@$adoc->loadHTML($album_content); @$adoc->loadHTML($album_content);
if ($adoc) { if ($adoc) {
$axpath = new DOMXPath($adoc); $axpath = new DOMXPath($adoc);
$aentries = $axpath->query("//meta[@property='og:image']"); $aentries = $axpath->query("//meta[@property='og:image']");
$urls = array(); $urls = array();
foreach ($aentries as $aentry) { foreach ($aentries as $aentry) {
if (!in_array($aentry->getAttribute("content"), $urls)) { if (!in_array($aentry->getAttribute("content"), $urls)) {
$img = $doc->createElement('img'); $img = $doc->createElement('img');
$img->setAttribute("src", $aentry->getAttribute("content")); $img->setAttribute("src", $aentry->getAttribute("content"));
$entry->parentNode->insertBefore($doc->createElement('br'), $entry); $entry->parentNode->insertBefore($doc->createElement('br'), $entry);
$br = $doc->createElement('br'); $br = $doc->createElement('br');
$entry->parentNode->insertBefore($img, $entry); $entry->parentNode->insertBefore($img, $entry);
$entry->parentNode->insertBefore($br, $entry); $entry->parentNode->insertBefore($br, $entry);
array_push($urls, $aentry->getAttribute("content")); array_push($urls, $aentry->getAttribute("content"));
$found = true; $found = true;
}
}
}
} }
} }
} }
// remove tiny thumbnails
if ($entry->hasAttribute("src")) {
if ($entry->parentNode && $entry->parentNode->parentNode) {
$entry->parentNode->parentNode->removeChild($entry->parentNode);
}
}
} }
}
}
// remove tiny thumbnails
if ($entry->hasAttribute("src")) {
if ($entry->parentNode && $entry->parentNode->parentNode) {
$entry->parentNode->parentNode->removeChild($entry->parentNode);
}
}
}
if (!$found && $this->host->get($this, "enable_readability") && mb_strlen(strip_tags($article["content"])) <= 150) { return $found;
if (!class_exists("Readability")) require_once(__DIR__ . "/classes/Readability.php"); }
$content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0); function hook_article_filter($article) {
if ($content_link && strpos($content_link->getAttribute("href"), "reddit.com") === FALSE) { if (strpos($article["link"], "reddit.com/r/") !== FALSE) {
$doc = new DOMDocument();
@$doc->loadHTML($article["content"]);
$xpath = new DOMXPath($doc);
$tmp = fetch_file_contents($content_link->getAttribute("href")); $found = $this->inline_stuff($article, $doc, $xpath);
if ($tmp) { if (!$found && $this->host->get($this, "enable_readability") && mb_strlen(strip_tags($article["content"])) <= 150) {
$r = new Readability($tmp, $content_link->getAttribute("href")); if (!class_exists("Readability")) require_once(__DIR__ . "/classes/Readability.php");
if ($r->init()) { $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
//$article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
$tmpxpath = new DOMXPath($r->dom); if ($content_link && strpos($content_link->getAttribute("href"), "reddit.com") === FALSE) {
$entries = $tmpxpath->query('(//a[@href]|//img[@src])'); $tmp = fetch_file_contents($content_link->getAttribute("href"));
foreach ($entries as $entry) { if ($tmp) {
if ($entry->hasAttribute("href")) { $r = new Readability($tmp, $content_link->getAttribute("href"));
$entry->setAttribute("href",
rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("href")));
} if ($r->init()) {
//$article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
if ($entry->hasAttribute("src")) { $tmpxpath = new DOMXPath($r->dom);
$entry->setAttribute("src",
rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("src")));
} $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")));
$article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
} }
}
} if ($entry->hasAttribute("src")) {
$entry->setAttribute("src",
rewrite_relative_url($content_link->getAttribute("href"), $entry->getAttribute("src")));
} }
}
$node = $doc->getElementsByTagName('body')->item(0); $article["content"] = $r->articleContent->innerHTML . "<hr/>" . $article["content"];
if ($node && $found) { $doc = new DOMDocument();
$article["content"] = $doc->saveXML($node); @$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);
}
} }
return $article; return $article;

Loading…
Cancel
Save