X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=ac22002b324adc704dd42119dd5f4f4383dc2880;hb=8c0064206e738803c2251b06033d10f7cf922648;hp=40b36c246ec1857c043f6707c53f3bc470f69e3c;hpb=be855e58c1e9d0a9a8a908558209c6c2ce9fe43c;p=phdru.name%2Fphdru.name.git
diff --git a/reindex_blog.py b/reindex_blog.py
index 40b36c2..ac22002 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -2,9 +2,10 @@
# -*- coding: koi8-r -*-
__author__ = "Oleg Broytman "
-__copyright__ = "Copyright (C) 2006-2013 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
import sys, os
+from Cheetah.compat import string_type
blog_data_root = sys.argv[1]
blog_root = sys.argv[2]
@@ -54,7 +55,7 @@ for dirpath, dirs, files in os.walk(blog_root):
lead = template.Lead.decode('utf-8').encode('koi8-r')
tags = template.Tag
- if isinstance(tags, basestring):
+ if isinstance(tags, string_type):
tags = (tags,)
tags = [tag.decode('utf-8').encode('koi8-r') for tag in tags]
@@ -95,14 +96,14 @@ if blog <> old_blog:
import locale
locale.setlocale(locale.LC_ALL, "ru_RU.KOI8-R")
-from calendar import _localized_day, _localized_month
+from calendar import _localized_month
locale.setlocale(locale.LC_TIME, 'C')
months_names_en = list(_localized_month('%B'))
months_abbrs_en = list(_localized_month('%b'))
locale.setlocale(locale.LC_TIME, "ru_RU.KOI8-R")
-#months_names_ru = list(_localized_month('%B'))
+# months_names_ru = list(_localized_month('%B'))
months_names_ru = ['', "ÑÎ×ÁÒÑ", "ÆÅ×ÒÁÌÑ", "ÍÁÒÔÁ", "ÁÐÒÅÌÑ", "ÍÁÑ", "ÉÀÎÑ",
"ÉÀÌÑ", "Á×ÇÕÓÔÁ", "ÓÅÎÔÑÂÒÑ", "ÏËÔÑÂÒÑ", "ÎÏÑÂÒÑ", "ÄÅËÁÂÒÑ"
@@ -213,7 +214,7 @@ def write_template(level, year, month, day, titles, tags=None):
href.append(file)
href = '/'.join(href)
if day[0] == '0': day = day[1:]
- if save_date <> (year, month, day):
+ if save_date != (year, month, day):
if level == 0:
new_text.append('\n%s %s %s
' % (day, months_names_ru[int(month)], year))
else:
@@ -352,18 +353,20 @@ new_text = ["""\
#def body_html
ôÅÇÉ
-
+
æÏÒÍÁ ÐÏÉÓËÁ ÐÏÚ×ÏÌÑÅÔ ÉÓËÁÔØ ÓÏÏÂÝÅÎÉÑ × ÂÌÏÇÅ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ×ÙÒÁÖÅÎÉÀ.
-óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:
+
- ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '!' (NOT) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '&' (AND) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
- - ïÐÅÒÁÔÏÒ '|' (OR) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÄÉÎ ÉÚ ÔÅÇÏ×.
- - óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
+ - ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '&' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.
+ - ðÒÉÏÒÉÔÅÔ ÏÐÅÒÁÃÉÊ ÓÔÁÎÄÁÒÔÎÙÊ: NOT > AND > OR. óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
-ðÒÏÂÅÌÙ ÎÅ ÄÏÐÕÓËÁÀÔÓÑ. ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
-ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ linux É
-ÎÅÔ ÔÅÇÁ audio.
+
+ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
+ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
+linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
@@ -373,7 +376,6 @@ new_text = ["""\
-
"""]
@@ -426,7 +428,6 @@ for i, (count, tag, links) in enumerate(all_tags):
#def body_html
%s
-
""" % tag)
@@ -443,7 +444,6 @@ for i, (count, tag, links) in enumerate(all_tags):
tag_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -451,7 +451,6 @@ $phd_site.respond(self)
new_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -565,7 +564,6 @@ for item in tuple(reversed(all_titles_tags))[:10]:
item.categoryList = tags
body = bodies[(year, month, day, file)]
body = absolute_urls(body, baseURL + url_path)
- body = body.decode('koi8-r').encode('utf-8')
item.body = body
item.excerpt = get_first_p(body)