comparison rhodecode/controllers/summary.py @ 1499:182f5bd3b49d beta

changed list comprehesion into generator
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 30 Sep 2011 01:50:21 +0300
parents 66f03a87141c
children bf263968da47 87ec80c280bb
comparison
equal deleted inserted replaced
1498:fcc676c6bf3b 1499:182f5bd3b49d
49 try: 49 try:
50 import json 50 import json
51 except ImportError: 51 except ImportError:
52 #python 2.5 compatibility 52 #python 2.5 compatibility
53 import simplejson as json 53 import simplejson as json
54
54 log = logging.getLogger(__name__) 55 log = logging.getLogger(__name__)
55 56
56 57
57 class SummaryController(BaseRepoController): 58 class SummaryController(BaseRepoController):
58 59
136 if stats and stats.languages: 137 if stats and stats.languages:
137 c.no_data = False is dbrepo.enable_statistics 138 c.no_data = False is dbrepo.enable_statistics
138 lang_stats_d = json.loads(stats.languages) 139 lang_stats_d = json.loads(stats.languages)
139 c.commit_data = stats.commit_activity 140 c.commit_data = stats.commit_activity
140 c.overview_data = stats.commit_activity_combined 141 c.overview_data = stats.commit_activity_combined
141 142
142 lang_stats = [(x, {"count": y, 143 lang_stats = ((x, {"count": y,
143 "desc": LANGUAGES_EXTENSIONS_MAP.get(x)}) 144 "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
144 for x, y in lang_stats_d.items()] 145 for x, y in lang_stats_d.items())
145 146
146 c.trending_languages = json.dumps(OrderedDict( 147 c.trending_languages = json.dumps(OrderedDict(
147 sorted(lang_stats, reverse=True, 148 sorted(lang_stats, reverse=True,
148 key=lambda k: k[1])[:10] 149 key=lambda k: k[1])[:10]
149 ) 150 )
159 else: 160 else:
160 c.commit_data = json.dumps({}) 161 c.commit_data = json.dumps({})
161 c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10]]) 162 c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10]])
162 c.trending_languages = json.dumps({}) 163 c.trending_languages = json.dumps({})
163 c.no_data = True 164 c.no_data = True
164 165
165 c.enable_downloads = dbrepo.enable_downloads 166 c.enable_downloads = dbrepo.enable_downloads
166 if c.enable_downloads: 167 if c.enable_downloads:
167 c.download_options = self._get_download_links(c.rhodecode_repo) 168 c.download_options = self._get_download_links(c.rhodecode_repo)
168 169
169 return render('summary/summary.html') 170 return render('summary/summary.html')