X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=92a02272ea79c60a9f79b0ae21fe8733d6fa47f2;hb=eb2a1c0e122dc1f83bd3b220d2d00103f0dcda8c;hp=45faac2fdb7908e9b383d6f1c454ca02f500b9ee;hpb=44e9fd6fc036d39af7f1000a9a1a57b1e9ebb6ad;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 45faac2..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 <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phd.pp.ru>"
 __copyright__ = "Copyright (C) 2006 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
 except ImportError:
@@ -20,7 +24,6 @@ from Cheetah.Template import Template
 
 # Load old blog
 
-blog_filename = sys.argv[1]
 try:
    blog_file = open(blog_filename, "rb")
 except IOError:
@@ -37,13 +40,12 @@ blog = {}
 years = {}
 
 # Walk the directory recursively
-for dirpath, dirs, files in os.walk(os.curdir):
+for dirpath, dirs, files in os.walk(blog_root):
    d = os.path.basename(dirpath)
    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)
@@ -51,12 +53,12 @@ for dirpath, dirs, files in os.walk(os.curdir):
       title = ' '.join(title_parts[6:])
       lead = getattr(template, "Lead", None)
 
-      tags = getattr(template, "Tag", None)
+      tags = template.Tag
       if isinstance(tags, basestring):
          tags = (tags,)
 
       if title:
-         key = year, month, day = tuple(dirpath.split(os.sep)[1:])
+         key = year, month, day = tuple(dirpath[len(blog_root):].split(os.sep)[1:])
          if key in blog:
             days = blog[key]
          else:
@@ -82,42 +84,32 @@ if blog <> old_blog:
    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 write_if_changed(filename, new_text):
-   try:
-      infile = open(filename, 'r')
-      old_text = infile.read()
-      infile.close()
-   except IOError:
-      old_text = None
-
-   if old_text <> new_text:
-      print "Writing", filename
-      outfile = open(filename, 'w')
-      outfile.write(new_text)
-      outfile.close()
+from news import write_if_changed
 
 
 def write_template(level, year, month, day, titles, tags=None):
-   path = []
+   path = [blog_root]
    if level >= 1:
       path.append(year)
    if level >= 2:
@@ -135,33 +127,36 @@ def write_template(level, year, month, day, titles, tags=None):
 
    if level == 0:
       new_text.append("""\
-#attr $Title = "Oleg BroytMann's blog"
-#attr $Description = "BroytMann Russian Blog Index Document"
+#attr $Title = "Oleg Broytman's blog"
+#attr $Description = "Broytman Russian Blog Index Document"
 #attr $Copyright = %(cyear)s
+#attr $alternates = (("application/atom+xml", "News [Atom 1.0]", "atom_10.xml"),
+                     ("application/rss+xml",  "News [RSS 2.0]",  "rss_20.xml")
+)
 ##
 #def body_html
-<H1>öÕÒÎÁÌ</H1>
+<h1>öÕÒÎÁÌ</h1>
 """ % {"cyear": year or 2005})
 
    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
-<H1>öÕÒÎÁÌ: %(year)s</H1>
+<h1>öÕÒÎÁÌ: %(year)s</h1>
 """ % {"year": year, "cyear": year or 2005})
 
    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
-<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],
@@ -183,23 +178,23 @@ def write_template(level, year, month, day, titles, tags=None):
 """ % 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
-<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:
@@ -211,12 +206,12 @@ 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_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:
@@ -228,13 +223,20 @@ def write_template(level, year, month, day, titles, tags=None):
 ''' % (lead, href, title))
 
    if level == 0:
+      new_text.append("""
+<hr>
+
+<p class="head">îÏ×ÏÓÔÅ×ÁÑ ÌÅÎÔÁ × ÆÏÒÍÁÔÁÈ
+<A HREF="atom_10.xml">Atom 1.0 <img src="../../Graphics/atom_10.jpg" border=0></A>
+É <A HREF="rss_20.xml">RSS 2.0 <img src="../../Graphics/rss_20.jpg" border=0></A>.
+</p>
+""")
+
       years = {}
       for year, month, day, file, title, lead in save_titles:
          years[year] = True
       new_text.append('''
-<hr>
-
-<p class="noindent"><a href="tags/">ôÅÇÉ</a>:
+<p class="head"><a href="tags/">ôÅÇÉ</a>:
 ''')
       first_tag = True
       for count, tag, links in all_tags:
@@ -247,11 +249,14 @@ def write_template(level, year, month, day, titles, tags=None):
 </p>
 ''')
 
