From cf3bbca4344df9d63d957b4dbb77f7edb540ff52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sat, 21 Jun 2014 11:06:43 +0200 Subject: [PATCH] [Administration] Remove filetype stats Difficult to port to PostgreSQL, and not really needed --- mygpo/administration/templates/admin/overview.html | 1 - mygpo/administration/urls.py | 6 +----- mygpo/administration/views.py | 19 ------------------- mygpo/db/couchdb/episode.py | 13 ------------- 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/mygpo/administration/templates/admin/overview.html b/mygpo/administration/templates/admin/overview.html index 0177dcb6..a6272055 100644 --- a/mygpo/administration/templates/admin/overview.html +++ b/mygpo/administration/templates/admin/overview.html @@ -19,7 +19,6 @@
  • {% trans "Unify Duplicate Slugs" %}
  • {% trans "Client Stats" %} ({% trans "JSON" %})
  • {% trans "User-Agent Stats" %}
  • -
  • {% trans "File Type Stats" %}
  • {% trans "General Stats" %} ({% trans "JSON" %})
  • {% trans "Activate User" %}
  • {% trans "Assign Publisher Permissions" %}
  • diff --git a/mygpo/administration/urls.py b/mygpo/administration/urls.py index 09c76e50..23787a3e 100644 --- a/mygpo/administration/urls.py +++ b/mygpo/administration/urls.py @@ -3,7 +3,7 @@ from django.conf.urls import * from mygpo.administration.views import Overview, MergeSelect, MergeVerify, \ MergeProcess, MergeStatus, ClientStatsView, ClientStatsJsonView, \ UserAgentStatsView, StatsView, StatsJsonView, HostInfo, \ - FiletypeStatsView, ActivateUserView, UnifyDuplicateSlugsSelect, \ + ActivateUserView, UnifyDuplicateSlugsSelect, \ UnifyDuplicateSlugs, UnifySlugsStatus, MakePublisherInput, \ MakePublisher, MakePublisherResult @@ -25,10 +25,6 @@ urlpatterns = patterns('mygpo.admin.views', url(r'^stats$', StatsView.as_view(), name='stats'), url(r'^stats\.json$', StatsJsonView.as_view(), name='stats-json'), - url(r'^filetypes/$', - FiletypeStatsView.as_view(), - name='admin-filetypes'), - url(r'^activate-user/$', ActivateUserView.as_view(), name='admin-activate-user'), diff --git a/mygpo/administration/views.py b/mygpo/administration/views.py index d90391bc..f2a83b70 100644 --- a/mygpo/administration/views.py +++ b/mygpo/administration/views.py @@ -30,7 +30,6 @@ from mygpo.api.httpresponse import JsonResponse from mygpo.cel import celery from mygpo.db.couchdb import get_main_database from mygpo.db.couchdb.user import activate_user, add_published_objs -from mygpo.db.couchdb.episode import filetype_stats class InvalidPodcast(Exception): @@ -301,24 +300,6 @@ class StatsJsonView(StatsView): return JsonResponse(stats) -class FiletypeStatsView(AdminView): - - template_name = 'admin/filetypes.html' - - def get(self, request): - stats = filetype_stats() - - if len(stats): - max_num = stats.most_common(1)[0][1] - else: - max_num = 0 - - return self.render_to_response({ - 'max_num': max_num, - 'stats': stats.most_common(), - }) - - class ActivateUserView(AdminView): """ Lets admins manually activate users """ diff --git a/mygpo/db/couchdb/episode.py b/mygpo/db/couchdb/episode.py index 76e34690..39220302 100644 --- a/mygpo/db/couchdb/episode.py +++ b/mygpo/db/couchdb/episode.py @@ -77,19 +77,6 @@ def episodes_to_dict(ids, use_cache=False): return objs -def filetype_stats(): - """ Returns a filetype counter over all episodes """ - - db = get_main_database() - r = db.view('episode_stats/filetypes', - stale = 'update_after', - reduce = True, - group_level = 1, - ) - - return Counter({x['key']: x['value'] for x in r}) - - @repeat_on_conflict(['episode']) def set_episode_slug(episode, slug): """ sets slug as new main slug of the episode, moves other to merged """ -- 2.11.4.GIT