X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ee24ab2feac614a0bdc7114e8e2b4b4d0ad44395..b148ca4096bd2154e3c9b2d9f1cda7ef31c346db:/contrib/penfield/utils.py

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