+      max_year = int(sorted(years.keys())[-1])
+      years = range(2005, max_year+1)
+
       new_text.append('''
-<p class="noindent">ðÏ ÇÏÄÁÍ:
+<p class="head">ðÏ ÇÏÄÁÍ:
 ''')
       first_year = True
-      for year in sorted(years.keys()):
+      for year in years:
          if first_year:
             first_year = False
          else:
@@ -261,6 +266,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)
@@ -269,8 +279,9 @@ $phd_pp_ru.respond(self)
    write_if_changed(index_name, ''.join(new_text))
 
 
-all_titles = []
 all_tags = {}
+all_titles = []
+all_titles_tags = []
 
 for year in sorted(years.keys()):
    year_titles = []
@@ -284,6 +295,7 @@ for year in sorted(years.keys()):
             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)
@@ -298,8 +310,17 @@ for year in sorted(years.keys()):
       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()
+all_tags.sort(by_count_rev_tag_link)
 
 write_template(0, year, month, day, all_titles[-20:], all_tags)
 
@@ -307,12 +328,12 @@ new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
 #extends phd_pp_ru
 #implements respond
-#attr $Title = "Oleg BroytMann's blog: tags"
-#attr $Description = "BroytMann Russian Blog Tags Index Document"
+#attr $Title = "Oleg Broytman's blog: tags"
+#attr $Description = "Broytman Russian Blog Tags Index Document"
 #attr $Copyright = 2006
 ##
 #def body_html
-<H1>ôÅÇÉ</H1>
+<h1>ôÅÇÉ</h1>
 
 <p class="head">
 <dl>
@@ -327,12 +348,12 @@ for count, tag, links in all_tags:
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
 #extends phd_pp_ru
 #implements respond
-#attr $Title = "Oleg BroytMann's blog: tag %s"
-#attr $Description = "BroytMann Russian Blog Tag %s Index Document"
+#attr $Title = "Oleg Broytman's blog: tag %s"
+#attr $Description = "Broytman Russian Blog Tag %s Index Document"
 #attr $Copyright = 2006
 ##
 #def body_html
-<H1>%s</H1>
+<h1>%s</h1>
 
 <p class="head">
 <ul>
@@ -359,7 +380,7 @@ for count, tag, links in all_tags:
 #end def
 $phd_pp_ru.respond(self)
 """)
-   write_if_changed(os.path.join("tags", tag+".tmpl"), ''.join(tag_text))
+   write_if_changed(os.path.join(blog_root, "tags", tag+".tmpl"), ''.join(tag_text))
 
 new_text.append("""\
 </dl>
@@ -367,4 +388,50 @@ new_text.append("""\
 #end def
 $phd_pp_ru.respond(self)
 """)
-write_if_changed(os.path.join("tags", "index.tmpl"), ''.join(new_text))
+write_if_changed(os.path.join(blog_root, "tags", "index.tmpl"), ''.join(new_text))
+
+
+from atom_10 import atom_10
+from rss_20 import rss_20
+from news import NewsItem
+
+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]:
+   year, month, day, file, title, lead, tags = item
+   if lead:
+      lead = lead + ' '
+   else:
+      lead = ''
+   item = NewsItem(
+      "%s-%s-%s" % (year, month, day),
+      "%s%s" % (lead, title),
+      "%s/%s/%s/%s" % (year, month, day, file)
+   )
+   items.append(item)
+   item.baseURL = baseURL
+   item.categoryList = tags
+
+namespace = {
+   "title": "Oleg Broytman's blog",
+   "baseURL": baseURL,
+   "indexFile": "",
+   "description": "",
+   "lang": "ru",
+   "author": "Oleg Broytman",
+   "email": "phd@phd.pp.ru",
+   "generator": os.path.basename(sys.argv[0]),
+   "posts": items,
+}
+
+# For english dates
+locale.setlocale(locale.LC_TIME, 'C')
+
+atom_tmpl = str(atom_10(searchList=[namespace]))
+write_if_changed(os.path.join(blog_root, "atom_10.xml"), atom_tmpl)
+rss_tmpl = str(rss_20(searchList=[namespace]))
+write_if_changed(os.path.join(blog_root, "rss_20.xml"), rss_tmpl)