diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py --- a/rhodecode/controllers/summary.py +++ b/rhodecode/controllers/summary.py @@ -7,7 +7,7 @@ :created_on: Apr 18, 2010 :author: marcink - :copyright: (C) 2009-2011 Marcin Kuzminski + :copyright: (C) 2009-2011 Marcin Kuzminski :license: GPLv3, see COPYING for more details. """ # This program is free software: you can redistribute it and/or modify @@ -33,26 +33,29 @@ from vcs.exceptions import ChangesetErro from pylons import tmpl_context as c, request, url from pylons.i18n.translation import _ -from rhodecode.model.scm import ScmModel -from rhodecode.model.db import Statistics +from rhodecode.model.db import Statistics, Repository +from rhodecode.model.repo import RepoModel from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator -from rhodecode.lib.base import BaseController, render -from rhodecode.lib.utils import OrderedDict, EmptyChangeset +from rhodecode.lib.base import BaseRepoController, render +from rhodecode.lib.utils import EmptyChangeset +from rhodecode.lib.odict import OrderedDict from rhodecode.lib.celerylib import run_task -from rhodecode.lib.celerylib.tasks import get_commits_stats - -from webhelpers.paginate import Page +from rhodecode.lib.celerylib.tasks import get_commits_stats, \ + LANGUAGES_EXTENSIONS_MAP +from rhodecode.lib.helpers import RepoPage try: import json except ImportError: #python 2.5 compatibility import simplejson as json + log = logging.getLogger(__name__) -class SummaryController(BaseController): + +class SummaryController(BaseRepoController): @LoginRequired() @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', @@ -61,42 +64,51 @@ class SummaryController(BaseController): super(SummaryController, self).__before__() def index(self, repo_name): - scm_model = ScmModel() - c.repo_info = scm_model.get_repo(c.repo_name) - c.following = scm_model.is_following_repo(c.repo_name, - c.rhodecode_user.user_id) + + e = request.environ + c.dbrepo = dbrepo = c.rhodecode_db_repo + + c.following = self.scm_model.is_following_repo(repo_name, + self.rhodecode_user.user_id) + def url_generator(**kw): return url('shortlog_home', repo_name=repo_name, size=10, **kw) - c.repo_changesets = Page(c.repo_info, page=1, - items_per_page=10, url=url_generator) - - e = request.environ + c.repo_changesets = RepoPage(c.rhodecode_repo, page=1, + items_per_page=10, url=url_generator) if self.rhodecode_user.username == 'default': - password = ':default' + #for default(anonymous) user we don't need to pass credentials + username = '' + password = '' else: - password = '' + username = str(self.rhodecode_user.username) + password = '@' - uri = u'%(protocol)s://%(user)s%(password)s@%(host)s%(prefix)s/%(repo_name)s' % { - 'protocol': e.get('wsgi.url_scheme'), - 'user':str(c.rhodecode_user.username), - 'password':password, - 'host':e.get('HTTP_HOST'), - 'prefix':e.get('SCRIPT_NAME'), - 'repo_name':c.repo_name, } + if e.get('wsgi.url_scheme') == 'https': + split_s = 'https://' + else: + split_s = 'http://' + + qualified_uri = [split_s] + [url.current(qualified=True)\ + .split(split_s)[-1]] + uri = u'%(proto)s%(user)s%(pass)s%(rest)s' \ + % {'user': username, + 'pass': password, + 'proto': qualified_uri[0], + 'rest': qualified_uri[1]} c.clone_repo_url = uri c.repo_tags = OrderedDict() - for name, hash in c.repo_info.tags.items()[:10]: + for name, hash in c.rhodecode_repo.tags.items()[:10]: try: - c.repo_tags[name] = c.repo_info.get_changeset(hash) + c.repo_tags[name] = c.rhodecode_repo.get_changeset(hash) except ChangesetError: c.repo_tags[name] = EmptyChangeset(hash) c.repo_branches = OrderedDict() - for name, hash in c.repo_info.branches.items()[:10]: + for name, hash in c.rhodecode_repo.branches.items()[:10]: try: - c.repo_branches[name] = c.repo_info.get_changeset(hash) + c.repo_branches[name] = c.rhodecode_repo.get_changeset(hash) except ChangesetError: c.repo_branches[name] = EmptyChangeset(hash) @@ -108,34 +120,70 @@ class SummaryController(BaseController): ts_min_y = mktime(td_1y.timetuple()) ts_max_y = mktime(td.timetuple()) - if c.repo_info.dbrepo.enable_statistics: + if dbrepo.enable_statistics: c.no_data_msg = _('No data loaded yet') - run_task(get_commits_stats, c.repo_info.name, ts_min_y, ts_max_y) + run_task(get_commits_stats, c.dbrepo.repo_name, ts_min_y, ts_max_y) else: - c.no_data_msg = _('Statistics update are disabled for this repository') + c.no_data_msg = _('Statistics are disabled for this repository') c.ts_min = ts_min_m c.ts_max = ts_max_y stats = self.sa.query(Statistics)\ - .filter(Statistics.repository == c.repo_info.dbrepo)\ + .filter(Statistics.repository == dbrepo)\ .scalar() + c.stats_percentage = 0 if stats and stats.languages: - c.no_data = False is c.repo_info.dbrepo.enable_statistics - lang_stats = json.loads(stats.languages) + c.no_data = False is dbrepo.enable_statistics + lang_stats_d = json.loads(stats.languages) c.commit_data = stats.commit_activity c.overview_data = stats.commit_activity_combined + + lang_stats = ((x, {"count": y, + "desc": LANGUAGES_EXTENSIONS_MAP.get(x)}) + for x, y in lang_stats_d.items()) + c.trending_languages = json.dumps(OrderedDict( - sorted(lang_stats.items(), reverse=True, + sorted(lang_stats, reverse=True, key=lambda k: k[1])[:10] ) ) + last_rev = stats.stat_on_revision + c.repo_last_rev = c.rhodecode_repo.count() - 1 \ + if c.rhodecode_repo.revisions else 0 + if last_rev == 0 or c.repo_last_rev == 0: + pass + else: + c.stats_percentage = '%.2f' % ((float((last_rev)) / + c.repo_last_rev) * 100) else: c.commit_data = json.dumps({}) - c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10] ]) + c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10]]) c.trending_languages = json.dumps({}) c.no_data = True + + c.enable_downloads = dbrepo.enable_downloads + if c.enable_downloads: + c.download_options = self._get_download_links(c.rhodecode_repo) return render('summary/summary.html') + def _get_download_links(self, repo): + + download_l = [] + + branches_group = ([], _("Branches")) + tags_group = ([], _("Tags")) + + for name, chs in c.rhodecode_repo.branches.items(): + #chs = chs.split(':')[-1] + branches_group[0].append((chs, name),) + download_l.append(branches_group) + + for name, chs in c.rhodecode_repo.tags.items(): + #chs = chs.split(':')[-1] + tags_group[0].append((chs, name),) + download_l.append(tags_group) + + return download_l