Extended URL regexp. Enhanced wikipedia quoting.

[phdru.name/phdru.name.git] / make-news.py

diff --git a/make-news.py b/make-news.py
index a654c26720b50253c1475dcd3fe17a6fdb65db8e..0b60127fc1c84adf38c7412d653503c76fad5e4d 100755 (executable)
--- a/make-news.py
+++ b/make-news.py
@@ -1,4 +1,5 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
+# -*- coding: koi8-r -*-
 
 __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
@@ -28,6 +29,27 @@ for item in news_items:
 new_text.append("""\
    </ul>
 </p>
+
+<p class="head">
+""")
+
+if lang == "en":
+   new_text.append("""\
+News are also available in
+<A HREF="atom_10.xml">Atom 1.0 <img src="Graphics/atom_10.jpg" border=0></A>
+and <A HREF="rss_20.xml">RSS 2.0 <img src="Graphics/rss_20.jpg" border=0></A>
+formats.
+""")
+
+elif lang == "ru":
+   new_text.append("""\
+Новостевая лента в форматах
+<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>.
+""")
+
+new_text.append("""\
+</p>
 #end def
 $phd_pp_ru.respond(self)
 """)
@@ -40,17 +62,32 @@ from rss_20 import rss_20
 
 namespace = {
    "title": "Oleg Broytmann's Personal Page - News",
-   "baseURL": "http://phd.pp.ru",
+   "baseURL": "http://phd.pp.ru/",
+   "indexFile": "news.html",
    "description": "",
    "lang": lang,
    "author": "Oleg Broytmann",
    "email": "phd@phd.pp.ru",
+   "generator": os.path.basename(sys.argv[0]),
    "posts": news_items,
 }
 
 if lang == "ru":
    namespace["title"] = "Oleg Broytmann's Personal Page - Russian News"
-   namespace["baseURL"] = "http://phd.pp.ru/Russian"
+   namespace["baseURL"] = baseURL = "http://phd.pp.ru/Russian/"
+   for item in news_items:
+      item.baseURL = baseURL
+
+for item in news_items:
+   href_parts = item.rel_link.split('/')
+   if href_parts:
+      if href_parts[0] == '.':
+         category = "Home page"
+      elif href_parts[0] == "..":
+         category = href_parts[1]
+      else:
+         category = href_parts[0]
+      if category: item.categoryList = [category]
 
 atom_tmpl = str(atom_10(searchList=[namespace]))
 write_if_changed(os.path.join(root, "atom_10.xml"), atom_tmpl)