kallithea Changeset - 30a226406fa4

Changeset - 30a226406fa4

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2012-11-26 20:14:12
marcin@python-works.com

Implemented #661 Add option to include diff in RSS feed
also include RSS item per page and cut_off_limit size in .ini options

4 files changed with 34 insertions and 5 deletions:

development.ini

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/controllers/feed.py

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -62,12 +62,19 @@ app_instance_uuid = rc-develop @@
 cut_off_limit = 256000
 vcs_full_cache = True
 force_https = false
 commit_parse_limit = 25
 use_gravatar = true
 ## RSS feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
 ## {scheme}       http/https from RhodeCode server

production.ini

➞

Show inline comments

@@ @@ -62,12 +62,19 @@ app_instance_uuid = rc-production @@
 cut_off_limit = 256000
 vcs_full_cache = True
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
 ## RSS feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
 ## {scheme}       http/https from RhodeCode server

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -62,12 +62,19 @@ app_instance_uuid = ${app_instance_uuid} @@
 cut_off_limit = 256000
 vcs_full_cache = True
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
 ## RSS feed options
 rss_cut_off_limit = 256000
 rss_items_per_page = 10
 rss_include_diff = false
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## {email}        user email
 ## {md5email}     md5 hash of the user email (like at gravatar.com)
 ## {size}         size of the image that is expected from the server application
 ## {scheme}       http/https from RhodeCode server

rhodecode/controllers/feed.py

➞

Show inline comments

@@ @@ -33,12 +33,13 @@ from webhelpers.feedgenerator import Ato @@
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController
 from rhodecode.lib.diffs import DiffProcessor, LimitedDiffContainer
 from rhodecode.model.db import CacheInvalidation
 from rhodecode.lib.utils2 import safe_int, str2bool
 log = logging.getLogger(__name__)
 class FeedController(BaseRepoController):
@@ @@ -49,16 +50,19 @@ class FeedController(BaseRepoController) @@
         super(FeedController, self).__before__()
         #common values for feeds
         self.description = _('Changes on %s repository')
         self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s')
         self.language = 'en-us'
         self.ttl = "5"
         self.feed_nr = 20
         import rhodecode
         CONF = rhodecode.CONFIG
         self.include_diff = str2bool(CONF.get('rss_include_diff', False))
         self.feed_nr = safe_int(CONF.get('rss_items_per_page', 20))
         # we need to protect from parsing huge diffs here other way
         # we can kill the server, 32*1024 chars is a reasonable limit
         self.feed_diff_limit = 32 * 1024
         # we can kill the server
         self.feed_diff_limit = safe_int(CONF.get('rss_cut_off_limit'), 32 * 1024)
     def _get_title(self, cs):
         return "%s" % (
             h.shorter(cs.message, 160)
+        )
@@ @@ -77,13 +81,13 @@ class FeedController(BaseRepoController) @@
             changes.append('\n %(operation)s %(filename)s '
                            '(%(added)s lines added, %(removed)s lines removed)'
                             % st)
         if limited_diff:
             changes = changes + ['\n ' +
                                  _('Changeset was too big and was cut off...')]
         return changes
+        return diff_processor, changes
     def __get_desc(self, cs):
         desc_msg = []
         desc_msg.append('%s %s %s<br/>' % (h.person(cs.author),
                                            _('commited on'),
                                            h.fmt_date(cs.date)))
@@ @@ -92,21 +96,25 @@ class FeedController(BaseRepoController) @@
             desc_msg.append('branch: %s<br/>' % cs.branch)
         if h.is_hg(c.rhodecode_repo):
             for book in cs.bookmarks:
                 desc_msg.append('bookmark: %s<br/>' % book)
         for tag in cs.tags:
             desc_msg.append('tag: %s<br/>' % tag)
         diff_processor, changes = self.__changes(cs)
         # rev link
         _url = url('changeset_home', repo_name=cs.repository.name,
                    revision=cs.raw_id, qualified=True)
         desc_msg.append('changesest: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
         desc_msg.append('<pre>')
         desc_msg.append(cs.message)
         desc_msg.append('\n')
         desc_msg.extend(self.__changes(cs))
         desc_msg.extend(changes)
         if self.include_diff:
             desc_msg.append('\n\n')
             desc_msg.append(diff_processor.as_raw())
         desc_msg.append('</pre>')
         return desc_msg
     def atom(self, repo_name):
         """Produce an atom-1.0 feed via feedgenerator module"""

0 comments (0 inline, 0 general)