Moving pagehit counter to decorator

Sergio Oliveira
1 parent cfde3435
Showing 8 changed files with 27 additions and 53 deletions Show diff stats
src/api/handlers.py
src/api/urls.py
src/static/js/base.js
src/super_archives/decorators.py
src/super_archives/templates/message-preview.html
src/super_archives/templates/message-thread.html
src/super_archives/views.py
src/templates/base.html
-from django.core.cache import cache
-
 from piston.utils import rc
 from piston.handler import BaseHandler
 from colab.deprecated import solrutils
-from super_archives.models import PageHit
-
-
-class CountHandler(BaseHandler):
-    allowed_methods = ('POST')
-
-    def create(self, request):
-        """Add one page view for the given url"""
-        
-        # If missing the path_info argument we can't do anything
-        path_info = request.POST.get('path_info')
-        if not path_info:
-            return rc.BAD_REQUEST
-        # Here we cache the user's IP to ensure that the same
-        #   IP won't hit the same page again for while
-        ip_addr = request.META.get('REMOTE_ADDR')
-        page_hits_cache = cache.get('page_hits', {})
-        duplicate = page_hits_cache.get(path_info, {}).get(ip_addr)
-        
-        if duplicate:
-            return rc.DUPLICATE_ENTRY
-        else:
-            page_hits_cache.update({path_info: {ip_addr: True }})
-            cache.set('page_hits', page_hits_cache)
-        
-        # Everything ok, so just increment the page count
-        page_hit = PageHit.objects.get_or_create(url_path=path_info)[0]
-        page_hit.hit_count += 1
-        page_hit.save()
-        
-        return rc.CREATED
 class SearchHandler(BaseHandler):
     allowed_methods = ('GET', )
@@ -2,15 +2,12 @@ from django.conf.urls import patterns, include, url
 from piston.resource import Resource
-from .handlers import CountHandler, SearchHandler
+from .handlers import SearchHandler
 from .views import VoteView
-
-count_handler = Resource(CountHandler)
 search_handler = Resource(SearchHandler)
 urlpatterns = patterns('',
     url(r'message/(?P<msg_id>\d+)/vote$', VoteView.as_view()),
-    url(r'hit/$', count_handler),
     url(r'search/$', search_handler),
 )
@@ -1,7 +0,0 @@
-function pagehit(path_info) {
-    jQuery.ajax({
-        url: '/api/hit/',
-        type: 'POST',
-        data: {'path_info': path_info},
-    });
-}
@@ -0,0 +1,24 @@
+
+from django.core.cache import cache
+
+from super_archives.models import PageHit
+
+
+def count_hit(view):
+    def wrapper(request, *args, **kwargs):
+        # Here we cache the user's IP to ensure that the same
+        #   IP won't hit the same page again for while
+        ip_addr = request.META.get('REMOTE_ADDR')
+        cache_key = u'page_hits-{}-{}'.format(request.path_info, ip_addr)
+        duplicate = cache.get(cache_key)
+        if duplicate:
+            return view(request, *args, **kwargs)
+        cache.set(cache_key, True)
+
+        # Everything ok, so just increment the page count
+        page_hit = PageHit.objects.get_or_create(url_path=request.path_info)[0]
+        page_hit.hit_count += 1
+        page_hit.save()
+
+        return view(request, *args, **kwargs)
+    return wrapper
@@ -7,8 +7,6 @@
        src="{{ STATIC_URL }}img/{{ doc.Type }}.png" />
   {% else %}
       <span class="glyphicon glyphicon-envelope"></span>
-<!--  <img alt="thread" title="thread"
-       src="{{ STATIC_URL }}img/thread.png" /> -->
   {% endif %}
   {% if doc.mailinglist %}
@@ -200,9 +200,5 @@
     </ul>
   </div>
-  <script type="text/javascript" charset="utf-8">
-    pagehit("{{ request.path_info }}");
-  </script>
-
 </div>
 {% endblock %}
