X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=29d58d59c9925163dfe7be4e916a4b0796fde6c3;hb=2f4077c7be4097e2e4c318cfdb818746cb223b66;hp=4be9689896774ea21d0d813379f6bdbb0dd93d3f;hpb=3da613ba24262aa407189a733e5c2435baff224b;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 4be9689..29d58d5 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 # -*- coding: koi8-r -*-
 
 __version__ = "$Revision$"[11:-2]
@@ -10,8 +10,9 @@ __copyright__ = "Copyright (C) 2006 PhiloSoft Design"
 
 import sys, os
 
-blog_filename = sys.argv[1]
+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
@@ -44,8 +45,7 @@ for dirpath, dirs, files in os.walk(blog_root):
    if not d.startswith("20") and not d.isdigit():
       continue
    for file in files:
-      # Ignore index.tmpl and *.html files; supose all other files are *.tmpl
-      if file == "index.tmpl" or file.endswith(".html"):
+      if not file.endswith(".tmpl"):
          continue
       fullpath = os.path.join(dirpath, file)
       template = Template(file=fullpath)
@@ -88,15 +88,19 @@ if blog <> old_blog:
 # Localized month names
 
 import locale
-locale.setlocale(locale.LC_ALL, '')
+locale.setlocale(locale.LC_ALL, "ru_RU.KOI8-R")
 from calendar import _localized_day, _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, '')
-months_names_ru = [month.lower() for month in _localized_month('%B')]
+locale.setlocale(locale.LC_TIME, "ru_RU.KOI8-R")
+#months_names_ru = list(_localized_month('%B'))
+
+months_names_ru = ['', "ÑÎ×ÁÒÑ", "ÆÅ×ÒÁÌÑ", "ÍÁÒÔÁ", "ÁÐÒÅÌÑ", "ÍÁÑ", "ÉÀÎÑ",
+   "ÉÀÌÑ", "Á×ÇÕÓÔÁ", "ÓÅÎÔÑÂÒÑ", "ÏËÔÑÂÒÑ", "ÎÏÑÂÒÑ", "ÄÅËÁÂÒÑ"
+]
 
 months_names_ru0 = ['', "ÑÎ×ÁÒØ", "ÆÅ×ÒÁÌØ", "ÍÁÒÔ", "ÁÐÒÅÌØ", "ÍÁÊ", "ÉÀÎØ",
    "ÉÀÌØ", "Á×ÇÕÓÔ", "ÓÅÎÔÑÂÒØ", "ÏËÔÑÂÒØ", "ÎÏÑÂÒØ", "ÄÅËÁÂÒØ"
@@ -132,7 +136,7 @@ def write_template(level, year, month, day, titles, tags=None):
 )
 ##
 #def body_html
-<H1>öÕÒÎÁÌ</H1>
+<h1>öÕÒÎÁÌ</h1>
 """ % {"cyear": year or 2005})
 
    elif level == 1:
@@ -142,7 +146,7 @@ def write_template(level, year, month, day, titles, tags=None):
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
-<H1>öÕÒÎÁÌ: %(year)s</H1>
+<h1>öÕÒÎÁÌ: %(year)s</h1>
 """ % {"year": year, "cyear": year or 2005})
 
    elif level == 2:
@@ -153,7 +157,7 @@ def write_template(level, year, month, day, titles, tags=None):
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
-<H1>öÕÒÎÁÌ: %(month_name_ru0)s %(year)s</H1>
+<h1>öÕÒÎÁÌ: %(month_name_ru0)s %(year)s</h1>
 """ % {
       "year": year, "cyear": year or 2005,
       "month_abbr_en": months_abbrs_en[imonth], "month_name_en": months_names_en[imonth],
@@ -180,11 +184,11 @@ def write_template(level, year, month, day, titles, tags=None):
 #attr $Copyright = %(cyear)s
 ##
 #def body_html
-<H1>öÕÒÎÁÌ: %(day)d %(month_name_ru0)s %(year)s</H1>
+<h1>öÕÒÎÁÌ: %(day)d %(month_name_ru)s %(year)s</h1>
 """ % {
       "year": year, "cyear": year or 2005,
       "month_abbr_en": months_abbrs_en[imonth], "month_name_en": months_names_en[imonth],
-      "month_name_ru0": months_names_ru0[imonth],
+      "month_name_ru": months_names_ru[imonth],
       "day": iday
    })
 
@@ -260,6 +264,11 @@ def write_template(level, year, month, day, titles, tags=None):
 </p>
 ''')
 
+      new_text.append("""
+<hr>
+<p class="head"><a href="http://phd.livejournal.com/">öö</a>
+""")
+
    new_text.append("""\
 #end def
 $phd_pp_ru.respond(self)
@@ -322,7 +331,7 @@ new_text = ["""\
 #attr $Copyright = 2006
 ##
 #def body_html
-<H1>ôÅÇÉ</H1>
+<h1>ôÅÇÉ</h1>
 
 <p class="head">
 <dl>
@@ -342,7 +351,7 @@ for count, tag, links in all_tags:
 #attr $Copyright = 2006
 ##
 #def body_html
-<H1>%s</H1>
+<h1>%s</h1>
 
 <p class="head">
 <ul>
@@ -384,7 +393,10 @@ from atom_10 import atom_10
 from rss_20 import rss_20
 from news import NewsItem
 
-baseURL = "http://phd.pp.ru/Russian/blog/"
+if blog_root:
+   baseURL = "http://phd.pp.ru/%s/" % blog_root
+else:
+   baseURL = "http://phd.pp.ru/"
 
 items = []
 for item in tuple(reversed(all_titles_tags))[:10]: