From 1e814968bd5909e0914b70ff89d9ae9dd4b29c7b Mon Sep 17 00:00:00 2001 From: Michele Azzolari Date: Thu, 29 Dec 2011 16:45:54 +0000 Subject: [PATCH] Fixed #724 and added some more infos to the atom (author uri and links to the html version) --- mediagoblin/db/mongo/models.py | 6 +++--- mediagoblin/listings/views.py | 9 +++++---- mediagoblin/user_pages/views.py | 11 +++++++---- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py index 5de59c1..c44a2a8 100644 --- a/mediagoblin/db/mongo/models.py +++ b/mediagoblin/db/mongo/models.py @@ -255,7 +255,7 @@ class MediaEntry(Document): if duplicate: self.slug = "%s-%s" % (self._id, self.slug) - def url_for_self(self, urlgen): + def url_for_self(self, urlgen, **extra_args): """ Generate an appropriate url for ourselves @@ -267,12 +267,12 @@ class MediaEntry(Document): return urlgen( 'mediagoblin.user_pages.media_home', user=uploader.username, - media=self.slug) + media=self.slug, **extra_args) else: return urlgen( 'mediagoblin.user_pages.media_home', user=uploader.username, - media=unicode(self._id)) + media=unicode(self._id), **extra_args) def url_to_prev(self, urlgen): """ diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index 3ecf06f..6092e37 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -80,14 +80,15 @@ def tag_atom_feed(request): feed = AtomFeed( "MediaGoblin: Feed for tag '%s'" % tag_slug, feed_url=request.url, - url=request.host_url) - + id='tag:'+request.host+',2011:TagGallery:%s' % tag_slug, + links=[{'href': request.urlgen('mediagoblin.listings.tags_listing', qualified=True,tag=tag_slug ), 'rel': 'alternate','type': 'text/html'}]) for entry in cursor: feed.add(entry.get('title'), entry.get('description_html'), content_type='html', - author=entry.get_uploader.username, + author={'name': entry.get_uploader.username,'uri': request.urlgen('mediagoblin.user_pages.user_home', qualified=True, user=entry.get_uploader.username)}, updated=entry.get('created'), - url=entry.url_for_self(request.urlgen)) + links=[{'href':entry.url_for_self(request.urlgen,qualified=True), 'rel': 'alternate','type': 'text/html'}], + url=entry.url_for_self(request.urlgen, qualified=True)) return feed.get_response() diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index f721f01..19e869b 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -225,17 +225,20 @@ def atom_feed(request): .sort('created', DESCENDING) \ .limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) - feed = AtomFeed(request.matchdict['user'], + feed = AtomFeed( + "MediaGoblin: Feed for user '%s'" % request.matchdict['user'], feed_url=request.url, - url=request.host_url) + id='tag:'+request.host+',2011:UserGallery:'+request.matchdict['user'], + links=[{'href':request.urlgen('mediagoblin.user_pages.user_home', qualified=True,user=request.matchdict['user']), 'rel': 'alternate','type': 'text/html'}]) for entry in cursor: feed.add(entry.get('title'), entry.get('description_html'), content_type='html', - author=request.matchdict['user'], + author={'name': entry.get_uploader.username,'uri': request.urlgen('mediagoblin.user_pages.user_home',qualified=True, user=entry.get_uploader.username)}, updated=entry.get('created'), - url=entry.url_for_self(request.urlgen)) + links=[{'href':entry.url_for_self(request.urlgen,qualified=True), 'rel': 'alternate','type': 'text/html'}], + url=entry.url_for_self(request.urlgen,qualified=True)) return feed.get_response() -- 1.7.0.4