From edeea73dc93ccfb7c68ada4aa318d7939ef96efa Mon Sep 17 00:00:00 2001
From: Julien Enselme <jenselme@jujens.eu>
Date: Sun, 28 Apr 2024 12:41:33 +0200
Subject: [PATCH] Correct parsing of media values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- They all go into lists.
- They don’t erase the entry title or summary.

See #195 and #53
---
 feedparser/namespaces/mediarss.py             | 36 +++++++++++++------
 .../media-rss/item_media_title_type_plain.xml |  2 +-
 .../wellformed/media-rss/media_content_1.xml  | 16 +++++++++
 .../wellformed/media-rss/media_content_2.xml  | 16 +++++++++
 .../wellformed/media-rss/media_content_3.xml  | 22 ++++++++++++
 tests/wellformed/media-rss/media_group.xml    |  2 +-
 6 files changed, 82 insertions(+), 12 deletions(-)
 create mode 100644 tests/wellformed/media-rss/media_content_1.xml
 create mode 100644 tests/wellformed/media-rss/media_content_2.xml
 create mode 100644 tests/wellformed/media-rss/media_content_3.xml

diff --git a/feedparser/namespaces/mediarss.py b/feedparser/namespaces/mediarss.py
index 5ec4b67b..29a94c42 100644
--- a/feedparser/namespaces/mediarss.py
+++ b/feedparser/namespaces/mediarss.py
@@ -49,14 +49,6 @@ def _end_media_keywords(self):
             if term.strip():
                 self._add_tag(term.strip(), None, None)
 
-    def _start_media_title(self, attrs_d):
-        self._start_title(attrs_d)
-
-    def _end_media_title(self):
-        title_depth = self.title_depth
-        self._end_title()
-        self.title_depth = title_depth
-
     def _start_media_group(self, attrs_d):
         # don't do anything, but don't break the enclosed tags either
         pass
@@ -85,10 +77,34 @@ def _end_media_credit(self):
             context["media_credit"][-1]["content"] = credit
 
     def _start_media_description(self, attrs_d):
-        self._start_description(attrs_d)
+        context = self._get_context()
+        context.setdefault("media_description", [])
+        attrs = attrs_d.copy()
+        if "type" in attrs:
+            attrs["type"] = self.map_content_type(attrs["type"])
+        context["media_description"].append(attrs)
+        self.push("media_desc", 1)
 
     def _end_media_description(self):
-        self._end_description()
+        description_ = self.pop("media_desc")
+        if description_ is not None and description_.strip():
+            context = self._get_context()
+            context["media_description"][-1]["content"] = description_
+
+    def _start_media_title(self, attrs_d):
+        context = self._get_context()
+        context.setdefault("media_title", [])
+        attrs = attrs_d.copy()
+        if "type" in attrs:
+            attrs["type"] = self.map_content_type(attrs["type"])
+        context["media_title"].append(attrs)
+        self.push("title", 1)
+
+    def _end_media_title(self):
+        title_ = self.pop("title")
+        if title_ is not None and title_.strip():
+            context = self._get_context()
+            context["media_title"][-1]["content"] = title_
 
     def _start_media_restriction(self, attrs_d):
         context = self._get_context()
diff --git a/tests/wellformed/media-rss/item_media_title_type_plain.xml b/tests/wellformed/media-rss/item_media_title_type_plain.xml
index 923d1f76..7546fc47 100644
--- a/tests/wellformed/media-rss/item_media_title_type_plain.xml
+++ b/tests/wellformed/media-rss/item_media_title_type_plain.xml
@@ -1,6 +1,6 @@
 <!--
 Description: media:title @type="plain"
-Expect:      not bozo and entries[0]['title_detail']['type'] == 'text/plain'
+Expect:      not bozo and entries[0]['media_title'][0]['type'] == 'text/plain'
 -->
 <rss xmlns:media="http://search.yahoo.com/mrss/">
   <channel>
