-#! /usr/local/bin/python -O
+#! /usr/bin/env python
# -*- coding: koi8-r -*-
__version__ = "$Revision$"[11:-2]
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
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)
title = ' '.join(title_parts[6:])
lead = getattr(template, "Lead", None)
- tags = getattr(template, "Tag", None)
+ tags = template.Tag
if isinstance(tags, basestring):
tags = (tags,)
pickle.dump(blog, blog_file, pickle.HIGHEST_PROTOCOL)
blog_file.close()
-
# 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 = ['', "январь", "февраль", "март", "апрель", "май", "июнь",
"июль", "август", "сентябрь", "октябрь", "ноябрь", "декабрь"
)
##
#def body_html
-<H1>Журнал</H1>
+<h1>Журнал</h1>
""" % {"cyear": year or 2005})
elif level == 1:
#attr $Copyright = %(cyear)s
##
#def body_html
-<H1>Журнал: %(year)s</H1>
+<h1>Журнал: %(year)s</h1>
""" % {"year": year, "cyear": year or 2005})
elif level == 2:
#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],
#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
})
save_titles = titles[:]
titles.reverse()
- save_day = None
+ save_date = None
for year, month, day, file, title, lead in titles:
href = []
if level == 0:
href.append(file)
href = '/'.join(href)
if day[0] == '0': day = day[1:]
- if save_day <> day:
+ if save_date <> (year, month, day):
if level == 0:
new_text.append('\n<h2>%s %s %s</h2>' % (day, months_names_ru[int(month)], year))
else:
new_text.append('\n<h2>%s %s</h2>' % (day, months_names_ru[int(month)]))
- save_day = day
+ save_date = year, month, day
if lead:
lead = lead + ' '
else:
</p>
''')
+ max_year = int(sorted(years.keys())[-1])
+ years = range(2005, max_year+1)
+
new_text.append('''
<p class="head">По годам:
''')
first_year = True
- for year in sorted(years.keys()):
+ for year in years:
if first_year:
first_year = False
else:
</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)
#attr $Copyright = 2006
##
#def body_html
-<H1>Теги</H1>
+<h1>Теги</h1>
<p class="head">
<dl>
#attr $Copyright = 2006
##
#def body_html
-<H1>%s</H1>
+<h1>%s</h1>
<p class="head">
<ul>
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]: