X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=fd82c1839111ae59ddcd7a7e86eace33d7b9a715;hb=c6eb1e00be821ab12e0edaa622e75eff1ec8abd2;hp=92a02272ea79c60a9f79b0ae21fe8733d6fa47f2;hpb=6d775fb85dad6e10928e0e418645124a804a4275;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index 92a0227..fd82c18 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -5,7 +5,7 @@ __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
 __author__ = "Oleg Broytman <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2006 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
 
 
 import sys, os
@@ -39,6 +39,11 @@ else:
 blog = {}
 years = {}
 
+# excerpts nd bodies are dictionaries mapping file => excerpt/body
+
+excerpts = {}
+bodies = {}
+
 # Walk the directory recursively
 for dirpath, dirs, files in os.walk(blog_root):
    d = os.path.basename(dirpath)
@@ -77,6 +82,10 @@ for dirpath, dirs, files in os.walk(blog_root):
 
          if day not in days: days.append(day)
 
+         file = file[:-len("tmpl")] + "html"
+         key = (year, month, day, file)
+         excerpts[key] = template.get_first_p()
+         bodies[key] = template.Body
 
 # Need to save the blog?
 if blog <> old_blog:
@@ -130,8 +139,12 @@ def write_template(level, year, month, day, titles, tags=None):
 #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")
+#attr $alternates = (("îÏ×ÏÓÔÉ [Atom 1.0] ÔÏÌØËÏ ÚÁÇÏÌÏ×ËÉ", "application/atom+xml", "atom_10_titles.xml"),
+                     ("îÏ×ÏÓÔÉ [Atom 1.0]", "application/atom+xml", "atom_10.xml"),
+                     ("îÏ×ÏÓÔÉ [Atom 1.0] ÐÏÌÎÙÅ ÔÅËÓÔÙ", "application/atom+xml", "atom_10_full.xml"),
+                     ("îÏ×ÏÓÔÉ [RSS 2.0] ÔÏÌØËÏ ÚÁÇÏÌÏ×ËÉ",  "application/rss+xml",  "rss_20_titles.xml"),
+                     ("îÏ×ÏÓÔÉ [RSS 2.0]",  "application/rss+xml",  "rss_20.xml"),
+                     ("îÏ×ÏÓÔÉ [RSS 2.0] ÐÏÌÎÙÅ ÔÅËÓÔÙ",  "application/rss+xml",  "rss_20_full.xml"),
 )
 ##
 #def body_html
@@ -167,11 +180,6 @@ def write_template(level, year, month, day, titles, tags=None):
       iday = int(day)
       imonth = int(month)
 
-      new_text.append("""\
-#attr $Next = "%s"
-""" % titles[0][3])
-
-
       if len(titles) == 1:
          new_text.append("""\
 #attr $refresh = "0; URL=%s"
@@ -227,8 +235,14 @@ def write_template(level, year, month, day, titles, tags=None):
 <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>.
+<img src="../../Graphics/atom_10.jpg" border=0>
+<A HREF="atom_10_titles.xml">Atom 1.0 ÔÏÌØËÏ ÚÁÇÏÌÏ×ËÉ</A> /
+<A HREF="atom_10.xml">Atom 1.0</A> /
+<A HREF="atom_10_full.xml">Atom 1.0 ÐÏÌÎÙÅ ÔÅËÓÔÙ</A>
+É <img src="../../Graphics/rss_20.jpg" border=0>
+<A HREF="rss_20_titles.xml">RSS 2.0 ÔÏÌØËÏ ÚÁÇÏÌÏ×ËÉ</A> /
+<A HREF="rss_20.xml">RSS 2.0</A> /
+<A HREF="rss_20_full.xml">RSS 2.0 ÐÏÌÎÙÅ ÔÅËÓÔÙ</A>.
 </p>
 """)
 
@@ -339,17 +353,49 @@ new_text = ["""\
 <dl>
 """]
 
-for count, tag, links in all_tags:
+for i, (count, tag, links) in enumerate(all_tags):
    new_text.append("""\
    <dt><a href="%s.html">%s (%d)</a></dt>
 """ % (tag, tag, count))
 
+   first = all_tags[0][1]
+   if i == 0:
+      prev = None
+   else:
+      prev = all_tags[i-1][1]
+   if i >= len(all_tags)-1:
+      next = None
+   else:
+      next = all_tags[i+1][1]
+   last = all_tags[-1][1]
+
    tag_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
 #extends phd_pp_ru
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tag %s"
 #attr $Description = "Broytman Russian Blog Tag %s Index Document"
+""" % (tag, tag)]
+
+   tag_text.append("""\
+#attr $First = "%s"
+""" % first)
+
+   if prev:
+      tag_text.append("""\
+#attr $Prev = "%s"
+""" % prev)
+
+   if next:
+      tag_text.append("""\
+#attr $Next = "%s"
+""" % next)
+
+   tag_text.append("""\
+#attr $Last = "%s"
+""" % last)
+
+   tag_text.append("""\
 #attr $Copyright = 2006
 ##
 #def body_html
@@ -357,7 +403,7 @@ for count, tag, links in all_tags:
 
 <p class="head">
 <ul>
-""" % (tag, tag, tag)]
+""" % tag)
 
    count = 0
    for year, month, day, filename, title, lead in reversed(links):
@@ -415,6 +461,8 @@ for item in tuple(reversed(all_titles_tags))[:10]:
    items.append(item)
    item.baseURL = baseURL
    item.categoryList = tags
+   item.excerpt = excerpts[(year, month, day, file)]
+   item.body = bodies[(year, month, day, file)]
 
 namespace = {
    "title": "Oleg Broytman's blog",
@@ -435,3 +483,19 @@ 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)
+
+for item in items:
+    item.excerpt = None
+
+atom_tmpl = str(atom_10(searchList=[namespace]))
+write_if_changed(os.path.join(blog_root, "atom_10_titles.xml"), atom_tmpl)
+rss_tmpl = str(rss_20(searchList=[namespace]))
+write_if_changed(os.path.join(blog_root, "rss_20_titles.xml"), rss_tmpl)
+
+for item in items:
+    item.content = item.body
+
+atom_tmpl = str(atom_10(searchList=[namespace]))
+write_if_changed(os.path.join(blog_root, "atom_10_full.xml"), atom_tmpl)
+rss_tmpl = str(rss_20(searchList=[namespace]))
+write_if_changed(os.path.join(blog_root, "rss_20_full.xml"), rss_tmpl)