From 54727f9534f8b17b57d87577ed1ec0e8be8be0f3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 21 Aug 2018 07:01:26 +0300
Subject: [PATCH] parser: move media:element handling to feeditem_common; use
media:content @media attribute to generate placeholder content-type if not
specified
---
classes/feeditem/atom.php | 57 +---------------------------
classes/feeditem/common.php | 75 ++++++++++++++++++++++++++++++++++++-
classes/feeditem/rss.php | 57 +---------------------------
3 files changed, 76 insertions(+), 113 deletions(-)
mode change 100644 => 100755 classes/feeditem/atom.php
mode change 100644 => 100755 classes/feeditem/common.php
mode change 100644 => 100755 classes/feeditem/rss.php
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
old mode 100644
new mode 100755
index 8c3e0f8a7..2bae0752c
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -138,62 +138,7 @@ class FeedItem_Atom extends FeedItem_Common {
}
}
- $enclosures = $this->xpath->query("media:content", $this->elem);
-
- foreach ($enclosures as $enclosure) {
- $enc = new FeedEnclosure();
-
- $enc->type = $enclosure->getAttribute("type");
- $enc->link = $enclosure->getAttribute("url");
- $enc->length = $enclosure->getAttribute("length");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
-
- $desc = $this->xpath->query("media:description", $enclosure)->item(0);
- if ($desc) $enc->title = strip_tags($desc->nodeValue);
-
- array_push($encs, $enc);
- }
-
-
- $enclosures = $this->xpath->query("media:group", $this->elem);
-
- foreach ($enclosures as $enclosure) {
- $enc = new FeedEnclosure();
-
- $content = $this->xpath->query("media:content", $enclosure)->item(0);
-
- if ($content) {
- $enc->type = $content->getAttribute("type");
- $enc->link = $content->getAttribute("url");
- $enc->length = $content->getAttribute("length");
- $enc->height = $content->getAttribute("height");
- $enc->width = $content->getAttribute("width");
-
- $desc = $this->xpath->query("media:description", $content)->item(0);
- if ($desc) {
- $enc->title = strip_tags($desc->nodeValue);
- } else {
- $desc = $this->xpath->query("media:description", $enclosure)->item(0);
- if ($desc) $enc->title = strip_tags($desc->nodeValue);
- }
-
- array_push($encs, $enc);
- }
- }
-
- $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
-
- foreach ($enclosures as $enclosure) {
- $enc = new FeedEnclosure();
-
- $enc->type = "image/generic";
- $enc->link = $enclosure->getAttribute("url");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
-
- array_push($encs, $enc);
- }
+ $encs = array_merge($encs, parent::get_enclosures());
return $encs;
}
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
old mode 100644
new mode 100755
index 10c468544..46822b7c2
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -74,6 +74,79 @@ abstract class FeedItem_Common extends FeedItem {
}
}
+ // this is common for both Atom and RSS types and deals with various media: elements
+ function get_enclosures() {
+ $encs = [];
+
+ $enclosures = $this->xpath->query("media:content", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $enc->type = $enclosure->getAttribute("type");
+ $enc->link = $enclosure->getAttribute("url");
+ $enc->length = $enclosure->getAttribute("length");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
+
+ $medium = $enclosure->getAttribute("medium");
+ if (!$enc->type && $medium) {
+ $enc->type = strtolower("$medium/generic");
+ }
+
+ $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+ if ($desc) $enc->title = strip_tags($desc->nodeValue);
+
+ array_push($encs, $enc);
+ }
+
+ $enclosures = $this->xpath->query("media:group", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $content = $this->xpath->query("media:content", $enclosure)->item(0);
+
+ if ($content) {
+ $enc->type = $content->getAttribute("type");
+ $enc->link = $content->getAttribute("url");
+ $enc->length = $content->getAttribute("length");
+ $enc->height = $content->getAttribute("height");
+ $enc->width = $content->getAttribute("width");
+
+ $medium = $content->getAttribute("medium");
+ if (!$enc->type && $medium) {
+ $enc->type = strtolower("$medium/generic");
+ }
+
+ $desc = $this->xpath->query("media:description", $content)->item(0);
+ if ($desc) {
+ $enc->title = strip_tags($desc->nodeValue);
+ } else {
+ $desc = $this->xpath->query("media:description", $enclosure)->item(0);
+ if ($desc) $enc->title = strip_tags($desc->nodeValue);
+ }
+
+ array_push($encs, $enc);
+ }
+ }
+
+ $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+
+ foreach ($enclosures as $enclosure) {
+ $enc = new FeedEnclosure();
+
+ $enc->type = "image/generic";
+ $enc->link = $enclosure->getAttribute("url");
+ $enc->height = $enclosure->getAttribute("height");
+ $enc->width = $enclosure->getAttribute("width");
+
+ array_push($encs, $enc);
+ }
+
+ return $encs;
+ }
+
function count_children($node) {
return $node->getElementsByTagName("*")->length;
}
@@ -86,4 +159,4 @@ abstract class FeedItem_Common extends FeedItem {
}
}
-}
\ No newline at end of file
+}
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
old mode 100644
new mode 100755
index dca125be6..6bb272117
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -129,62 +129,7 @@ class FeedItem_RSS extends FeedItem_Common {
array_push($encs, $enc);
}
- $enclosures = $this->xpath->query("media:content", $this->elem);
-
- foreach ($enclosures as $enclosure) {
- $enc = new FeedEnclosure();
-
- $enc->type = $enclosure->getAttribute("type");
- $enc->link = $enclosure->getAttribute("url");
- $enc->length = $enclosure->getAttribute("length");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
-
- $desc = $this->xpath->query("media:description", $enclosure)->item(0);
- if ($desc) $enc->title = strip_tags($desc->nodeValue);
-
- array_push($encs, $enc);
- }
-
-
- $enclosures = $this->xpath->query("media:group", $this->elem);
-
- foreach ($enclosures as $enclosure) {
- $enc = new FeedEnclosure();
-
- $content = $this->xpath->query("media:content", $enclosure)->item(0);
-
- if ($content) {
- $enc->type = $content->getAttribute("type");
- $enc->link = $content->getAttribute("url");
- $enc->length = $content->getAttribute("length");
- $enc->height = $content->getAttribute("height");
- $enc->width = $content->getAttribute("width");
-
- $desc = $this->xpath->query("media:description", $content)->item(0);
- if ($desc) {
- $enc->title = strip_tags($desc->nodeValue);
- } else {
- $desc = $this->xpath->query("media:description", $enclosure)->item(0);
- if ($desc) $enc->title = strip_tags($desc->nodeValue);
- }
-
- array_push($encs, $enc);
- }
- }
-
- $enclosures = $this->xpath->query("media:thumbnail", $this->elem);
-
- foreach ($enclosures as $enclosure) {
- $enc = new FeedEnclosure();
-
- $enc->type = "image/generic";
- $enc->link = $enclosure->getAttribute("url");
- $enc->height = $enclosure->getAttribute("height");
- $enc->width = $enclosure->getAttribute("width");
-
- array_push($encs, $enc);
- }
+ $encs = array_merge($encs, parent::get_enclosures());
return $encs;
}
--
GitLab