X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/2628ac11201c749bbd3aea23597af8238b3a3e5a..321d33f3b2ffa277913e3c3277a417ecd17e53f2:/contrib/penfield/utils.py?ds=inline

diff --git a/contrib/penfield/utils.py b/contrib/penfield/utils.py
index 591ac04..0386d38 100644
--- a/contrib/penfield/utils.py
+++ b/contrib/penfield/utils.py
@@ -16,15 +16,16 @@ class FeedMultiViewMixin(object):
 	feeds_enabled = True
 	atom_feed = Atom1Feed
 	rss_feed = Rss201rev2Feed
-	feed_description = ''
+	feed_title = None
+	feed_description = None
 	list_var = 'objects'
 	
 	def page_view(self, func, page):
 		"""
 		Wraps an object-fetching function and renders the results as a page.
 		"""
-		def inner(request, node=None, extra_context=None, **kwargs):
-			objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
+		def inner(request, extra_context=None, **kwargs):
+			objects, extra_context = func(request=request, extra_context=extra_context, **kwargs)
 
 			context = self.get_context()
 			context.update(extra_context or {})
@@ -36,7 +37,7 @@ class FeedMultiViewMixin(object):
 			else:
 				context.update({self.list_var: objects})
 
-			return page.render_to_response(node, request, extra_context=context)
+			return page.render_to_response(request, extra_context=context)
 
 		return inner
 	
@@ -44,20 +45,24 @@ class FeedMultiViewMixin(object):
 		"""
 		Wraps an object-fetching function and renders the results as a rss or atom feed.
 		"""
-		def inner(request, node=None, extra_context=None, **kwargs):
-			objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
+		def inner(request, extra_context=None, **kwargs):
+			objects, extra_context = func(request=request, extra_context=extra_context, **kwargs)
 	
 			if 'HTTP_ACCEPT' in request.META and 'rss' in request.META['HTTP_ACCEPT'] and 'atom' not in request.META['HTTP_ACCEPT']:
 				feed_type = 'rss'
 			else:
 				feed_type = 'atom'
 			
-			feed = self.get_feed(feed_type, request, node, kwargs, reverse_name)
 			current_site = Site.objects.get_current()
+			#Could this be done with request.path instead somehow?
+			feed_kwargs = {
+				'link': 'http://%s/%s/%s/' % (current_site.domain, request.node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
+			}
+			feed = self.get_feed(feed_type, extra_context, feed_kwargs)
 			
 			for obj in objects:
 				kwargs = {
-					'link': 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/'))
+					'link': 'http://%s/%s/%s/' % (current_site.domain, request.node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/'))
 				}
 				self.add_item(feed, obj, kwargs=kwargs)
 	
@@ -67,15 +72,19 @@ class FeedMultiViewMixin(object):
 
 		return inner
 	
-	def get_feed(self, feed_type, request, node, kwargs, reverse_name):
-		title = self.feed_title
-		current_site = Site.objects.get_current()
-		link = 'http://%s/%s/%s/' % (current_site.domain, node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
-		description = self.feed_description
+	def get_feed(self, feed_type, extra_context, kwargs=None):
+		defaults = {
+			'description': ''
+		}
+		defaults.update(kwargs or {})
+		
 		if feed_type == 'rss':
-			return self.rss_feed(title, link, description)
+			return self.rss_feed(**defaults)
+		
+		if 'description' in defaults and defaults['description'] and 'subtitle' not in defaults:
+			defaults['subtitle'] = defaults['description']
 		
-		return self.atom_feed(title, link, description, subtitle=description)
+		return self.atom_feed(**defaults)
 	
 	def feed_patterns(self, object_fetcher, page, base_name):
 		feed_name = '%s_feed' % base_name