summaryrefslogtreecommitdiff
path: root/visualize
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-11-13 10:03:55 -0600
committerDan McGee <dan@archlinux.org>2012-11-13 10:21:02 -0600
commit45d81a9578e846062550335495dbceb82f16a1a0 (patch)
treeb05565820bf55ec9d0f0fa05bb672e5c0e507a02 /visualize
parent5d468b2f7b42f71da7cbd475d20dd422f0bfffc5 (diff)
Move JSON keys view to public/ app
This seems like a more appropriate place, and now the visualization is done here anyway so we should move the data backing it. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'visualize')
-rw-r--r--visualize/urls.py1
-rw-r--r--visualize/views.py51
2 files changed, 5 insertions, 47 deletions
diff --git a/visualize/urls.py b/visualize/urls.py
index 907f6a22..8c3ea06a 100644
--- a/visualize/urls.py
+++ b/visualize/urls.py
@@ -4,7 +4,6 @@ urlpatterns = patterns('visualize.views',
(r'^$', 'index', {}, 'visualize-index'),
(r'^by_arch/$', 'by_arch', {}, 'visualize-byarch'),
(r'^by_repo/$', 'by_repo', {}, 'visualize-byrepo'),
- (r'^pgp_keys/$', 'pgp_keys', {}, 'visualize-pgp_keys'),
)
# vim: set ts=4 sw=4 et:
diff --git a/visualize/views.py b/visualize/views.py
index 44e60472..8d878937 100644
--- a/visualize/views.py
+++ b/visualize/views.py
@@ -1,18 +1,17 @@
-from datetime import datetime
import json
-from django.contrib.auth.models import User
-from django.db.models import Count, Sum, Q
+from django.db.models import Count, Sum
from django.http import HttpResponse
from django.shortcuts import render
from django.views.decorators.cache import cache_page
from main.models import Package, Arch, Repo
-from devel.models import MasterKey, PGPSignature
+
def index(request):
return render(request, 'visualize/index.html')
+
def arch_repo_data():
qs = Package.objects.select_related().values(
'arch__name', 'repo__name').annotate(
@@ -58,58 +57,18 @@ def arch_repo_data():
}
return data
+
@cache_page(1800)
def by_arch(request):
data = arch_repo_data()
to_json = json.dumps(data['by_arch'], ensure_ascii=False)
return HttpResponse(to_json, mimetype='application/json')
+
@cache_page(1800)
def by_repo(request):
data = arch_repo_data()
to_json = json.dumps(data['by_repo'], ensure_ascii=False)
return HttpResponse(to_json, mimetype='application/json')
-
-@cache_page(1800)
-def pgp_keys(request):
- node_list = []
-
- users = User.objects.filter(is_active=True).select_related('userprofile')
- node_list.extend({
- 'name': dev.get_full_name(),
- 'key': dev.userprofile.pgp_key,
- 'group': 'dev'
- } for dev in users.filter(groups__name='Developers'))
- node_list.extend({
- 'name': tu.get_full_name(),
- 'key': tu.userprofile.pgp_key,
- 'group': 'tu'
- } for tu in users.filter(groups__name='Trusted Users').exclude(
- groups__name='Developers'))
-
- master_keys = MasterKey.objects.select_related('owner').filter(
- revoked__isnull=True)
- node_list.extend({
- 'name': 'Master Key (%s)' % key.owner.get_full_name(),
- 'key': key.pgp_key,
- 'group': 'master'
- } for key in master_keys)
-
- node_list.append({
- 'name': 'CA Cert Signing Authority',
- 'key': 'A31D4F81EF4EBD07B456FA04D2BB0D0165D0FD58',
- 'group': 'cacert',
- })
-
- not_expired = Q(expires__gt=datetime.utcnow) | Q(expires__isnull=True)
- signatures = PGPSignature.objects.filter(not_expired, valid=True)
- edge_list = [{ 'signee': sig.signee, 'signer': sig.signer }
- for sig in signatures]
-
- data = { 'nodes': node_list, 'edges': edge_list }
-
- to_json = json.dumps(data, ensure_ascii=False)
- return HttpResponse(to_json, mimetype='application/json')
-
# vim: set ts=4 sw=4 et: