Mercurial > kallithea
changeset 2397:d815d617eb5e beta
added rss/atom feeds into personalized journal
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 06 Jun 2012 13:50:38 +0200 |
| parents | b0d09c20f608 |
| children | 378b0247e938 |
| files | rhodecode/config/routing.py rhodecode/controllers/journal.py rhodecode/templates/journal/journal.html rhodecode/templates/journal/public_journal.html |
| diffstat | 4 files changed, 117 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/routing.py Tue Jun 05 01:06:40 2012 +0200 +++ b/rhodecode/config/routing.py Wed Jun 06 13:50:38 2012 +0200 @@ -337,7 +337,12 @@ m.connect('api', '/api') #USER JOURNAL - rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, controller='journal') + rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, + controller='journal', action='index') + rmap.connect('journal_rss', '%s/journal/rss' % ADMIN_PREFIX, + controller='journal', action='journal_rss') + rmap.connect('journal_atom', '%s/journal/atom' % ADMIN_PREFIX, + controller='journal', action='journal_atom') rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX, controller='journal', action="public_journal")
--- a/rhodecode/controllers/journal.py Tue Jun 05 01:06:40 2012 +0200 +++ b/rhodecode/controllers/journal.py Wed Jun 06 13:50:38 2012 +0200 @@ -49,8 +49,6 @@ def __before__(self): super(JournalController, self).__before__() - self.rhodecode_user = self.rhodecode_user - self.title = _('%s public journal %s feed') % (c.rhodecode_name, '%s') self.language = 'en-us' self.ttl = "5" self.feed_nr = 20 @@ -84,6 +82,28 @@ return c.journal_data return render('journal/journal.html') + @LoginRequired(api_access=True) + def journal_atom(self): + """ + Produce an atom-1.0 feed via feedgenerator module + """ + following = self.sa.query(UserFollowing)\ + .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\ + .options(joinedload(UserFollowing.follows_repository))\ + .all() + return self._atom_feed(following, public=False) + + @LoginRequired(api_access=True) + def journal_rss(self): + """ + Produce an rss feed via feedgenerator module + """ + following = self.sa.query(UserFollowing)\ + .filter(UserFollowing.user_id == self.rhodecode_user.user_id)\ + .options(joinedload(UserFollowing.follows_repository))\ + .all() + return self._rss_feed(following, public=False) + def _get_daily_aggregate(self, journal): groups = [] for k, g in groupby(journal, lambda x: x.action_as_day): @@ -173,6 +193,80 @@ return c.journal_data return render('journal/public_journal.html') + def _atom_feed(self, repos, public=True): + journal = self._get_journal_data(repos) + if public: + _link = url('public_journal_atom', qualified=True) + _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'), + 'atom feed') + else: + _link = url('journal_atom', qualified=True) + _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'atom feed') + + feed = Atom1Feed(title=_desc, + link=_link, + description=_desc, + language=self.language, + ttl=self.ttl) + + for entry in journal[:self.feed_nr]: + action, action_extra, ico = h.action_parser(entry, feed=True) + title = "%s - %s %s" % (entry.user.short_contact, action(), + entry.repository.repo_name) + desc = action_extra() + _url = None + if entry.repository is not None: + _url = url('changelog_home', + repo_name=entry.repository.repo_name, + qualified=True) + + feed.add_item(title=title, + pubdate=entry.action_date, + link=_url or url('', qualified=True), + author_email=entry.user.email, + author_name=entry.user.full_contact, + description=desc) + + response.content_type = feed.mime_type + return feed.writeString('utf-8') + + def _rss_feed(self, repos, public=True): + journal = self._get_journal_data(repos) + if public: + _link = url('public_journal_atom', qualified=True) + _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'), + 'rss feed') + else: + _link = url('journal_atom', qualified=True) + _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'rss feed') + + feed = Rss201rev2Feed(title=_desc, + link=_link, + description=_desc, + language=self.language, + ttl=self.ttl) + + for entry in journal[:self.feed_nr]: + action, action_extra, ico = h.action_parser(entry, feed=True) + title = "%s - %s %s" % (entry.user.short_contact, action(), + entry.repository.repo_name) + desc = action_extra() + _url = None + if entry.repository is not None: + _url = url('changelog_home', + repo_name=entry.repository.repo_name, + qualified=True) + + feed.add_item(title=title, + pubdate=entry.action_date, + link=_url or url('', qualified=True), + author_email=entry.user.email, + author_name=entry.user.full_contact, + description=desc) + + response.content_type = feed.mime_type + return feed.writeString('utf-8') + @LoginRequired(api_access=True) def public_journal_atom(self): """ @@ -183,28 +277,7 @@ .options(joinedload(UserFollowing.follows_repository))\ .all() - journal = self._get_journal_data(c.following) - - feed = Atom1Feed(title=self.title % 'atom', - link=url('public_journal_atom', qualified=True), - description=_('Public journal'), - language=self.language, - ttl=self.ttl) - - for entry in journal[:self.feed_nr]: - action, action_extra, ico = h.action_parser(entry, feed=True) - title = "%s - %s %s" % (entry.user.short_contact, action(), - entry.repository.repo_name) - desc = action_extra() - feed.add_item(title=title, - pubdate=entry.action_date, - link=url('', qualified=True), - author_email=entry.user.email, - author_name=entry.user.full_contact, - description=desc) - - response.content_type = feed.mime_type - return feed.writeString('utf-8') + return self._atom_feed(c.following) @LoginRequired(api_access=True) def public_journal_rss(self): @@ -216,25 +289,4 @@ .options(joinedload(UserFollowing.follows_repository))\ .all() - journal = self._get_journal_data(c.following) - - feed = Rss201rev2Feed(title=self.title % 'rss', - link=url('public_journal_rss', qualified=True), - description=_('Public journal'), - language=self.language, - ttl=self.ttl) - - for entry in journal[:self.feed_nr]: - action, action_extra, ico = h.action_parser(entry, feed=True) - title = "%s - %s %s" % (entry.user.short_contact, action(), - entry.repository.repo_name) - desc = action_extra() - feed.add_item(title=title, - pubdate=entry.action_date, - link=url('', qualified=True), - author_email=entry.user.email, - author_name=entry.user.full_contact, - description=desc) - - response.content_type = feed.mime_type - return feed.writeString('utf-8') + return self._rss_feed(c.following)
--- a/rhodecode/templates/journal/journal.html Tue Jun 05 01:06:40 2012 +0200 +++ b/rhodecode/templates/journal/journal.html Wed Jun 06 13:50:38 2012 +0200 @@ -17,9 +17,14 @@ <h5>${_('Journal')}</h5> <ul class="links"> <li> - <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/> - </a></span> + <span><a id="refresh" href="${h.url('journal')}"><img class="icon" title="${_('Refresh')}" alt="${_('Refresh')}" src="${h.url('/images/icons/arrow_refresh.png')}"/></a></span> </li> + <li> + <span><a href="${h.url('journal_rss')}"><img class="icon" title="${_('RSS feed')}" alt="${_('RSS feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span> + </li> + <li> + <span><a href="${h.url('journal_atom')}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span> + </li> </ul> </div> <div id="journal">${c.journal_data}</div>
--- a/rhodecode/templates/journal/public_journal.html Tue Jun 05 01:06:40 2012 +0200 +++ b/rhodecode/templates/journal/public_journal.html Wed Jun 06 13:50:38 2012 +0200 @@ -16,13 +16,12 @@ <div class="title"> <h5>${_('Public Journal')}</h5> <ul class="links"> - <li> - <span>${h.link_to(_('RSS'),h.url('public_journal_rss'),class_='rss_icon')}</span> - </li> - <li> - <span>${h.link_to(_('Atom'),h.url('public_journal_atom'),class_='atom_icon')}</span> - </li> - +<li> + <span><a href="${h.url('public_journal_rss')}"><img class="icon" title="${_('RSS feed')}" alt="${_('RSS feed')}" src="${h.url('/images/icons/atom.png')}"/></a></span> + </li> + <li> + <span><a href="${h.url('public_journal_atom')}"><img class="icon" title="${_('ATOM feed')}" alt="${_('ATOM feed')}" src="${h.url('/images/icons/rss_16.png')}"/></a></span> + </li> </ul> </div>