heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry)

Browse Source
This commit is contained in:
Michele Azzolari 2012-01-05 18:48:23 +01:00 committed by Christopher Allan Webber
parent bcd50908d2
commit 1df68a3524
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mediagoblin/db/mongo/models.py
View File

@ -255,7 +255,7 @@ class MediaEntry(Document):
if duplicate: if duplicate:
self.slug = "%s-%s" % (self._id, self.slug) 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 Generate an appropriate url for ourselves
@ -267,12 +267,14 @@ class MediaEntry(Document):
return urlgen( return urlgen(
'mediagoblin.user_pages.media_home', 'mediagoblin.user_pages.media_home',
user=uploader.username, user=uploader.username,
media=self.slug) media=self.slug,
**extra_args)
else: else:
return urlgen( return urlgen(
'mediagoblin.user_pages.media_home', 'mediagoblin.user_pages.media_home',
user=uploader.username, user=uploader.username,
media=unicode(self._id)) media=unicode(self._id),
**extra_args)
def url_to_prev(self, urlgen): def url_to_prev(self, urlgen):
""" """

24
mediagoblin/listings/views.py
View File

@ -77,17 +77,33 @@ def tag_atom_feed(request):
cursor = cursor.sort('created', DESCENDING) cursor = cursor.sort('created', DESCENDING)
cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
"""
ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
"""
feed = AtomFeed( feed = AtomFeed(
"MediaGoblin: Feed for tag '%s'" % tag_slug, "MediaGoblin: Feed for tag '%s'" % tag_slug,
feed_url=request.url, feed_url=request.url,
url=request.host_url) id='tag:'+request.host+',2011:gallery.tag-%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: for entry in cursor:
feed.add(entry.get('title'), feed.add(entry.get('title'),
entry.get('description_html'), entry.get('description_html'),
id=entry.url_for_self(request.urlgen,qualified=True),
content_type='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'), 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'}])
return feed.get_response() return feed.get_response()

28
mediagoblin/user_pages/views.py
View File

@ -225,17 +225,37 @@ def atom_feed(request):
.sort('created', DESCENDING) \ .sort('created', DESCENDING) \
.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) .limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
feed = AtomFeed(request.matchdict['user'], """
ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI)
"""
feed = AtomFeed(
"MediaGoblin: Feed for user '%s'" % request.matchdict['user'],
feed_url=request.url, feed_url=request.url,
url=request.host_url) id='tag:'+request.host+',2011:gallery.user-'+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: for entry in cursor:
feed.add(entry.get('title'), feed.add(entry.get('title'),
entry.get('description_html'), entry.get('description_html'),
id=entry.url_for_self(request.urlgen,qualified=True),
content_type='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'), 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'}])
return feed.get_response() return feed.get_response()