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

2 files changed, 31 insertions, 32 deletions

diff --git a/classes/diskcache.php b/classes/diskcache.php
index 7e4a8335d..ba6aef858 100644
--- a/classes/diskcache.php
+++ b/classes/diskcache.php
@@ -89,30 +89,27 @@ class DiskCache {
 			$xpath = new DOMXPath($doc);
 			$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;
 
 			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()
+						$src = $entry->getAttribute($attr);
+						$cached_filename = sha1($src);
 
-					// should be already absolutized because this is called after sanitize()
-					$src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('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('poster', $src);
-						else {
-							$entry->setAttribute('src', $src);
+							$entry->setAttribute($attr, $src);
 							$entry->removeAttribute("srcset");
-						}
 
-						$need_saving = true;
+							$need_saving = true;
+						}
 					}
 				}
 			}
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 87e194603..68523ba8a 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -1229,33 +1229,35 @@ class RSSUtils {
 			if ($doc->loadHTML($html)) {
 				$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) {
-					if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
-						$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+					foreach (array('src', 'poster') as $attr) {
+						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);
 
-						Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
+							Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
 
-						if (!$cache->exists($local_filename)) {
-							Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+							if (!$cache->exists($local_filename)) {
+								Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-							global $fetch_last_error_code;
-							global $fetch_last_error;
+								global $fetch_last_error_code;
+								global $fetch_last_error;
 
-							$file_content = fetch_file_contents(array("url" => $src,
-								"http_referrer" => $src,
-								"max_size" => MAX_CACHE_FILE_SIZE));
+								$file_content = fetch_file_contents(array("url" => $src,
+									"http_referrer" => $src,
+									"max_size" => MAX_CACHE_FILE_SIZE));
 
-							if ($file_content) {
-								$cache->put($local_filename, $file_content);
-							} else {
-								Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
+								if ($file_content) {
+									$cache->put($local_filename, $file_content);
+								} else {
+									Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
+								}
+							} else if ($cache->isWritable($local_filename)) {
+								$cache->touch($local_filename);
 							}
-						} else if ($cache->isWritable($local_filename)) {
-							$cache->touch($local_filename);
 						}
 					}
 				}