Counting hits in trac objects

Sergio Oliveira
1 parent 56fc1188
Showing 6 changed files with 44 additions and 15 deletions Show diff stats
requirements.txt
src/colab/custom_settings.py
src/proxy/models.py
src/proxy/views.py
src/super_archives/models.py
src/super_archives/views.py
@@ -24,7 +24,7 @@ tornado
 # Deps for Single SignOn (SSO)
 django-browserid
-git+https://github.com/TracyWebTech/django-revproxy/
+django-revproxy
 # Converse.js (XMPP client)
 django-conversejs==0.2.8
@@ -91,6 +91,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'accounts',
     'proxy',
     'search',
+    'hitcount',
     # Feedzilla and deps
     'feedzilla',
@@ -3,13 +3,10 @@
 from django.db import models
 from accounts.models import User
+from hitcount.models import HitCountModelMixin
-# get_absolute_url em todos
-# get_author_url em todos
-
-
-class Revision(models.Model):
+class Revision(models.Model, HitCountModelMixin):
     rev = models.TextField(blank=True, primary_key=True)
     author = models.TextField(blank=True)
     message = models.TextField(blank=True)
@@ -29,7 +26,7 @@ class Revision(models.Model):
         except User.DoesNotExist:
             return None
-class Ticket(models.Model):
+class Ticket(models.Model, HitCountModelMixin):
     id = models.IntegerField(primary_key=True)
     summary = models.TextField(blank=True)
     description = models.TextField(blank=True)
@@ -60,7 +57,7 @@ class Ticket(models.Model):
             return None
-class Wiki(models.Model):
+class Wiki(models.Model, HitCountModelMixin):
     name = models.TextField(primary_key=True)
     wiki_text = models.TextField(blank=True)
     author = models.TextField(blank=True)
@@ -4,19 +4,47 @@ import os
 from django.conf import settings
 from revproxy.views import ProxyView
+from .models import Wiki, Ticket, Revision
+from hitcount.views import HitCountViewMixin
 CWD = os.path.abspath(os.path.dirname(__file__))
 DIAZO_RULES_DIR = os.path.join(CWD, 'diazo')
-
-class TracProxyView(ProxyView):
+class TracProxyView(HitCountViewMixin, ProxyView):
     base_url = settings.COLAB_TRAC_URL
     add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
     diazo_theme_template = 'proxy/trac.html'
     diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml')
     html5 = True
+    def get_object(self):
+        obj = None
+
+        if self.request.path_info.startswith('/wiki'):
+            wiki_name = self.request.path_info.split('/', 2)[-1]
+            if not wiki_name:
+                wiki_name = 'WikiStart'
+            try:
+                obj = Wiki.objects.get(name=wiki_name)
+            except Wiki.DoesNotExist:
+                return None
+        elif self.request.path_info.startswith('/ticket'):
+            ticket_id = self.request.path_info.split('/')[2]
+            try:
+                obj = Ticket.objects.get(id=ticket_id)
+            except (Ticket.DoesNotExist, ValueError):
+                return None
+        elif self.request.path_info.startswith('/changeset'):
+            changeset, repo = self.request.path_info.split('/')[2:4]
+            try:
+                obj = Revision.objects.get(rev=changeset,
+                                           repository_name=repo)
+            except Revision.DoesNotExist:
+                return None
+
+        return obj
+
 class JenkinsProxyView(ProxyView):
     base_url = settings.COLAB_CI_URL
@@ -14,6 +14,7 @@ from django.utils.translation import ugettext_lazy as _
 from html2text import html2text
 from haystack.query import SearchQuerySet
 from taggit.managers import TaggableManager
+from hitcount.models import HitCountModelMixin
 from .utils import blocks
 from .utils.etiquetador import etiquetador
@@ -107,7 +108,7 @@ class Keyword(models.Model):
         return self.keyword
-class Thread(models.Model):
+class Thread(models.Model, HitCountModelMixin):
     subject_token = models.CharField(max_length=512)
     mailinglist = models.ForeignKey(MailingList,
@@ -16,12 +16,10 @@ from django.contrib.auth.decorators import login_required
 from django.shortcuts import render, redirect
 from . import queries
-from .decorators import count_hit
 from .utils.email import send_verification_email
 from .models import MailingList, Thread, EmailAddress, EmailAddressValidation
-@count_hit
 def thread(request, mailinglist, thread_token):
     try:
@@ -29,6 +27,12 @@ def thread(request, mailinglist, thread_token):
                                                             thread_token)
     except ObjectDoesNotExist:
         raise http.Http404
