X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=reindex_blog.py;h=291e182eee8ddffff655114f347e50b9da54b97a;hb=c89b746df98f09e80169480d13ec452c2a919f7e;hp=beba7c12823ae151a8f5de6619c9776758b9d713;hpb=6922322a54539e39cbba59653868fa9d749fa274;p=phdru.name%2Fphdru.name.git

diff --git a/reindex_blog.py b/reindex_blog.py
index beba7c1..291e182 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -1,37 +1,16 @@
 #! /usr/bin/env python
 # -*- coding: koi8-r -*-
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
-__copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
-
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
 
 import sys, os
-
-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
-except ImportError:
-   import pickle
-
 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)]
@@ -53,13 +32,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):
+      if isinstance(tags, string_type):
          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:])
@@ -83,26 +63,27 @@ 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:
-   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
 
 import locale
 locale.setlocale(locale.LC_ALL, "ru_RU.KOI8-R")
-from calendar import _localized_day, _localized_month
+from calendar import _localized_month
 
 locale.setlocale(locale.LC_TIME, 'C')
 months_names_en = list(_localized_month('%B'))
 months_abbrs_en = list(_localized_month('%b'))
 
 locale.setlocale(locale.LC_TIME, "ru_RU.KOI8-R")
-#months_names_ru = list(_localized_month('%B'))
+# months_names_ru = list(_localized_month('%B'))
 
 months_names_ru = ['', "ÑÎ×ÁÒÑ", "ÆÅ×ÒÁÌÑ", "ÍÁÒÔÁ", "ÁÐÒÅÌÑ", "ÍÁÑ", "ÉÀÎÑ",
    "ÉÀÌÑ", "Á×ÇÕÓÔÁ", "ÓÅÎÔÑÂÒÑ", "ÏËÔÑÂÒÑ", "ÎÏÑÂÒÑ", "ÄÅËÁÂÒÑ"
@@ -128,7 +109,8 @@ def write_template(level, year, month, day, titles, tags=None):
 
    new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#encoding koi8-r
+#extends phd_site
 #implements respond
 """]
 
@@ -180,7 +162,7 @@ def write_template(level, year, month, day, titles, tags=None):
 
       if len(titles) == 1:
          new_text.append("""\
-#attr $refresh = "0; URL=%s"
+#attr $Refresh = "0; URL=%s"
 """ % titles[0][3])
 
       new_text.append("""\
@@ -212,7 +194,7 @@ def write_template(level, year, month, day, titles, tags=None):
       href.append(file)
       href = '/'.join(href)
       if day[0] == '0': day = day[1:]
-      if save_date <> (year, month, day):
+      if save_date != (year, month, day):
          if level == 0:
             new_text.append('\n<h2>%s %s %s</h2>' % (day, months_names_ru[int(month)], year))
          else:
@@ -258,18 +240,25 @@ def write_template(level, year, month, day, titles, tags=None):
 ''')
 
       max_year = int(sorted(years.keys())[-1])
-      years = range(2005, max_year+1)
+      years = range(max_year, 2005, -1)
 
       new_text.append('''
 <p class="head">ðÏ ÇÏÄÁÍ:
 ''')
+
+      year_counts = {}
+      for year, month, day, file, title, lead in all_titles:
+         year_counts[year] = 0
+      for year, month, day, file, title, lead in all_titles:
+         year_counts[year] += 1
+
       first_year = True
       for year in years:
          if first_year:
             first_year = False
          else:
             new_text.append(' - ')
-         new_text.append('<a href="%s/">%s</a>' % (year, year))
+         new_text.append('<a href="%s/">%s (%d)</a>' % (year, year, year_counts[str(year)]))
       new_text.append('''
 </p>
 ''')
@@ -281,7 +270,7 @@ def write_template(level, year, month, day, titles, tags=None):
 
    new_text.append("""\
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 
    write_if_changed(index_name, ''.join(new_text))
@@ -334,7 +323,8 @@ write_template(0, year, month, day, all_titles[-20:], all_tags)
 
 new_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#encoding koi8-r
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tags"
 #attr $Description = "Broytman Russian Blog Tags Index Document"
@@ -343,7 +333,29 @@ new_text = ["""\
 #def body_html
 <h1>ôÅÇÉ</h1>
 
-<p class="head">
+<p class="head small">
+æÏÒÍÁ ÐÏÉÓËÁ ÐÏÚ×ÏÌÑÅÔ ÉÓËÁÔØ ÓÏÏÂÝÅÎÉÑ × ÂÌÏÇÅ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÅ ×ÙÒÁÖÅÎÉÀ.
+óÉÎÔÁËÓÉÓ ×ÙÒÁÖÅÎÉÑ:</p>
+<ul class="small">
+    <li>ôÅÇ - ÅÓÌÉ ÔÁËÏÊ ÔÅÇ ÓÕÝÅÓÔ×ÕÅÔ, ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÕ ÔÅÇÁ.</li>
+    <li>ïÐÅÒÁÔÏÒ '!' (NOT, not) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÎÅÔ ÜÔÏÇÏ ÔÅÇÁ.</li>
+    <li>ïÐÅÒÁÔÏÒ '&amp;' (AND, and) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÏÂÁ ÔÅÇÁ.</li>
+    <li>ïÐÅÒÁÔÏÒ '|' (OR, or) - ÉÝÅÔ ÚÁÐÉÓÉ, × ËÏÔÏÒÙÈ ÅÓÔØ ÌÀÂÙÅ ÉÚ ÔÅÇÏ×.</li>
+    <li>ðÒÉÏÒÉÔÅÔ ÏÐÅÒÁÃÉÊ ÓÔÁÎÄÁÒÔÎÙÊ: NOT &gt; AND &gt; OR. óËÏÂËÉ '()' ÐÏÚ×ÏÌÑÀÔ ÏÂßÅÄÉÎÑÔØ ×ÙÒÁÖÅÎÉÑ.</li>
+</ul>
+<p class="small">
+ðÒÉÍÅÒÙ ×ÙÒÁÖÅÎÉÊ: linux - ÐÒÏÉÚÏÊÄ£Ô ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ
+ÎÁ ÓÔÒÁÎÉÃÕ linux.html; linux&amp;!audio - ÉÓËÁÔØ ÚÁÐÉÓÉ × ËÏÔÏÒÙÈ ÅÓÔØ ÔÅÇ
+linux É ÎÅÔ ÔÅÇÁ audio; linux and not audio - ÔÏ ÖÅ ÓÁÍÏÅ.
+</p>
+
+<center>
+<form method=GET action="../../../cgi-bin/blog-ru/search-tags/search-tags.py">
+    <input type=text name=q>
+    <input type=submit name=submit value="éÓËÁÔØ">
+</form>
+</center>
+
 <dl>
 """]
 
@@ -365,7 +377,8 @@ for i, (count, tag, links) in enumerate(all_tags):
 
    tag_text = ["""\
 ## THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-#extends phd_pp_ru
+#encoding koi8-r
+#extends phd_site
 #implements respond
 #attr $Title = "Oleg Broytman's blog: tag %s"
 #attr $Description = "Broytman Russian Blog Tag %s Index Document"
@@ -395,7 +408,6 @@ for i, (count, tag, links) in enumerate(all_tags):
 #def body_html
 <h1>%s</h1>
 
-<p class="head">
 <ul>
 """ % tag)
 
@@ -412,17 +424,15 @@ for i, (count, tag, links) in enumerate(all_tags):
 
    tag_text.append("""\
 </ul>
-</p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
    write_if_changed(os.path.join(blog_root, "tags", tag+".tmpl"), ''.join(tag_text))
 
 new_text.append("""\
 </dl>
-</p>
 #end def
-$phd_pp_ru.respond(self)
+$phd_site.respond(self)
 """)
 write_if_changed(os.path.join(blog_root, "tags", "index.tmpl"), ''.join(new_text))
 
@@ -481,6 +491,19 @@ class AbsURLHTMLParser(_HTMLParser):
    def end_a(self):
       self.accumulator += '</a>'
 
+   def start_img(self, attrs):
+      self.accumulator += '<img'
+      for attrname, value in attrs:
+         value = cgi.escape(value, True)
+         if attrname == 'src':
+            self.accumulator += ' src="%s"' % urljoin(self.base, value)
+         else:
+            self.accumulator += ' %s="%s"' % (attrname, value)
+      self.accumulator += '>'
+
+   def end_img(self):
+       pass
+
 def absolute_urls(body, base):
    parser = AbsURLHTMLParser(base)
 
@@ -502,13 +525,17 @@ from rss_20 import rss_20
 from news import NewsItem
 
 if blog_root:
-   baseURL = "http://phd.pp.ru/%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://phd.pp.ru/"
+   baseURL = "https://phdru.name/"
 
 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),
@@ -529,7 +556,7 @@ namespace = {
    "description": "",
    "lang": "ru",
    "author": "Oleg Broytman",
-   "email": "phd@phd.pp.ru",
+   "email": "phd@phdru.name",
    "generator": os.path.basename(sys.argv[0]),
    "posts": items,
 }
@@ -537,23 +564,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)