diff --git a/conservancy/podjango/feeds.py b/conservancy/podjango/feeds.py index 601434fe572fc05f3d157eb4e2ae42e3cb5bbd0a..a0e32aa2607918bee9c69ecb1982eeca27ad37e9 100644 --- a/conservancy/podjango/feeds.py +++ b/conservancy/podjango/feeds.py @@ -29,10 +29,13 @@ from .models import Cast # FIXME: Settings here should not be hard-coded for given casts, but # should instead have settings from the main screen. + class CastFeedBase(Feed): - def copyright_holder(self): return "Bradley M. Kuhn, Karen M. Sandler" + def copyright_holder(self): + return "Bradley M. Kuhn, Karen M. Sandler" - def license_no_html(self): return "Licensed under a Creative Commons Attribution-Share Alike 3.0 USA License." + def license_no_html(self): + return "Licensed under a Creative Commons Attribution-Share Alike 3.0 USA License." def item_copyright(self, item): year = 2008 @@ -132,12 +135,14 @@ def podcast_helper_add_root_elements(self, handler): 'type': "application/rss+xml"}) years = {} - for ii in self.items: years[ii['year']] = 1 + for ii in self.items: + years[ii['year']] = 1 copyrightString = "" ll = years.keys() sorted(ll) - for yy in ll: copyrightString += "%d, " % yy + for yy in ll: + copyrightString += "%d, " % yy copyrightString += "%s. %s" % (self.feed['copyrightHolder'], self.feed['copyrightLicense']) handler.addQuickElement('copyright', copyrightString) @@ -156,6 +161,7 @@ def podcast_helper_add_item_elements(self, handler, item): 'fileSize': item['enclosure'].length, 'type': item['enclosure'].mime_type}) + # http://www.feedforall.com/itune-tutorial-tags.htm # http://www.feedforall.com/mediarss.htm class iTunesFeedType(Rss201rev2Feed): @@ -235,17 +241,23 @@ class CastFeed(CastFeedBase): class Mp3CastFeed(CastFeed): - def item_enclosure_mime_type(self): return "audio/mpeg" + def item_enclosure_mime_type(self): + return "audio/mpeg" + def item_enclosure_url(self, item): return add_domain(self.current_site.domain, item.mp3_path, self.is_secure) + def item_enclosure_length(self, item): return item.mp3_length class OggCastFeed(CastFeed): - def item_enclosure_mime_type(self): return "audio/ogg" + def item_enclosure_mime_type(self): + return "audio/ogg" + def item_enclosure_url(self, item): return add_domain(self.current_site.domain, item.ogg_path, self.is_secure) + def item_enclosure_length(self, item): return item.ogg_length