diff --git a/tests/wellformed/media-rss/media_content_1.xml b/tests/wellformed/media-rss/media_content_1.xml
new file mode 100644
index 00000000..021f90fe
--- /dev/null
+++ b/tests/wellformed/media-rss/media_content_1.xml
@@ -0,0 +1,16 @@
+<!--
+Description: media_content title and description at entry bottom
+Expect:      entries[0]['summary'] == 'Test description' and entries[0]['media_content'][0]['url'] == 'https://example.com/img.jpg' and entries[0]['media_title'][0]['content'] == 'Media title' and entries[0]['media_title'][0]['type'] == 'text/plain' and entries[0]['media_description'][0]['content'] == 'Media description' and entries[0]['media_description'][0]['type'] == 'text/plain' and entries[0]['media_credit'][0]['content'] == 'Media credit'
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#" xmlns:media="http://search.yahoo.com/mrss/">
+    <entry>
+        <media:content width="644" height="322"
+                       url="https://example.com/img.jpg">
+            <media:title type="plain">Media title</media:title>
+            <media:description type="plain">Media description</media:description>
+            <media:credit scheme="urn:ebu">Media credit</media:credit>
+        </media:content>
+        <title>Example Atom</title>
+        <description>Test description</description>
+    </entry>
+</feed>
diff --git a/tests/wellformed/media-rss/media_content_2.xml b/tests/wellformed/media-rss/media_content_2.xml
new file mode 100644
index 00000000..8fc02940
--- /dev/null
+++ b/tests/wellformed/media-rss/media_content_2.xml
@@ -0,0 +1,16 @@
+<!--
+Description: media_content title and description at entry top
+Expect:      entries[0]['summary'] == 'Test description' and entries[0]['media_content'][0]['url'] == 'https://example.com/img.jpg' and entries[0]['media_title'][0]['content'] == 'Media title' and entries[0]['media_title'][0]['type'] == 'text/plain' and entries[0]['media_description'][0]['content'] == 'Media description' and entries[0]['media_description'][0]['type'] == 'text/plain' and entries[0]['media_credit'][0]['content'] == 'Media credit'
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#" xmlns:media="http://search.yahoo.com/mrss/">
+    <entry>
+        <title>Example Atom</title>
+        <description>Test description</description>
+        <media:content width="644" height="322"
+                       url="https://example.com/img.jpg">
+            <media:title type="plain">Media title</media:title>
+            <media:description type="plain">Media description</media:description>
+            <media:credit scheme="urn:ebu">Media credit</media:credit>
+        </media:content>
+    </entry>
+</feed>
diff --git a/tests/wellformed/media-rss/media_content_3.xml b/tests/wellformed/media-rss/media_content_3.xml
new file mode 100644
index 00000000..c381820f
--- /dev/null
+++ b/tests/wellformed/media-rss/media_content_3.xml
@@ -0,0 +1,22 @@
+<!--
+Description: media_content with multiple media tags
+Expect:      entries[0]['summary'] == 'Test description' and entries[0]['media_content'][0]['url'] == 'https://example.com/img.jpg' and entries[0]['media_title'][0]['content'] == 'Media title' and entries[0]['media_title'][0]['type'] == 'text/plain' and entries[0]['media_description'][0]['content'] == 'Media description' and entries[0]['media_description'][0]['type'] == 'text/plain' and entries[0]['media_credit'][0]['content'] == 'Media credit' and entries[0]['media_content'][1]['url'] == 'https://example.com/img2.jpg' and entries[0]['media_title'][1]['content'] == 'Media title 2' and entries[0]['media_title'][1]['type'] == 'text/plain' and entries[0]['media_description'][1]['content'] == 'Media description 2' and entries[0]['media_description'][0]['type'] == 'text/plain' and entries[0]['media_credit'][1]['content'] == 'Media credit 2'
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#" xmlns:media="http://search.yahoo.com/mrss/">
+    <entry>
+        <title>Example Atom</title>
+        <description>Test description</description>
+        <media:content width="644" height="322"
+                       url="https://example.com/img.jpg">
+            <media:title type="plain">Media title</media:title>
+            <media:description type="plain">Media description</media:description>
+            <media:credit scheme="urn:ebu">Media credit</media:credit>
+        </media:content>
+        <media:content width="644" height="322"
+                       url="https://example.com/img2.jpg">
+            <media:title type="plain">Media title 2</media:title>
+            <media:description type="plain">Media description 2</media:description>
+            <media:credit scheme="urn:ebu">Media credit 2</media:credit>
+        </media:content>
+    </entry>
+</feed>
diff --git a/tests/wellformed/media-rss/media_group.xml b/tests/wellformed/media-rss/media_group.xml
index 360be061..b0ce7c92 100644
--- a/tests/wellformed/media-rss/media_group.xml
+++ b/tests/wellformed/media-rss/media_group.xml
@@ -1,6 +1,6 @@
 <!--
 Description: media_group
-Expect:      entries[0]['description'] == 'Test Description' and entries[0]['media_credit'][0]['role'] == 'creator' and entries[0]['media_credit'][0]['content'] == 'Creator' and entries[0]['media_credit'][1]['role'] == 'writer' and entries[0]['media_credit'][1]['content'] == 'Writer' and entries[0]['media_restriction']['relationship'] == 'allow' and entries[0]['media_restriction']['content'] == ['au', 'us'] and entries[0]['media_license']['type'] == 'plain' and entries[0]['media_license']['href'] == 'http://example.com/' and entries[0]['media_license']['content'] == 'License' and entries[0]['media_rating']['content'] == 'adult'
+Expect:      entries[0]['media_description'][0]['content'] == 'Test Description' and entries[0]['media_credit'][0]['role'] == 'creator' and entries[0]['media_credit'][0]['content'] == 'Creator' and entries[0]['media_credit'][1]['role'] == 'writer' and entries[0]['media_credit'][1]['content'] == 'Writer' and entries[0]['media_restriction']['relationship'] == 'allow' and entries[0]['media_restriction']['content'] == ['au', 'us'] and entries[0]['media_license']['type'] == 'plain' and entries[0]['media_license']['href'] == 'http://example.com/' and entries[0]['media_license']['content'] == 'License' and entries[0]['media_rating']['content'] == 'adult'
 -->
 <feed version="0.3" xmlns="http://purl.org/atom/ns#" xmlns:media="http://search.yahoo.com/mrss/">
 <entry>