Ticket #10793: paginator.diff

django/contrib/sitemaps/__init__.py

@@ -2 +2 @@
 from django.core import urlresolvers, paginator
 from django.core.exceptions import ImproperlyConfigured
 import urllib
+from datetime import datetime, timedelta
 
 PING_URL = "http://www.google.com/webmasters/tools/ping"
 
@@ -39 +40 @@
     # This limit is defined by Google. See the index documentation at
     # http://sitemaps.org/protocol.php#index.
     limit = 50000
+    counter_delta = timedelta(seconds = 60)
+    reload_delta = timedelta(seconds = 600)
 
     # If protocol is None, the URLs in the sitemap will use the protocol
     # with which the sitemap was requested.
@@ -60 +63 @@
         return obj.get_absolute_url()
 
     def _get_paginator(self):
-        if not hasattr(self, "_paginator"):
+        __now = datetime.now()
+        # Do now have paginator or
+        if (not hasattr(self, "_paginator") or
+        # paginator very old or
+                (self.__paginator_validate_timestamp > __now) or
+        # paginator not so new and items count in DB changed
+                (self.__counter_validate_timestamp > __now and self.__counter != len(self.items()))):
+
+            self.__counter_validate_timestamp = __now + self.counter_delta
+            self.__paginator_validate_timestamp = __now + self.reload_delta
+            self.__counter = len(self.items())
             self._paginator = paginator.Paginator(self.items(), self.limit)
         return self._paginator
     paginator = property(_get_paginator)