Adapted to CheetahTemplate 2.4+ - it's all unicode internally

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@140 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/phd.py b/phd.py
index 529f87a09fa3275d090435c72d773e7ffde2ea5a..ed53e83ab5d2ef4acaed3fde5b86e6e4d7321b7c 100644 (file)
--- a/phd.py
+++ b/phd.py
@@ -109,4 +109,4 @@ class phd(Template):
       return "http://www.google.ru/search?hl=ru&ie=utf-8&oe=utf-8&q=%s" % quote_string(query)
 
 def quote_string(s, to_encoding="utf-8", ext_safe=''):
-   return urllib.quote(unicode(s, "koi8-r").encode(to_encoding), '/' + ext_safe)
+   return urllib.quote(unicode(s, "utf-8").encode(to_encoding), '/' + ext_safe)

diff --git a/phd_site.tmpl b/phd_site.tmpl
index 075f8d71671cd029d4890b60c0916cfd94280c78..6da679aa1a9311ec8bd7662f8e9722f36b3a92c3 100644 (file)
--- a/phd_site.tmpl
+++ b/phd_site.tmpl
@@ -14,7 +14,7 @@
 #attr $Refresh = None
 #import time
 #attr $last_modified_en = time.strftime("%a, %d %b %Y %T GMT", time.gmtime())
-#attr $last_modified_ru = time.strftime("%d.%m.%Y в %T", time.localtime())
+#attr $local_time = time.localtime()
 #attr $styles = None
 #attr $alternates = None
 #attr $Tag = ()
@@ -135,10 +135,11 @@ $link_tag($tag)
 #end if
 #if $path.startswith("/Russian/")
 <p class="head" style="font-size: 60%">Эта страница <a href="http://phdru.name$path">http://phdru.name$path</a>
-была сгенерирована $last_modified_ru из шаблона CheetahTemplate <a href="$_fileBaseName">$_fileBaseName</a>;
+была сгенерирована $time.strftime("%d.%m.%Y", $local_time) в $time.strftime("%T", $local_time) из шаблона CheetahTemplate
+<a href="$_fileBaseName">$_fileBaseName</a>;
 <a href="${root}Russian/free.html">Некоторые права зарезервированы</a>.
-Вы можете узнать <a href="${root}about/">о</a> <a href="${root}about/technical.html">технических</a> аспектах этого сайта.
-</p>
+Вы можете узнать <a href="${root}about/">о</a> <a href="${root}about/technical.html">технических</a>
+аспектах этого сайта.</p>
 #else
 <p class="head" style="font-size: 60%">This is the page <a href="http://phdru.name$path">http://phdru.name$path</a>.
 It was generated on $last_modified_en from CheetahTemplate <a href="$_fileBaseName">$_fileBaseName</a>.

diff --git a/reindex_blog.py b/reindex_blog.py
index ec6adc05a227b99c1e4bda9fc1a048686dfeff64..a9ec95e749b3888942e9645ff954038a76878acc 100755 (executable)
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -49,13 +49,14 @@ for dirpath, dirs, files in os.walk(blog_root):
          continue
       fullpath = os.path.join(dirpath, file)
       template = Template(file=fullpath)
-      title_parts = template.Title.split()
+      title_parts = template.Title.decode('utf-8').encode('koi8-r').split()
       title = ' '.join(title_parts[6:])
-      lead = template.Lead
+      lead = template.Lead.decode('utf-8').encode('koi8-r')
 
       tags = template.Tag
       if isinstance(tags, basestring):
          tags = (tags,)
+      tags = [tag.decode('utf-8').encode('koi8-r') for tag in tags]
 
       if title:
          key = year, month, day = tuple(dirpath[len(blog_root):].split(os.sep)[1:])
@@ -79,7 +80,10 @@ for dirpath, dirs, files in os.walk(blog_root):
 
          file = file[:-len("tmpl")] + "html"
          key = (year, month, day, file)
-         bodies[key] = template.body()
+         body = template.body()
+         if isinstance(body, unicode):
+            body = body.encode('koi8-r')
+         bodies[key] = body
 
 # Need to save the blog?
 if blog <> old_blog:
@@ -521,6 +525,8 @@ else:
 items = []
 for item in tuple(reversed(all_titles_tags))[:10]:
    year, month, day, file, title, lead, tags = item
+   lead = lead.decode('koi8-r').encode('utf-8')
+   title = title.decode('koi8-r').encode('utf-8')
    url_path = "%s/%s/%s/%s" % (year, month, day, file)
    item = NewsItem(
       "%s-%s-%s" % (year, month, day),
@@ -531,6 +537,7 @@ for item in tuple(reversed(all_titles_tags))[:10]:
    item.categoryList = tags
    body = bodies[(year, month, day, file)]
    body = absolute_urls(body, baseURL + url_path)
+   body = body.decode('koi8-r').encode('utf-8')
    item.body = body
    item.excerpt = get_first_p(body)
 
@@ -549,23 +556,23 @@ namespace = {
 # For english dates
 locale.setlocale(locale.LC_TIME, 'C')
 
-atom_tmpl = str(atom_10(searchList=[namespace]))
+atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r')
 write_if_changed(os.path.join(blog_root, "atom_10.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
+rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r')
 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]))
+atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r')
 write_if_changed(os.path.join(blog_root, "atom_10_titles.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
+rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r')
 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]))
+atom_tmpl = unicode(atom_10(searchList=[namespace])).encode('koi8-r')
 write_if_changed(os.path.join(blog_root, "atom_10_full.xml"), atom_tmpl)
-rss_tmpl = str(rss_20(searchList=[namespace]))
+rss_tmpl = unicode(rss_20(searchList=[namespace])).encode('koi8-r')
 write_if_changed(os.path.join(blog_root, "rss_20_full.xml"), rss_tmpl)