@@ -9,8 +9,10 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import render, get_list_or_404
 from .models import MailingList, Thread
+from .decorators import count_hit
+@count_hit
 def thread(request, mailinglist, thread_token):
     try:
@@ -22,9 +22,6 @@
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.cookie.js"></script>
     <script src="{{ STATIC_URL }}third-party/bootstrap/js/bootstrap.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script>
-
-
     {% block head_js %}{% endblock %}
     {% block head_css %}{% endblock %}
1		1
2	-from django.core.cache import cache
3	-
4	from piston.utils import rc	2	from piston.utils import rc
5	from piston.handler import BaseHandler	3	from piston.handler import BaseHandler
6		4
7	from colab.deprecated import solrutils	5	from colab.deprecated import solrutils
8	-from super_archives.models import PageHit
9	-
10	-
11	-class CountHandler(BaseHandler):
12	- allowed_methods = ('POST')
13	-
14	- def create(self, request):
15	- """Add one page view for the given url"""
16	-
17	- # If missing the path_info argument we can't do anything
18	- path_info = request.POST.get('path_info')
19	- if not path_info:
20	- return rc.BAD_REQUEST
21		6
22	- # Here we cache the user's IP to ensure that the same
23	- # IP won't hit the same page again for while
24	- ip_addr = request.META.get('REMOTE_ADDR')
25	- page_hits_cache = cache.get('page_hits', {})
26	- duplicate = page_hits_cache.get(path_info, {}).get(ip_addr)
27	-
28	- if duplicate:
29	- return rc.DUPLICATE_ENTRY
30	- else:
31	- page_hits_cache.update({path_info: {ip_addr: True }})
32	- cache.set('page_hits', page_hits_cache)
33	-
34	- # Everything ok, so just increment the page count
35	- page_hit = PageHit.objects.get_or_create(url_path=path_info)[0]
36	- page_hit.hit_count += 1
37	- page_hit.save()
38	-
39	- return rc.CREATED
40		7
41	class SearchHandler(BaseHandler):	8	class SearchHandler(BaseHandler):
42	allowed_methods = ('GET', )	9	allowed_methods = ('GET', )
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-function pagehit(path_info) {
2	- jQuery.ajax({
3	- url: '/api/hit/',
4	- type: 'POST',
5	- data: {'path_info': path_info},
6	- });
7	-}
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+
	2	+from django.core.cache import cache
	3	+
	4	+from super_archives.models import PageHit
	5	+
	6	+
	7	+def count_hit(view):
	8	+ def wrapper(request, args, *kwargs):
	9	+ # Here we cache the user's IP to ensure that the same
	10	+ # IP won't hit the same page again for while
	11	+ ip_addr = request.META.get('REMOTE_ADDR')
	12	+ cache_key = u'page_hits-{}-{}'.format(request.path_info, ip_addr)
	13	+ duplicate = cache.get(cache_key)
	14	+ if duplicate:
	15	+ return view(request, args, *kwargs)
	16	+ cache.set(cache_key, True)
	17	+
	18	+ # Everything ok, so just increment the page count
	19	+ page_hit = PageHit.objects.get_or_create(url_path=request.path_info)[0]
	20	+ page_hit.hit_count += 1
	21	+ page_hit.save()
	22	+
	23	+ return view(request, args, *kwargs)
	24	+ return wrapper
	@@ -9,8 +9,10 @@ from django.core.exceptions import ObjectDoesNotExist		@@ -9,8 +9,10 @@ from django.core.exceptions import ObjectDoesNotExist
9	from django.shortcuts import render, get_list_or_404	9	from django.shortcuts import render, get_list_or_404
10		10
11	from .models import MailingList, Thread	11	from .models import MailingList, Thread
		12	+from .decorators import count_hit
12		13
13		14
		15	+@count_hit
14	def thread(request, mailinglist, thread_token):	16	def thread(request, mailinglist, thread_token):
15		17
16	try:	18	try: