wishlist, plugin update

Author: librarian

content/pages/wishlist.md

@@ -8,6 +8,7 @@ url: wishlist/
 ## Всякое разное
 
 * Хорошая сумка для походной аптечки (гермомешок, внутри несессер с трёмя секциями, что то вроде Deuter First Aid Kit Dry M)
+* Торцевая разделочная доска (например [доска от mtmwood](http://mtmwood.com/serial.php))
 * Велоперчатки Pearl iZUMi Mens ELITE Gel-Vent размер M
 * Трекинговый рюкзак Deuter Aircontact PRO 70+15
 * Самонадувающийся коврик Thermarest PROLITE REGULAR 183х51

fabfile.py

@@ -11,8 +11,8 @@
 DEPLOY_PATH = env.deploy_path
 
 # Remote server configuration
-production = 'lib@libc6.org:22'
-dest_path = '/var/www/lib/libc6.org/public'
+production = 'www-data@libc6.org:22'
+dest_path = '/var/www/libc6.org/public'
 
 # Rackspace Cloud Files configuration settings
 

plugins/neighbors/Readme.rst

@@ -36,7 +36,7 @@ Usage
             </a>
         </li>
     {% endif %}
-    {% if article.next_article %}
+    {% if article.next_article_in_category %}
         <li>
             <a href="{{ SITEURL }}/{{ article.next_article_in_category.url}}">
                 {{ article.next_article_in_category.title }}
@@ -63,17 +63,17 @@ Therefor the usage with subcategories is:
 .. code-block:: html+jinja
 
     <ul>
-    {% if article.prev_article_subcategory1 %}
+    {% if article.prev_article_in_subcategory1 %}
         <li>
             <a href="{{ SITEURL }}/{{ article.prev_article_in_subcategory1.url}}">
                 {{ article.prev_article_in_subcategory1.title }}
             </a>
         </li>
     {% endif %}
-    {% if article.next_article %}
+    {% if article.next_article_in_subcategory1 %}
         <li>
-            <a href="{{ SITEURL }}/{{ article.next_article_subcategory1.url}}">
-                {{ article.next_article_subcategory1.title }}
+            <a href="{{ SITEURL }}/{{ article.next_article_in_subcategory1.url}}">
+                {{ article.next_article_in_subcategory1.title }}
             </a>
         </li>
     {% endif %}
@@ -86,7 +86,7 @@ Therefor the usage with subcategories is:
             </a>
         </li>
     {% endif %}
-    {% if article.next_article %}
+    {% if article.next_article_in_subcategory2 %}
         <li>
             <a href="{{ SITEURL }}/{{ article.next_article_in_subcategory2.url}}">
                 {{ article.next_article_in_subcategory2.title }}

plugins/sitemap/sitemap.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 '''
 Sitemap
 -------
@@ -8,12 +8,14 @@
 
 from __future__ import unicode_literals
 
+import re
 import collections
 import os.path
 
 from datetime import datetime
 from logging import warning, info
 from codecs import open
+from pytz import timezone
 
 from pelican import signals, contents
 from pelican.utils import get_date
@@ -46,7 +48,7 @@
 
 def format_date(date):
     if date.tzinfo:
-        tz = date.strftime('%s')
+        tz = date.strftime('%z')
         tz = tz[:-2] + ':' + tz[-2:]
     else:
         tz = "-00:00"
@@ -61,6 +63,11 @@ def __init__(self, context, settings, path, theme, output_path, *null):
         self.now = datetime.now()
         self.siteurl = settings.get('SITEURL')
 
+
+        self.default_timezone = settings.get('TIMEZONE', 'UTC')
+        self.timezone = getattr(self, 'timezone', self.default_timezone)
+        self.timezone = timezone(self.timezone)
+
         self.format = 'xml'
 
         self.changefreqs = {
@@ -75,6 +82,8 @@ def __init__(self, context, settings, path, theme, output_path, *null):
             'pages': 0.5
         }
 
+        self.sitemapExclude = []
+
         config = settings.get('SITEMAP', {})
 
         if not isinstance(config, dict):
@@ -83,6 +92,7 @@ def __init__(self, context, settings, path, theme, output_path, *null):
             fmt = config.get('format')
             pris = config.get('priorities')
             chfreqs = config.get('changefreqs')
+            self.sitemapExclude = config.get('exclude', [])
 
             if fmt not in ('xml', 'txt'):
                 warning("sitemap plugin: SITEMAP['format'] must be `txt' or `xml'")
@@ -128,15 +138,19 @@ def write_url(self, page, fd):
         if getattr(page, 'status', 'published') != 'published':
             return
 
-        page_path = os.path.join(self.output_path, page.url)
+        # We can disable categories/authors/etc by using False instead of ''
+        if not page.save_as:
+            return
+
+        page_path = os.path.join(self.output_path, page.save_as)
         if not os.path.exists(page_path):
             return
 
         lastdate = getattr(page, 'date', self.now)
         try:
             lastdate = self.get_date_modified(page, lastdate)
         except ValueError:
-            warning("sitemap plugin: " + page.url + " has invalid modification date,")
+            warning("sitemap plugin: " + page.save_as + " has invalid modification date,")
             warning("sitemap plugin: using date value as lastmod.")
         lastmod = format_date(lastdate)
 
@@ -150,25 +164,35 @@ def write_url(self, page, fd):
             pri = self.priorities['indexes']
             chfreq = self.changefreqs['indexes']
 
-
+        pageurl = '' if page.url == 'index.html' else page.url
+        
+        #Exclude URLs from the sitemap:
         if self.format == 'xml':
-            fd.write(XML_URL.format(self.siteurl, page.url, lastmod, chfreq, pri))
+            flag = False
+            for regstr in self.sitemapExclude:
+                if re.match(regstr, pageurl):
+                    flag = True
+                    break
+            if not flag:
+                fd.write(XML_URL.format(self.siteurl, pageurl, lastmod, chfreq, pri))
         else:
-            fd.write(self.siteurl + '/' + loc + '\n')
+            fd.write(self.siteurl + '/' + pageurl + '\n')
 
-    def get_date_modified(self, page, defalut):
+    def get_date_modified(self, page, default):
         if hasattr(page, 'modified'):
-            return get_date(getattr(page, 'modified'))
+            if isinstance(page.modified, datetime):
+                return page.modified
+            return get_date(page.modified)
         else:
-            return defalut
+            return default
 
     def set_url_wrappers_modification_date(self, wrappers):
         for (wrapper, articles) in wrappers:
-            lastmod = datetime.min
+            lastmod = datetime.min.replace(tzinfo=self.timezone)
             for article in articles:
-                lastmod = max(lastmod, article.date)
+                lastmod = max(lastmod, article.date.replace(tzinfo=self.timezone))
                 try:
-                    modified = self.get_date_modified(article, datetime.min);
+                    modified = self.get_date_modified(article, datetime.min).replace(tzinfo=self.timezone)
                     lastmod = max(lastmod, modified)
                 except ValueError:
                     # Supressed: user will be notified.
@@ -186,7 +210,7 @@ def generate_output(self, writer):
         self.set_url_wrappers_modification_date(self.context['categories'])
         self.set_url_wrappers_modification_date(self.context['tags'])
         self.set_url_wrappers_modification_date(self.context['authors'])
-                
+
         for article in self.context['articles']:
             pages += article.translations
 
@@ -202,15 +226,17 @@ def generate_output(self, writer):
             FakePage = collections.namedtuple('FakePage',
                                               ['status',
                                                'date',
-                                               'url'])
+                                               'url',
+                                               'save_as'])
 
             for standard_page_url in ['index.html',
                                       'archives.html',
                                       'tags.html',
                                       'categories.html']:
                 fake = FakePage(status='published',
                                 date=self.now,
-                                url=standard_page_url)
+                                url=standard_page_url,
+                                save_as=standard_page_url)
                 self.write_url(fake, fd)
 
             for page in pages: