X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=make-news.py;h=35cf42d25cbf697f7087064454e384f1371d46e0;hb=d9ba21a451e4ffba47c0d5faf0d1a0c5cf4d6487;hp=19ed93e2710b046c49867442bdbe0f0d63c0847e;hpb=42465be8abac2fdb32c939bc7e5ad0fbca5df2f8;p=phdru.name%2Fphdru.name.git
diff --git a/make-news.py b/make-news.py
index 19ed93e..35cf42d 100755
--- a/make-news.py
+++ b/make-news.py
@@ -1,16 +1,15 @@
#! /usr/bin/env python
# -*- coding: koi8-r -*-
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
__author__ = "Oleg Broytman
-
""")
if lang == "en":
- new_text.append("""\
+ new_text.append("""\
News are also available in
Atom 1.0
and RSS 2.0
@@ -42,7 +40,7 @@ formats.
""")
elif lang == "ru":
- new_text.append("""\
+ new_text.append("""\
îÏ×ÏÓÔÅ×ÁÑ ÌÅÎÔÁ × ÆÏÒÍÁÔÁÈ
Atom 1.0
É RSS 2.0
.
@@ -57,39 +55,48 @@ $phd_site.respond(self)
write_if_changed(os.path.join(root, "news.tmpl"), ''.join(new_text))
-from atom_10 import atom_10
-from rss_20 import rss_20
-
namespace = {
- "title": "Oleg Broytman's Personal Page - News",
- "baseURL": "http://phdru.name/",
- "indexFile": "news.html",
- "description": "",
- "lang": lang,
- "author": "Oleg Broytman",
- "email": "phd@phdru.name",
- "generator": os.path.basename(sys.argv[0]),
- "posts": news_items,
+ "title": "Oleg Broytman's Personal Page - News",
+ "baseURL": "https://phdru.name/",
+ "indexFile": "news.html",
+ "description": "",
+ "lang": lang,
+ "author": "Oleg Broytman",
+ "email": "phd@phdru.name",
+ "generator": os.path.basename(sys.argv[0]),
+ "posts": news_items,
}
if lang == "ru":
- namespace["title"] = "Oleg Broytman's Personal Page - Russian News"
- namespace["baseURL"] = baseURL = "http://phdru.name/Russian/"
- for item in news_items:
- item.baseURL = baseURL
+ namespace["title"] = "Oleg Broytman's Personal Page - Russian News"
+ namespace["baseURL"] = baseURL = "https://phdru.name/Russian/"
+ for item in news_items:
+ item.baseURL = baseURL
+ if isinstance(item.title, bytes):
+ item.title = item.title.decode('koi8-r').encode('utf-8')
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]))
+ 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 = atom_10(searchList=[namespace])
+rss_tmpl = rss_20(searchList=[namespace])
+
+try:
+ unicode
+except NameError: # PY3
+ atom_tmpl = str(atom_tmpl)
+ rss_tmpl = str(rss_tmpl)
+else:
+ atom_tmpl = unicode(atom_tmpl).encode('koi8-r')
+ rss_tmpl = unicode(rss_tmpl).encode('koi8-r')
+
write_if_changed(os.path.join(root, "atom_10.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
write_if_changed(os.path.join(root, "rss_20.xml"), rss_tmpl)