Skip to content

Commit

Permalink
feat(FeedParser): recursively parse rss modules
Browse files Browse the repository at this point in the history
Also stop excluding the media module

fix RSS-Bridge#4415
  • Loading branch information
dvikan committed Jan 25, 2025
1 parent 028acd0 commit 43f7ac3
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 3 deletions.
12 changes: 9 additions & 3 deletions lib/FeedParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function parseRss2Item(\SimpleXMLElement $feedItem): array
}

foreach ($namespaces as $namespaceName => $namespaceUrl) {
if (in_array($namespaceName, ['', 'content', 'media'])) {
if (in_array($namespaceName, ['', 'content'])) {
continue;
}
$item[$namespaceName] = $this->parseModule($feedItem, $namespaceName, $namespaceUrl);
Expand Down Expand Up @@ -250,11 +250,17 @@ public function parseRss1Item(\SimpleXMLElement $feedItem): array

private function parseModule(\SimpleXMLElement $element, string $namespaceName, string $namespaceUrl): array
{
// Unfortunately this parses out only node values as string
// TODO: parse attributes too

$result = [];
$module = $element->children($namespaceUrl);
foreach ($module as $name => $value) {
// todo: add custom parsing if it's something other than a string
$result[$name] = (string) $value;
if (get_class($value) === 'SimpleXMLElement' && $value->count() !== 0) {
$result[$name] = $this->parseModule($value, $namespaceName, $namespaceUrl);
} else {
$result[$name] = (string) $value;
}
}
return $result;
}
Expand Down
79 changes: 79 additions & 0 deletions tests/FeedParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,83 @@ public function testAppleItunesModule()
];
$this->assertEquals($expected, $feed);
}

public function testYoutubeMediaModule()
{
$xml = <<<XML
<?xml version="1.0" encoding="UTF-8"?>
<feed xmlns:yt="http://www.youtube.com/xml/schemas/2015" xmlns:media="http://search.yahoo.com/mrss/" xmlns="http://www.w3.org/2005/Atom">
<link rel="self" href="http://www.youtube.com/feeds/videos.xml?channel_id=UCuCkxoKLYO_EQ2GeFtbM_bw"/>
<id>yt:channel:uCkxoKLYO_EQ2GeFtbM_bw</id>
<yt:channelId>uCkxoKLYO_EQ2GeFtbM_bw</yt:channelId>
<title>Half as Interesting</title>
<link rel="alternate" href="https://www.youtube.com/channel/UCuCkxoKLYO_EQ2GeFtbM_bw"/>
<author>
<name>Half as Interesting</name>
<uri>https://www.youtube.com/channel/UCuCkxoKLYO_EQ2GeFtbM_bw</uri>
</author>
<published>2017-08-26T20:06:05+00:00</published>
<entry>
<id>yt:video:Upjg7F28DJw</id>
<yt:videoId>Upjg7F28DJw</yt:videoId>
<yt:channelId>UCuCkxoKLYO_EQ2GeFtbM_bw</yt:channelId>
<title>The Nuke-Proof US Military Base in a Mountain</title>
<link rel="alternate" href="https://www.youtube.com/watch?v=Upjg7F28DJw"/>
<author>
<name>Half as Interesting</name>
<uri>https://www.youtube.com/channel/UCuCkxoKLYO_EQ2GeFtbM_bw</uri>
</author>
<published>2025-01-24T15:44:18+00:00</published>
<updated>2025-01-25T06:55:19+00:00</updated>
<media:group>
<media:title>The Nuke-Proof US Military Base in a Mountain</media:title>
<media:content url="https://www.youtube.com/v/Upjg7F28DJw?version=3" type="application/x-shockwave-flash" width="640" height="390"/>
<media:thumbnail url="https://i2.ytimg.com/vi/Upjg7F28DJw/hqdefault.jpg" width="480" height="360"/>
<media:description>Receive 10% off anything on bellroy.com: https://bit.ly/3HdOWu9</media:description>
<media:community>
<media:starRating count="10157" average="5.00" min="1" max="5"/>
<media:statistics views="228462"/>
</media:community>
</media:group>
</entry>
</feed>
XML;

$feed = $this->sut->parseFeed($xml);
$expected = [
'title' => 'Half as Interesting',
'uri' => 'https://www.youtube.com/channel/UCuCkxoKLYO_EQ2GeFtbM_bw',
'icon' => null,
'items' => [
[
'uri' => 'https://www.youtube.com/watch?v=Upjg7F28DJw',
'title' => 'The Nuke-Proof US Military Base in a Mountain',
'content' => '',
'timestamp' => 1737788119,
'author' => 'Half as Interesting',
'id' => 'yt:video:Upjg7F28DJw',
'published' => '2025-01-24T15:44:18+00:00',
'updated' => '2025-01-25T06:55:19+00:00',
'link' => '',
'yt' => [
'videoId' => 'Upjg7F28DJw',
'channelId' => 'UCuCkxoKLYO_EQ2GeFtbM_bw',
],
'media' => [
'group' => [
'title' => 'The Nuke-Proof US Military Base in a Mountain',
'content' => '',
'thumbnail' => '',
'description' => 'Receive 10% off anything on bellroy.com: https://bit.ly/3HdOWu9',
'community' => [
'starRating' => '',
'statistics' => '',
],
],
],
]
],
];
$this->assertEquals($expected, $feed);
}
}

0 comments on commit 43f7ac3

Please sign in to comment.