+
+    thread = Thread.objects.get(subject_token=thread_token,
+                                mailinglist__name=mailinglist)
+
+    thread.hit()
+
     order_by = request.GET.get('order')
     if order_by == 'voted':
         msgs_query = queries.get_messages_by_voted()
@@ -44,8 +48,6 @@ def thread(request, mailinglist, thread_token):
         total_votes += email.votes_count()
     # Update relevance score
-    thread = Thread.objects.get(subject_token=thread_token,
-                                mailinglist__name=mailinglist)
     thread.update_score()
     context = {
	@@ -24,7 +24,7 @@ tornado		@@ -24,7 +24,7 @@ tornado
24		24
25	# Deps for Single SignOn (SSO)	25	# Deps for Single SignOn (SSO)
26	django-browserid	26	django-browserid
27	-git+https://github.com/TracyWebTech/django-revproxy/	27	+django-revproxy
28		28
29	# Converse.js (XMPP client)	29	# Converse.js (XMPP client)
30	django-conversejs==0.2.8	30	django-conversejs==0.2.8
	@@ -91,6 +91,7 @@ INSTALLED_APPS = INSTALLED_APPS + (		@@ -91,6 +91,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
91	'accounts',	91	'accounts',
92	'proxy',	92	'proxy',
93	'search',	93	'search',
		94	+ 'hitcount',
94		95
95	# Feedzilla and deps	96	# Feedzilla and deps
96	'feedzilla',	97	'feedzilla',
	@@ -4,19 +4,47 @@ import os		@@ -4,19 +4,47 @@ import os
4	from django.conf import settings	4	from django.conf import settings
5		5
6	from revproxy.views import ProxyView	6	from revproxy.views import ProxyView
		7	+from .models import Wiki, Ticket, Revision
		8	+from hitcount.views import HitCountViewMixin
7		9
8		10
9	CWD = os.path.abspath(os.path.dirname(__file__))	11	CWD = os.path.abspath(os.path.dirname(__file__))
10	DIAZO_RULES_DIR = os.path.join(CWD, 'diazo')	12	DIAZO_RULES_DIR = os.path.join(CWD, 'diazo')
11		13
12	-
13	-class TracProxyView(ProxyView):	14	+class TracProxyView(HitCountViewMixin, ProxyView):
14	base_url = settings.COLAB_TRAC_URL	15	base_url = settings.COLAB_TRAC_URL
15	add_remote_user = settings.REVPROXY_ADD_REMOTE_USER	16	add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
16	diazo_theme_template = 'proxy/trac.html'	17	diazo_theme_template = 'proxy/trac.html'
17	diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml')	18	diazo_rules = os.path.join(DIAZO_RULES_DIR, 'trac.xml')
18	html5 = True	19	html5 = True
19		20
		21	+ def get_object(self):
		22	+ obj = None
		23	+
		24	+ if self.request.path_info.startswith('/wiki'):
		25	+ wiki_name = self.request.path_info.split('/', 2)[-1]
		26	+ if not wiki_name:
		27	+ wiki_name = 'WikiStart'
		28	+ try:
		29	+ obj = Wiki.objects.get(name=wiki_name)
		30	+ except Wiki.DoesNotExist:
		31	+ return None
		32	+ elif self.request.path_info.startswith('/ticket'):
		33	+ ticket_id = self.request.path_info.split('/')[2]
		34	+ try:
		35	+ obj = Ticket.objects.get(id=ticket_id)
		36	+ except (Ticket.DoesNotExist, ValueError):
		37	+ return None
		38	+ elif self.request.path_info.startswith('/changeset'):
		39	+ changeset, repo = self.request.path_info.split('/')[2:4]
		40	+ try:
		41	+ obj = Revision.objects.get(rev=changeset,
		42	+ repository_name=repo)
		43	+ except Revision.DoesNotExist:
		44	+ return None
		45	+
		46	+ return obj
		47	+
20		48
21	class JenkinsProxyView(ProxyView):	49	class JenkinsProxyView(ProxyView):
22	base_url = settings.COLAB_CI_URL	50	base_url = settings.COLAB_CI_URL