From 31746cd63baeb92891db8afed759a136d08b7e53 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Thu, 24 Jul 2014 18:41:44 +0200
Subject: [PATCH] [Migration] move user_agent_stats() to view

---
 mygpo/administration/clients.py | 9 +++++----
 mygpo/db/couchdb/user.py        | 7 -------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/mygpo/administration/clients.py b/mygpo/administration/clients.py
index 41964913..8eb51aa1 100644
--- a/mygpo/administration/clients.py
+++ b/mygpo/administration/clients.py
@@ -1,7 +1,7 @@
 import re
 from collections import namedtuple, Counter
 
-from mygpo.db.couchdb.user import user_agent_stats
+from mygpo.users.models import Client
 
 
 Client = namedtuple('Client', 'client client_version lib lib_version os os_version')
@@ -13,14 +13,15 @@ class UserAgentStats(object):
     def __init__(self):
         self._useragents = None
 
-
     def get_entries(self):
         if self._useragents is None:
-            self._useragents = user_agent_stats()
+            result = Client.objects.values('user_agent')\
+                                   .annotate(Count('user_agent'))
+            result = {x['user_agent']: x['user_agent__count'] for x in result}
+            self._useragents = Counter(result)
 
         return self._useragents
 
-
     @property
     def max_users(self):
         uas = self.get_entries()
diff --git a/mygpo/db/couchdb/user.py b/mygpo/db/couchdb/user.py
index 73c576c8..1f19f1aa 100644
--- a/mygpo/db/couchdb/user.py
+++ b/mygpo/db/couchdb/user.py
@@ -161,13 +161,6 @@ def blacklist_suggested_podcast(suggestions, podcast_id):
     sdb.save_doc(suggestions)
 
 
-@cache_result(timeout=60*60)
-def user_agent_stats():
-    from mygpo.users.models import Client
-    result = Client.objects.values('user_agent').annotate(Count('user_agent'))
-    return Counter({x['user_agent']: x['user_agent__count'] for x in result})
-
-
 @cache_result(timeout=60)
 def user_history(user, start, length):
 
-- 
2.11.4.GIT