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

Merge pull request #327 from lotrfan/media_group 

Follow the spec for <media:group>s
This commit is contained in:
Andrew Dolgov 2013-11-18 00:10:42 -08:00
parent 15d8bd7dbf ed449a9aaa
commit 7d36c24c20
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
classes/feeditem/atom.php
View File

@ -137,7 +137,7 @@ class FeedItem_Atom extends FeedItem_Common {
} }
} }
$enclosures = $this->xpath->query("media:content | media:group/media:content", $this->elem); $enclosures = $this->xpath->query("media:content", $this->elem);
foreach ($enclosures as $enclosure) { foreach ($enclosures as $enclosure) {
$enc = new FeedEnclosure(); $enc = new FeedEnclosure();
@ -152,6 +152,29 @@ class FeedItem_Atom extends FeedItem_Common {
array_push($encs, $enc); 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);
$enc->type = $content->getAttribute("type");
$enc->link = $content->getAttribute("url");
$enc->length = $content->getAttribute("length");
$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);
}
return $encs; return $encs;
} }

25
classes/feeditem/rss.php
View File

@ -112,7 +112,7 @@ class FeedItem_RSS extends FeedItem_Common {
array_push($encs, $enc); array_push($encs, $enc);
} }
$enclosures = $this->xpath->query("media:content | media:group/media:content", $this->elem); $enclosures = $this->xpath->query("media:content", $this->elem);
foreach ($enclosures as $enclosure) { foreach ($enclosures as $enclosure) {
$enc = new FeedEnclosure(); $enc = new FeedEnclosure();
@ -127,6 +127,29 @@ class FeedItem_RSS extends FeedItem_Common {
array_push($encs, $enc); 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);
$enc->type = $content->getAttribute("type");
$enc->link = $content->getAttribute("url");
$enc->length = $content->getAttribute("length");
$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);
}
return $encs; return $encs;
} }