X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=reindex_blog.py;h=0b7c2a6dd9fbf39af81f038f172c0b998470b84b;hb=0c0058d611f55ddae8c08726acb9952e5984f8da;hp=82cdde591b34951ef3d82a9a2bc5ff01331801a6;hpb=2df1050b44c2cfa7dabefec5af45d234e9c49dcd;p=phdru.name%2Fphdru.name.git
diff --git a/reindex_blog.py b/reindex_blog.py
index 82cdde5..0b7c2a6 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -2,32 +2,20 @@
# -*- coding: koi8-r -*-
__author__ = "Oleg Broytman "
-__copyright__ = "Copyright (C) 2006-2013 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2024 PhiloSoft Design"
import sys, os
-
-blog_data_root = sys.argv[1]
-blog_root = sys.argv[2]
-blog_filename = os.path.join(blog_data_root, "blog_dict.pickle")
-
try:
- import cPickle as pickle
+ from urllib.parse import quote
except ImportError:
- import pickle
+ from urllib import quote
from Cheetah.Template import Template
+from Cheetah.compat import string_type
+from blog_db import blog_root, load_blog, save_blog
-# Load old blog
-
-try:
- blog_file = open(blog_filename, "rb")
-except IOError:
- old_blog = {}
-else:
- old_blog = pickle.load(blog_file)
- blog_file.close()
-
+old_blog = load_blog()
# blog is a dictionary mapping
# (year, month, day) => [list of (file, title, lead, tags)]
@@ -54,7 +42,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]
@@ -86,23 +74,21 @@ for dirpath, dirs, files in os.walk(blog_root):
bodies[key] = body
# Need to save the blog?
-if blog <> old_blog:
- blog_file = open(blog_filename, "wb")
- pickle.dump(blog, blog_file, pickle.HIGHEST_PROTOCOL)
- blog_file.close()
+if blog != old_blog:
+ save_blog(blog)
# Localized month names
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 = ['', "ÑÎ×ÁÒÑ", "ÆÅ×ÒÁÌÑ", "ÍÁÒÔÁ", "ÁÐÒÅÌÑ", "ÍÁÑ", "ÉÀÎÑ",
"ÉÀÌÑ", "Á×ÇÕÓÔÁ", "ÓÅÎÔÑÂÒÑ", "ÏËÔÑÂÒÑ", "ÎÏÑÂÒÑ", "ÄÅËÁÂÒÑ"
@@ -114,6 +100,8 @@ months_names_ru0 = ['', "
from news import write_if_changed
+def encode_tag(tag):
+ return quote(tag.replace(' ', '_'))
def write_template(level, year, month, day, titles, tags=None):
path = [blog_root]
@@ -213,7 +201,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:
@@ -253,7 +241,8 @@ def write_template(level, year, month, day, titles, tags=None):
first_tag = False
else:
new_text.append(' - ')
- new_text.append("""%s (%d)""" % (tag, tag, count))
+ new_text.append("""%s (%d)""" % (
+ encode_tag(tag), tag, count))
new_text.append('''
''')
@@ -360,7 +349,7 @@ new_text = ["""\
ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
ïÐÅÒÁÔÏÒ '&' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.
- óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
+ ðÒÉÏÒÉÔÅÔ ÏÐÅÒÁÃÉÊ ÓÔÁÎÄÁÒÔÎÙÊ: NOT > AND > OR. óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
@@ -375,14 +364,13 @@ linux
-
"""]
for i, (count, tag, links) in enumerate(all_tags):
new_text.append("""\
- %s (%d)
-""" % (tag, tag, count))
+""" % (encode_tag(tag), tag, count))
first = all_tags[0][1]
if i == 0:
@@ -428,7 +416,6 @@ for i, (count, tag, links) in enumerate(all_tags):
#def body_html
%s
-
""" % tag)
@@ -445,15 +432,15 @@ for i, (count, tag, links) in enumerate(all_tags):
tag_text.append("""\
-
#end def
$phd_site.respond(self)
""")
- write_if_changed(os.path.join(blog_root, "tags", tag+".tmpl"), ''.join(tag_text))
+ write_if_changed(os.path.join(blog_root, "tags",
+ tag.replace(' ', '_') + ".tmpl"),
+ ''.join(tag_text))
new_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -505,6 +492,8 @@ class AbsURLHTMLParser(_HTMLParser):
self.accumulator += '