X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=33e9077aefd0e6472959c3300d1f105ea59ef6b0;hb=f95205f4ff896df01ca7c9c3d672147408e0b119;hp=3f10016e569d1d79daaaa2fc97b46150356501b9;hpb=da1a29778a183627d2ad16c5e6f312b385043461;p=phdru.name%2Fphdru.name.git
diff --git a/reindex_blog.py b/reindex_blog.py
index 3f10016..33e9077 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -2,7 +2,7 @@
# -*- coding: koi8-r -*-
__author__ = "Oleg Broytman "
-__copyright__ = "Copyright (C) 2006-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2014 PhiloSoft Design"
import sys, os
@@ -49,13 +49,14 @@ for dirpath, dirs, files in os.walk(blog_root):
continue
fullpath = os.path.join(dirpath, file)
template = Template(file=fullpath)
- title_parts = template.Title.split()
+ title_parts = template.Title.decode('utf-8').encode('koi8-r').split()
title = ' '.join(title_parts[6:])
- lead = template.Lead
+ lead = template.Lead.decode('utf-8').encode('koi8-r')
tags = template.Tag
if isinstance(tags, basestring):
tags = (tags,)
+ tags = [tag.decode('utf-8').encode('koi8-r') for tag in tags]
if title:
key = year, month, day = tuple(dirpath[len(blog_root):].split(os.sep)[1:])
@@ -79,7 +80,10 @@ for dirpath, dirs, files in os.walk(blog_root):
file = file[:-len("tmpl")] + "html"
key = (year, month, day, file)
- bodies[key] = template.body()
+ body = template.body()
+ if isinstance(body, unicode):
+ body = body.encode('koi8-r')
+ bodies[key] = body
# Need to save the blog?
if blog <> old_blog:
@@ -260,13 +264,20 @@ def write_template(level, year, month, day, titles, tags=None):
new_text.append('''
ðÏ ÇÏÄÁÍ:
''')
+
+ year_counts = {}
+ for year, month, day, file, title, lead in all_titles:
+ year_counts[year] = 0
+ for year, month, day, file, title, lead in all_titles:
+ year_counts[year] += 1
+
first_year = True
for year in years:
if first_year:
first_year = False
else:
new_text.append(' - ')
- new_text.append('%s' % (year, year))
+ new_text.append('%s (%d)' % (year, year, year_counts[str(year)]))
new_text.append('''
''')
@@ -341,7 +352,29 @@ new_text = ["""\
#def body_html
ôÅÇÉ
-
+
+æÏÒÍÁ ÐÏÉÓËÁ ÐÏÚ×ÏÌÑÅÔ ÉÓËÁÔØ ÓÏÏÂÝÅÎÉÑ × ÂÌÏÇÅ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ×ÙÒÁÖÅÎÉÀ.
+óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:
+
+ - ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '&' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.
+ - ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.
+ - óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.
+
+
+ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
+ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
+linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
+
+
+
+
+
+
"""]
@@ -394,7 +427,6 @@ for i, (count, tag, links) in enumerate(all_tags):
#def body_html
%s
-
""" % tag)
@@ -411,7 +443,6 @@ for i, (count, tag, links) in enumerate(all_tags):
tag_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -419,7 +450,6 @@ $phd_site.respond(self)
new_text.append("""\
-
#end def
$phd_site.respond(self)
""")
@@ -480,6 +510,19 @@ class AbsURLHTMLParser(_HTMLParser):
def end_a(self):
self.accumulator += ''
+ def start_img(self, attrs):
+ self.accumulator += ''
+
+ def end_img(self):
+ pass
+
def absolute_urls(body, base):
parser = AbsURLHTMLParser(base)
@@ -508,6 +551,8 @@ else:
items = []
for item in tuple(reversed(all_titles_tags))[:10]:
year, month, day, file, title, lead, tags = item
+ lead = lead.decode('koi8-r').encode('utf-8')
+ title = title.decode('koi8-r').encode('utf-8')
url_path = "%s/%s/%s/%s" % (year, month, day, file)
item = NewsItem(
"%s-%s-%s" % (year, month, day),
@@ -536,23 +581,23 @@ namespace = {
# For english dates
locale.setlocale(locale.LC_TIME, 'C')
-atom_tmpl = str(atom_10(searchList=[namespace]))
+atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r')
write_if_changed(os.path.join(blog_root, "atom_10.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
+rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r')
write_if_changed(os.path.join(blog_root, "rss_20.xml"), rss_tmpl)
for item in items:
item.excerpt = None
-atom_tmpl = str(atom_10(searchList=[namespace]))
+atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r')
write_if_changed(os.path.join(blog_root, "atom_10_titles.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
+rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r')
write_if_changed(os.path.join(blog_root, "rss_20_titles.xml"), rss_tmpl)
for item in items:
item.content = item.body
-atom_tmpl = str(atom_10(searchList=[namespace]))
+atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r')
write_if_changed(os.path.join(blog_root, "atom_10_full.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
+rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r')
write_if_changed(os.path.join(blog_root, "rss_20_full.xml"), rss_tmpl)