Added method to check if the paginator supports new-style page links

boards/abstracts/paginator.py

@@ -1,72 +1,74
 __author__ = 'neko259'
 
 from django.core.paginator import Paginator
 
 PAGINATOR_LOOKAROUND_SIZE = 2
 
 
 def get_paginator(*args, **kwargs):
     return DividedPaginator(*args, **kwargs)
 
 
 class DividedPaginator(Paginator):
 
     lookaround_size = PAGINATOR_LOOKAROUND_SIZE
     current_page = 0
 
     def _left_range(self):
         return self.page_range[:self.lookaround_size]
 
     def _right_range(self):
         pages = self.num_pages-self.lookaround_size
         if pages <= 0:
             return []
         else:
             return self.page_range[pages:]
 
     def _center_range(self):
         index = self.page_range.index(self.current_page)
 
         start = max(self.lookaround_size, index - self.lookaround_size)
         end = min(self.num_pages - self.lookaround_size, index + self.lookaround_size + 1)
         return self.page_range[start:end]
 
     def get_divided_range(self):
         dr = list()
 
         dr += self._left_range()
         dr += self._center_range()
         dr += self._right_range()
 
         # Remove duplicates
         dr = list(set(dr))
         dr.sort()
 
         return dr
 
     def get_dividers(self):
         dividers = []
 
         prev_page = 1
         for page in self.get_divided_range():
             if page - prev_page > 1:
                 dividers.append(page)
 
                 # There can be no more than 2 dividers, so don't bother going
                 # further
                 if len(dividers) > 2:
                     break
             prev_page = page
 
         return dividers
 
     def set_url(self, link, params):
         self.link = link
         self.params = params
 
     def get_page_url(self, page):
         self.params['page'] = page
         url_params = '?' + '&'.join(['{}={}'.format(key, self.params[key])
             for key in self.params.keys()])
         return self.link + url_params
 
+    def supports_urls(self):
+        return self.link is not None and self.params is not None

boards/templatetags/board.py

@@ -1,48 +1,49
 import re
 from django.shortcuts import get_object_or_404
 from django import template
 
 
 IMG_ACTION_URL = '[<a href="{}">{}</a>]'
 
 
 register = template.Library()
 
 actions = [
     {
         'name': 'google',
         'link': 'http://google.com/searchbyimage?image_url=%s',
     },
     {
         'name': 'iqdb',
         'link': 'http://iqdb.org/?url=%s',
     },
 ]
 
 
 @register.simple_tag(name='post_url')
 def post_url(*args, **kwargs):
     post_id = args[0]
 
     post = get_object_or_404('Post', id=post_id)
 
     return post.get_absolute_url()
 
 
 @register.simple_tag(name='image_actions')
 def image_actions(*args, **kwargs):
     image_link = args[0]
     if len(args) > 1:
         image_link = 'http://' + args[1] + image_link  # TODO https?
 
     return ', '.join([IMG_ACTION_URL.format(
         action['link'] % image_link, action['name']) for action in actions])
 
 
 @register.simple_tag(name='post_view')
 def post_view(post, *args, **kwargs):
     return post.get_view(*args, **kwargs)
 
 @register.simple_tag(name='page_url')
 def page_url(paginator, page_number, *args, **kwargs):
-    return paginator.get_page_url(page_number)
+    if paginator.supports_urls():
+        return paginator.get_page_url(page_number)