# -*- coding: koi8-r -*-
__author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2006-2024 PhiloSoft Design"
import sys, os
-from Cheetah.compat import string_type
-
-blog_data_root = sys.argv[1]
-blog_root = sys.argv[2]
-blog_filename = os.path.join(blog_data_root, "blog_dict.pickle")
-
try:
- import cPickle as pickle
+ from urllib.parse import quote
except ImportError:
- import pickle
+ from urllib import quote
from Cheetah.Template import Template
+from Cheetah.compat import string_type
+from blog_db import blog_root, load_blog, save_blog
-# Load old blog
-
-try:
- blog_file = open(blog_filename, "rb")
-except IOError:
- old_blog = {}
-else:
- old_blog = pickle.load(blog_file)
- blog_file.close()
-
+old_blog = load_blog()
# blog is a dictionary mapping
# (year, month, day) => [list of (file, title, lead, tags)]
bodies[key] = body
# Need to save the blog?
-if blog <> old_blog:
- blog_file = open(blog_filename, "wb")
- pickle.dump(blog, blog_file, pickle.HIGHEST_PROTOCOL)
- blog_file.close()
+if blog != old_blog:
+ save_blog(blog)
# Localized month names
from news import write_if_changed
+def encode_tag(tag):
+ return quote(tag.replace(' ', '_'))
def write_template(level, year, month, day, titles, tags=None):
path = [blog_root]
first_tag = False
else:
new_text.append(' - ')
- new_text.append("""<a href="tags/%s.html">%s (%d)</a>""" % (tag, tag, count))
+ new_text.append("""<a href="tags/%s.html">%s (%d)</a>""" % (
+ encode_tag(tag), tag, count))
new_text.append('''
</p>
''')
for i, (count, tag, links) in enumerate(all_tags):
new_text.append("""\
<dt><a href="%s.html">%s (%d)</a></dt>
-""" % (tag, tag, count))
+""" % (encode_tag(tag), tag, count))
first = all_tags[0][1]
if i == 0:
#end def
$phd_site.respond(self)
""")
- write_if_changed(os.path.join(blog_root, "tags", tag+".tmpl"), ''.join(tag_text))
+ write_if_changed(os.path.join(blog_root, "tags",
+ tag.replace(' ', '_') + ".tmpl"),
+ ''.join(tag_text))
new_text.append("""\
</dl>
self.accumulator += '<a'
for attrname, value in attrs:
value = cgi.escape(value, True)
+ if isinstance(value, unicode):
+ value = value.encode('koi8-r')
if attrname == 'href':
self.accumulator += ' href="%s"' % urljoin(self.base, value)
else:
from news import NewsItem
if blog_root:
- baseURL = "http://phdru.name/%s/" % blog_root
+ blog_root_url = blog_root[
+ blog_root.find('/htdocs/phdru.name/') + len('/htdocs/phdru.name/'):]
+ baseURL = "https://phdru.name/%s/" % blog_root_url
else:
- baseURL = "http://phdru.name/"
+ baseURL = "https://phdru.name/"
items = []
for item in tuple(reversed(all_titles_tags))[:10]:
url_path)
items.append(item)
item.baseURL = baseURL
- item.categoryList = tags
+ item.categoryList = [t.decode('koi8-r').encode('utf-8') for t in tags]
body = bodies[(year, month, day, file)]
body = absolute_urls(body, baseURL + url_path)
+ try:
+ body.decode('utf-8')
+ except UnicodeDecodeError:
+ body = body.decode('koi8-r').encode('utf-8')
item.body = body
- item.excerpt = get_first_p(body)
+ excerpt = get_first_p(body)
+ try:
+ excerpt.decode('utf-8')
+ except UnicodeDecodeError:
+ excerpt = excerpt.decode('koi8-r').encode('utf-8')
+ item.excerpt = excerpt
namespace = {
"title": "Oleg Broytman's blog",