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

diff --git a/reindex_blog.py b/reindex_blog.py
index ac22002..291e182 100755
--- a/reindex_blog.py
+++ b/reindex_blog.py
@@ -5,30 +5,12 @@ __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2006-2017 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
-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)]
@@ -87,10 +69,8 @@ for dirpath, dirs, files in os.walk(blog_root):
          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
 
@@ -545,9 +525,11 @@ from rss_20 import rss_20
 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]: