tweak paginator to accomodate {slug}.html patterns

pelican/paginator.py

@@ -66,7 +66,10 @@ class Paginator(object):
 
 class Page(object):
     def __init__(self, name, url, object_list, number, paginator, settings):
+        self.full_name = name
         self.name, self.extension = os.path.splitext(name)
+        dn, fn = os.path.split(name)
+        self.base_name = dn if fn in ('index.htm', 'index.html') else self.name
         self.base_url = url
         self.object_list = object_list
         self.number = number
@@ -134,25 +137,16 @@ class Page(object):
 
         # URL or SAVE_AS is a string, format it with a controlled context
         context = {
-            'name': self.name.replace(os.sep, '/'),
+            'save_as': self.full_name,
             'url': self.base_url,
-            'object_list': self.object_list,
-            'number': self.number,
-            'paginator': self.paginator,
-            'settings': self.settings,
-            'base_name': os.path.dirname(self.name),
-            'number_sep': '/',
+            'name': self.name,
+            'base_name': self.base_name,
             'extension': self.extension,
+            'number': self.number,
         }
 
-        if self.number == 1:
-            # no page numbers on the first page
-            context['number'] = ''
-            context['number_sep'] = ''
-
         ret = prop_value.format(**context)
-        if ret[0] == '/':
-            ret = ret[1:]
+        ret = ret.lstrip('/')
         return ret
 
     url = property(functools.partial(_from_settings, key='URL'))

pelican/settings.py

@@ -97,7 +97,8 @@ DEFAULT_CONFIG = {
     'AUTHOR_URL': 'author/{slug}.html',
     'AUTHOR_SAVE_AS': posix_join('author', '{slug}.html'),
     'PAGINATION_PATTERNS': [
-        (0, '{name}{number}{extension}', '{name}{number}{extension}'),
+        (1, '{name}{extension}', '{name}{extension}'),
+        (2, '{name}{number}{extension}', '{name}{number}{extension}'),
     ],
     'YEAR_ARCHIVE_URL': '',
     'YEAR_ARCHIVE_SAVE_AS': '',

pelican/tests/test_paginator.py

@@ -74,7 +74,7 @@ class TestPage(unittest.TestCase):
                               object_list, settings, 1)
         page1 = paginator.page(1)
         self.assertEqual(page1.save_as, 'blog/index.html')
-        self.assertEqual(page1.url, '//blog.my.site/')
+        self.assertEqual(page1.url, 'blog.my.site/')
         page2 = paginator.page(2)
         self.assertEqual(page2.save_as, 'blog/2/index.html')
-        self.assertEqual(page2.url, '//blog.my.site/2/')
+        self.assertEqual(page2.url, 'blog.my.site/2/')