From 49496e1c2eb562ba5c7178d46773f479a8096e1b Mon Sep 17 00:00:00 2001
From: Noah Petherbridge <root@kirsle.net>
Date: Sun, 6 Apr 2014 18:36:26 -0700
Subject: [PATCH] Enhancements to the Siikir migrator

---
 scripts/siikir-blog-migrate.py | 46 ++++++++++++++++++++++++++++------
 site/www/.dummy                |  0
 2 files changed, 39 insertions(+), 7 deletions(-)
 delete mode 100644 site/www/.dummy

diff --git a/scripts/siikir-blog-migrate.py b/scripts/siikir-blog-migrate.py
index a639d4c..adff404 100644
--- a/scripts/siikir-blog-migrate.py
+++ b/scripts/siikir-blog-migrate.py
@@ -30,8 +30,9 @@ def main():
         sys.exit(1)
 
     convert_index()
-    #convert_tags()
     convert_posts()
+    convert_comments()
+    convert_subscriptions()
 
 
 def convert_index():
@@ -51,12 +52,6 @@ def convert_index():
     JsonDB.commit("blog/index", new)
 
 
-def convert_tags():
-    print "Converting tag index"
-    index = json_get("blog/tags/1.json")
-    JsonDB.commit("blog/tags", index)
-
-
 def convert_posts():
     print "Converting blog entries..."
 
@@ -77,6 +72,43 @@ def convert_posts():
         JsonDB.commit("blog/entries/{}".format(post_id), post)
 
 
+def convert_comments():
+    print "Converting comments..."
+
+    for name in glob.glob(os.path.join(siikir, "comments/1/*.json")):
+        name = name.split("/")[-1]
+        if name.startswith("photos-"): continue
+        data = json_get("comments/1/{}".format(name))
+
+        thread = name[:len(name)-5]
+
+        # Enforce data types.
+        for cid in data:
+            data[cid]["time"] = int(data[cid]["time"])
+            data[cid]["uid"] = int(data[cid]["uid"])
+
+        print "*", thread
+        JsonDB.commit("comments/threads/{}".format(thread), data)
+
+
+def convert_subscriptions():
+    print "Converting subscriptions..."
+
+    for name in glob.glob(os.path.join(siikir, "subscribers/1/*.json")):
+        name = name.split("/")[-1]
+        if name.startswith("photos-"): continue
+        data = json_get("subscribers/1/{}".format(name))
+
+        thread = name[:len(name)-5]
+
+        # Enforce data types.
+        for email in data:
+            data[email] = int(data[email])
+
+        print "*", thread
+        JsonDB.commit("comments/subscribers/{}".format(thread), data)
+
+
 def json_get(document):
     fh = codecs.open(os.path.join(siikir, document), 'r', 'utf-8')
     text = fh.read()
diff --git a/site/www/.dummy b/site/www/.dummy
deleted file mode 100644
index e69de29..0000000