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

Merge branch 'cache_videos_with_src_and_poster' of lllusion3418/tt-rss into master

This commit is contained in:
fox 2020-03-12 10:18:59 +00:00 committed by Gogs
parent 208e02c47d ec1b0befc7
commit 82326187f9
2 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
classes/diskcache.php
View File

@ -89,33 +89,30 @@ class DiskCache {
$xpath = new DOMXPath($doc); $xpath = new DOMXPath($doc);
$cache = new DiskCache("images"); $cache = new DiskCache("images");
$entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])'); $entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video[@src]|//video/source[@src]|//audio/source[@src])');
$need_saving = false; $need_saving = false;
foreach ($entries as $entry) { foreach ($entries as $entry) {
if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) { foreach (array('src', 'poster') as $attr) {
if ($entry->hasAttribute($attr)) {
// should be already absolutized because this is called after sanitize() // should be already absolutized because this is called after sanitize()
$src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src'); $src = $entry->getAttribute($attr);
$cached_filename = sha1($src); $cached_filename = sha1($src);
if ($cache->exists($cached_filename)) { if ($cache->exists($cached_filename)) {
$src = $cache->getUrl(sha1($src)); $src = $cache->getUrl(sha1($src));
if ($entry->hasAttribute('poster')) $entry->setAttribute($attr, $src);
$entry->setAttribute('poster', $src);
else {
$entry->setAttribute('src', $src);
$entry->removeAttribute("srcset"); $entry->removeAttribute("srcset");
}
$need_saving = true; $need_saving = true;
} }
} }
} }
}
if ($need_saving) { if ($need_saving) {
$doc->removeChild($doc->firstChild); //remove doctype $doc->removeChild($doc->firstChild); //remove doctype

8
classes/rssutils.php
View File

@ -1229,11 +1229,12 @@ class RSSUtils {
if ($doc->loadHTML($html)) { if ($doc->loadHTML($html)) {
$xpath = new DOMXPath($doc); $xpath = new DOMXPath($doc);
$entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])'); $entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])|(//video[@poster])|(//video[@src])');
foreach ($entries as $entry) { foreach ($entries as $entry) {
if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) { foreach (array('src', 'poster') as $attr) {
$src = rewrite_relative_url($site_url, $entry->getAttribute('src')); if ($entry->hasAttribute($attr) && strpos($entry->getAttribute($attr), "data:") !== 0) {
$src = rewrite_relative_url($site_url, $entry->getAttribute($attr));
$local_filename = sha1($src); $local_filename = sha1($src);
@ -1262,6 +1263,7 @@ class RSSUtils {
} }
} }
} }
}
static function expire_error_log() { static function expire_error_log() {
Debug::log("Removing old error log entries..."); Debug::log("Removing old error log entries...");