From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Mon, 9 Aug 2010 15:40:24 +0000 (-0400)
Subject: Merge branch 'new_paginator'
X-Git-Tag: philo-0.9~40^2~2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/b148ca4096bd2154e3c9b2d9f1cda7ef31c346db?hp=7318a269ab72366670f45804328c3cb2bd23acd5

Merge branch 'new_paginator'
---

diff --git a/contrib/penfield/models.py b/contrib/penfield/models.py
index 2a10e26..449b63d 100644
--- a/contrib/penfield/models.py
+++ b/contrib/penfield/models.py
@@ -3,6 +3,7 @@ from django.conf import settings
 from philo.models import Tag, Titled, Entity, MultiView, Page, register_value_model
 from philo.exceptions import ViewCanNotProvideSubpath
 from django.conf.urls.defaults import url, patterns
+from django.core.paginator import EmptyPage
 from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponse
 from datetime import datetime
@@ -130,15 +131,10 @@ class BlogView(MultiView):
 		return base_patterns + entry_patterns
 	
 	def index_view(self, request, node=None, extra_context=None):
-		entries = self.blog.entries.all()
-		if self.entries_per_page:
-			paginated_page = paginate(request, entries, self.entries_per_page)
-			entries = paginated_page.object_list
-		else:
-			paginated_page = None
+		pagination = paginate(self.blog.entries.all(), self.entries_per_page, request.GET.get('page', 1))
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog, 'entries': entries, 'paginated_page': paginated_page})
+		context.update({'blog': self.blog, 'pagination': pagination})
 		return self.index_page.render_to_response(node, request, extra_context=context)
 	
 	def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None):
@@ -168,14 +164,11 @@ class BlogView(MultiView):
 			entries = entries.filter(date__month=month)
 		if day:
 			entries = entries.filter(date__day=day)
-		if self.entries_per_page:
-			paginated_page = paginate(request, entries, self.entries_per_page)
-			entries = paginated_page.object_list
-		else:
-			paginated_page = None
+		
+		pagination = paginate(entries, self.entries_per_page, request.GET.get('page', 1))
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries, 'paginated_page': paginated_page})
+		context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'pagination': pagination})
 		return self.entry_archive_page.render_to_response(node, request, extra_context=context)
 	
 	def tag_view(self, request, tag_slugs, node=None, extra_context=None):
@@ -196,14 +189,10 @@ class BlogView(MultiView):
 		if entries.count() <= 0:
 			raise Http404
 		
-		if self.entries_per_page:
-			paginated_page = paginate(request, entries, self.entries_per_page)
-			entries = paginated_page.object_list
-		else:
-			paginated_page = None
+		pagination = paginate(entries, self.entries_per_page, request.GET.get('page', 1))
 		context = {}
 		context.update(extra_context or {})
-		context.update({'blog': self.blog, 'tags': tags, 'entries': entries, 'paginated_page': paginated_page})
+		context.update({'blog': self.blog, 'tags': tags, 'pagination': pagination})
 		return self.tag_page.render_to_response(node, request, extra_context=context)
 	
 	def tag_archive_view(self, request, node=None, extra_context=None):
diff --git a/contrib/penfield/utils.py b/contrib/penfield/utils.py
index 5df800c..89d01a7 100644
--- a/contrib/penfield/utils.py
+++ b/contrib/penfield/utils.py
@@ -1,20 +1,66 @@
-from django.core.paginator import Paginator, InvalidPage, EmptyPage
+from django.core.paginator import Paginator, EmptyPage
 
 
-def paginate(request, entries, entries_per_page):
-	paginator = Paginator(entries, entries_per_page)
+class PaginationProxy(object):
+	def __init__(self, paginator=None, page=None, objects=None):
+		self.paginator = paginator
+		self.page = page
+		self.objects = objects
+	
+	@property
+	def page_range(self):
+		if not self.paginator:
+			return None
+		
+		return self.paginator.page_range
+	
+	@property
+	def num_pages(self):
+		if not self.paginator:
+			return None
+		
+		return self.paginator.num_pages
+	
+	@property
+	def page_number(self):
+		if not self.page:
+			return None
+		
+		return self.page.number
+	
+	# Why doesn't this work?
+	#def __bool__(self):
+	#	return bool(self.paginator)
+
+
+def paginate(objects, per_page=None, page_number=1):
+	"""
+	Given a list of objects, return a (page, obj_list) tuple.
+	"""
 	try:
-		page_number = int(request.GET.get('page', '1'))
-		entries = paginator.page(page_number).object_list
-		page = paginator.page(page_number)
-	except ValueError:
+		per_page = int(per_page)
+	except (TypeError, ValueError):
+		# Then either it wasn't set or it was set to an invalid value
+		return PaginationProxy(objects=objects)
+	
+	# There also shouldn't be pagination if the list is too short. Try count()
+	# first - good chance it's a queryset, where count is more efficient.
+	try:
+		if objects.count() <= per_page:
+			return PaginationProxy(objects=objects)
+	except AttributeError:
+		if len(objects) <= per_page:
+			return PaginationProxy(objects=objects)
+	
+	paginator = Paginator(objects, per_page)
+	try:
+		page_number = int(page_number)
+	except:
 		page_number = 1
-		entries = paginator.page(page_number).object_list
-		page = paginator.page(page_number)
+	
 	try:
-		entries = paginator.page(page_number).object_list
-		page = paginator.page(page_number)
-	except (EmptyPage, InvalidPage):
-		entries = paginator.page(paginator.num_pages).object_list
 		page = paginator.page(page_number)
-	return page
\ No newline at end of file
+	except EmptyPage:
+		page = None
+	
+	return PaginationProxy(paginator, page, objects)
\ No newline at end of file