X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=b5ba18ef8f38229c39f320d91fc0398db92e044a;hb=3247e359c59bf0fd16b2eb1c6ded372a78aa1593;hp=4451baa740e25f20b60be92b3699fc69e4ca2413;hpb=b4c1e4de6a50d04c81519eaf3dc440cca1e38da4;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 4451baa..b5ba18e 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -10,6 +10,9 @@ __copyright__ = "Copyright (C) 2006 PhiloSoft Design"
 
 import sys, os
 
+blog_filename = sys.argv[1]
+blog_root = sys.argv[2]
+
 try:
    import cPickle as pickle
 except ImportError:
@@ -20,7 +23,6 @@ from Cheetah.Template import Template
 
 # Load old blog
 
-blog_filename = sys.argv[1]
 try:
    blog_file = open(blog_filename, "rb")
 except IOError:
@@ -37,7 +39,7 @@ 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
@@ -56,7 +58,7 @@ for dirpath, dirs, files in os.walk(os.curdir):
          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:
@@ -100,24 +102,11 @@ months_names_ru0 = ['', "
    "ÉÀÌØ", "Á×ÇÕÓÔ", "ÓÅÎÔÑÂÒØ", "ÏËÔÑÂÒØ", "ÎÏÑÂÒØ", "ÄÅËÁÂÒØ"
 ]
 
+from news import write_if_changed
 
-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()
 
-
-def write_template(level, year, month, day, titles):
-   path = []
+def write_template(level, year, month, day, titles, tags=None):
+   path = [blog_root]
    if level >= 1:
       path.append(year)
    if level >= 2:
@@ -138,6 +127,9 @@ def write_template(level, year, month, day, titles):
 #attr $Title = "Oleg BroytMann's blog"
 #attr $Description = "BroytMann 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>
@@ -228,15 +220,36 @@ def write_template(level, year, month, day, titles):
 ''' % (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
-      first_year = True
       new_text.append('''
-<hr>
+<p class="head"><a href="tags/">ôÅÇÉ</a>:
+''')
+      first_tag = True
+      for count, tag, links in all_tags:
+         if first_tag:
+            first_tag = False
+         else:
+            new_text.append(' - ')
+         new_text.append("""<a href="tags/%s.html">%s (%d)</a>""" % (tag, tag, count))
+      new_text.append('''
+</p>
+''')
 
-<p class="years">
+      new_text.append('''
+<p class="head">ðÏ ÇÏÄÁÍ:
 ''')
+      first_year = True
       for year in sorted(years.keys()):
          if first_year:
             first_year = False
@@ -255,8 +268,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 = []
@@ -270,6 +284,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)
@@ -283,11 +298,12 @@ for year in sorted(years.keys()):
          write_template(3, year, month, day, day_titles)
       write_template(2, year, month, day, month_titles)
    write_template(1, year, month, day, year_titles)
-write_template(0, year, month, day, all_titles[-20:])
 
 all_tags = [(len(links), tag, links) for (tag, links) in all_tags.items()]
 all_tags.sort()
 
+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
@@ -344,7 +360,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>
@@ -352,4 +368,46 @@ 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
+
+baseURL = "http://phd.pp.ru/Russian/blog/"
+
+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 Broytmann's blog",
+   "baseURL": baseURL,
+   "indexFile": "",
+   "description": "",
+   "lang": "ru",
+   "author": "Oleg Broytmann",
+   "email": "phd@phd.pp.ru",
+   "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)