Merge pull request #49 from CJxD/patch-1

Add rss/channel/itunes:summary handling

Author: thp

doc/index.rst

@@ -105,6 +105,9 @@ RSS
 **rss/channel/description**
     Podcast description (whitespace is squashed).
 
+**rss/channel/itunes:summary**
+    Podcast description (whitespace is squashed).
+
 **rss/channel/image/url**
     Podcast cover art.
 

podcastparser.py

@@ -76,19 +76,25 @@ class PodcastAttr(Target):
     WANT_TEXT = True
 
     def end(self, handler, text):
+        if not self.overwrite and handler.get_podcast_attr(self.key):
+            return
         handler.set_podcast_attr(self.key, self.filter_func(text))
 
 class PodcastAttrList(Target):
     WANT_TEXT = True
 
     def end(self, handler, text):
+        if not self.overwrite and handler.get_podcast_attr(self.key):
+            return
         handler.set_podcast_attr(self.key, self.filter_func(text).split(', '))
 
 
 class PodcastAttrType(Target):
     WANT_TEXT = True
 
     def end(self, handler, text):
+        if not self.overwrite and handler.get_podcast_attr(self.key):
+            return
         value = self.filter_func(text)
         if value in ('episodic', 'serial'):
             handler.set_podcast_attr(self.key, value)
@@ -104,6 +110,8 @@ class PodcastAttrFromHref(Target):
     ATTRIBUTE = 'href'
 
     def start(self, handler, attrs):
+        if not self.overwrite and handler.get_podcast_attr(self.key):
+            return
         value = attrs.get(self.ATTRIBUTE)
         if value:
             value = urlparse.urljoin(handler.base, value)
@@ -734,6 +742,7 @@ def parse_pubdate(text):
     'rss/channel/title': PodcastAttr('title', squash_whitespace),
     'rss/channel/link': PodcastAttrRelativeLink('link'),
     'rss/channel/description': PodcastAttr('description', squash_whitespace_not_nl),
+    'rss/channel/itunes:summary': PodcastAttr('description', squash_whitespace_not_nl, overwrite=False),
     'rss/channel/podcast:funding': PodcastAttrFromUrl('funding_url'),
     'rss/channel/podcast:locked': PodcastAttrExplicit('import_prohibited'),
     'rss/channel/image/url': PodcastAttrRelativeLink('cover_url'),
@@ -845,6 +854,9 @@ def set_base(self, base):
     def set_podcast_attr(self, key, value):
         self.data[key] = value
 
+    def get_podcast_attr(self, key, default=None):
+        return self.data.get(key, default)
+
     def set_episode_attr(self, key, value):
         self.episodes[-1][key] = value
 

tests/data/channel_description.json

@@ -0,0 +1,5 @@
+{
+	"title": "Example Feed",
+	"description": "A podcast with a description field",
+	"episodes": []
+}

tests/data/channel_description.rss

@@ -0,0 +1,6 @@
+<rss>
+    <channel>
+        <title>Example Feed</title>
+        <description>A podcast with a description field</description>
+    </channel>
+</rss>

tests/data/channel_summary.json

@@ -0,0 +1,5 @@
+{
+	"title": "Example Feed",
+	"description": "A podcast with a summary field",
+	"episodes": []
+}

tests/data/channel_summary.rss

@@ -0,0 +1,6 @@
+<rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+    <channel>
+        <title>Example Feed</title>
+        <itunes:summary>A podcast with a summary field</itunes:summary>
+    </channel>
+</rss>

tests/data/channel_summary_and_description.json

@@ -0,0 +1,5 @@
+{
+	"title": "Example Feed",
+	"description": "A podcast with a description field",
+	"episodes": []
+}

tests/data/channel_summary_and_description.rss

@@ -0,0 +1,7 @@
+<rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+    <channel>
+        <title>Example Feed</title>
+        <description>A podcast with a description field</description>
+        <itunes:summary>A podcast with a summary field</itunes:summary>
+    </channel>
+</rss>