X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=reindex_blog.py;h=92a02272ea79c60a9f79b0ae21fe8733d6fa47f2;hb=18437f3921525750648f80ccb7befc8fb260a33f;hp=c4d9be3358e6904ef9256879b0174efb9fcf729c;hpb=192efe0dee2d6a52978cb3db046949532e7678e1;p=phdru.name%2Fphdru.name.git
diff --git a/reindex_blog.py b/reindex_blog.py
index c4d9be3..92a0227 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -1,15 +1,19 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
# -*- coding: koi8-r -*-
__version__ = "$Revision$"[11:-2]
__revision__ = "$Id$"[5:-2]
__date__ = "$Date$"[7:-2]
-__author__ = "Oleg BroytMann öÕÒÎÁÌ
+öÕÒÎÁÌ
""" % {"cyear": year or 2005})
- elif show_month:
-
+ elif level == 1:
new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog: %(year)s"
-#attr $Description = "BroytMann Russian Blog %(year)s Index Document"
+#attr $Title = "Oleg Broytman's blog: %(year)s"
+#attr $Description = "Broytman Russian Blog %(year)s Index Document"
#attr $Copyright = %(cyear)s
##
#def body_html
-öÕÒÎÁÌ: %(year)s
+öÕÒÎÁÌ: %(year)s
""" % {"year": year, "cyear": year or 2005})
- elif show_day:
-
- month = int(month)
+ elif level == 2:
+ imonth = int(month)
new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog: %(month_abbr_en)s %(year)s"
-#attr $Description = "BroytMann Russian Blog %(month_name_en)s %(year)s Index Document"
+#attr $Title = "Oleg Broytman's blog: %(month_abbr_en)s %(year)s"
+#attr $Description = "Broytman Russian Blog %(month_name_en)s %(year)s Index Document"
#attr $Copyright = %(cyear)s
##
#def body_html
-öÕÒÎÁÌ: %(month_name_ru0)s %(year)s
+öÕÒÎÁÌ: %(month_name_ru0)s %(year)s
""" % {
"year": year, "cyear": year or 2005,
- "month_abbr_en": months_abbrs_en[month], "month_name_en": months_names_en[month],
- "month_name_ru0": months_names_ru0[month],
+ "month_abbr_en": months_abbrs_en[imonth], "month_name_en": months_names_en[imonth],
+ "month_name_ru0": months_names_ru0[imonth],
})
- else:
+ elif level == 3:
+ iday = int(day)
+ imonth = int(month)
+
+ new_text.append("""\
+#attr $Next = "%s"
+""" % titles[0][3])
- day = int(day)
- month = int(month)
+
+ if len(titles) == 1:
+ new_text.append("""\
+#attr $refresh = "0; URL=%s"
+""" % titles[0][3])
new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog: %(day)d %(month_abbr_en)s %(year)s"
-#attr $Description = "BroytMann Russian Blog %(day)d %(month_name_en)s %(year)s Index Document"
+#attr $Title = "Oleg Broytman's blog: %(day)d %(month_abbr_en)s %(year)s"
+#attr $Description = "Broytman Russian Blog %(day)d %(month_name_en)s %(year)s Index Document"
#attr $Copyright = %(cyear)s
##
#def body_html
-öÕÒÎÁÌ: %(day)d %(month_name_ru0)s %(year)s
+öÕÒÎÁÌ: %(day)d %(month_name_ru)s %(year)s
""" % {
"year": year, "cyear": year or 2005,
- "month_abbr_en": months_abbrs_en[month], "month_name_en": months_names_en[month],
- "month_name_ru0": months_names_ru0[month],
- "day": day
+ "month_abbr_en": months_abbrs_en[imonth], "month_name_en": months_names_en[imonth],
+ "month_name_ru": months_names_ru[imonth],
+ "day": iday
})
save_titles = titles[:]
titles.reverse()
- save_day = None
- for key, tmpl, title, lead in titles:
- year, month, day = key
+ save_date = None
+ for year, month, day, file, title, lead in titles:
href = []
- if show_year:
+ if level == 0:
href.append(year)
- if show_month:
+ if level <= 1:
href.append(month)
- if show_day:
+ if level <= 2:
href.append(day)
- href.append(tmpl)
+ href.append(file)
href = '/'.join(href)
if day[0] == '0': day = day[1:]
- if save_day <> day:
- if show_year:
+ if save_date <> (year, month, day):
+ if level == 0:
new_text.append('\n%s %s %s
' % (day, months_names_ru[int(month)], year))
else:
new_text.append('\n%s %s
' % (day, months_names_ru[int(month)]))
- save_day = day
+ save_date = year, month, day
if lead:
lead = lead + ' '
else:
@@ -200,18 +222,41 @@ def write_template(year, month, day, titles):
îÏ×ÏÓÔÅ×ÁÑ ÌÅÎÔÁ × ÆÏÒÍÁÔÁÈ +Atom 1.0 +É RSS 2.0 . +
+""") + years = {} - for key, tmpl, title, lead in save_titles: - year, month, day = key + for year, month, day, file, title, lead in save_titles: years[year] = True - first_year = True new_text.append(''' -ôÅÇÉ: +''') + first_tag = True + for count, tag, links in all_tags: + if first_tag: + first_tag = False + else: + new_text.append(' - ') + new_text.append("""%s (%d)""" % (tag, tag, count)) + new_text.append(''' +
+''') -+ max_year = int(sorted(years.keys())[-1]) + years = range(2005, max_year+1) + + new_text.append(''' +
ðÏ ÇÏÄÁÍ: ''') - for year in sorted(years.keys()): + first_year = True + for year in years: if first_year: first_year = False else: @@ -221,20 +266,23 @@ def write_template(year, month, day, titles):
''') + new_text.append(""" +öö +""") + new_text.append("""\ #end def $phd_pp_ru.respond(self) """) - new_text = ''.join(new_text) - if old_text <> new_text: - print "Writing", index_name - index_tmpl = open(index_name, 'w') - index_tmpl.write(new_text) - index_tmpl.close() + write_if_changed(index_name, ''.join(new_text)) +all_tags = {} all_titles = [] +all_titles_tags = [] + for year in sorted(years.keys()): year_titles = [] months = years[year] @@ -244,13 +292,146 @@ for year in sorted(years.keys()): day_titles = [] key = year, month, day if key in blog: - for tmpl, title, lead in blog[key]: - if tmpl.endswith(".tmpl"): tmpl = tmpl[:-len("tmpl")] + "html" - all_titles.append((key, tmpl, title, lead)) - year_titles.append((key, tmpl, title, lead)) - month_titles.append((key, tmpl, title, lead)) - day_titles.append((key, tmpl, title, lead)) - write_template(year, month, day, day_titles) - write_template(year, month, '', month_titles) - write_template(year, '', '', year_titles) -write_template('', '', '', all_titles[-20:]) + for file, title, lead, tags in blog[key]: + if file.endswith(".tmpl"): file = file[:-len("tmpl")] + "html" + value = (year, month, day, file, title, lead) + all_titles_tags.append((year, month, day, file, title, lead, tags)) + all_titles.append(value) + year_titles.append(value) + month_titles.append(value) + day_titles.append(value) + for tag in tags: + if tag in all_tags: + tag_links = all_tags[tag] + else: + tag_links = all_tags[tag] = [] + tag_links.append(value) + write_template(3, year, month, day, day_titles) + write_template(2, year, month, day, month_titles) + write_template(1, year, month, day, year_titles) + +def by_count_rev_tag_link(t1, t2): + """Sort all_tags by count in descending order, + and by tags and links in ascending order + """ + r = cmp(t1[0], t2[0]) + if r: + return -r + return cmp((t1[1], t1[2]), (t2[1], t2[2])) + +all_tags = [(len(links), tag, links) for (tag, links) in all_tags.items()] +all_tags.sort(by_count_rev_tag_link) + +write_template(0, year, month, day, all_titles[-20:], all_tags) + +new_text = ["""\ +## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. +#extends phd_pp_ru +#implements respond +#attr $Title = "Oleg Broytman's blog: tags" +#attr $Description = "Broytman Russian Blog Tags Index Document" +#attr $Copyright = 2006 +## +#def body_html +
+
+