From f91ee80046f68caaab4c99adbd120d9cdc071780 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 13:48:32 +0000
Subject: [PATCH 01/12] Added script to convert to Wordpress XML.

---
 src/convert_to_wp.py | 387 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 387 insertions(+)
 create mode 100644 src/convert_to_wp.py

diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
new file mode 100644
index 0000000..d8a625a
--- /dev/null
+++ b/src/convert_to_wp.py
@@ -0,0 +1,387 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This script converts Israblog html (complete) backup files to an XML file
+# Originally written by Eliram (@eliramk)
+# Updated for wordpress by Shir (@shirblc)
+
+import logging
+import re
+import os
+import datetime
+import json
+from convert import (
+                    get_post_enum,
+                    get_comment_enum,
+                    sanitize_text,
+                    get_backup_files
+                    )
+
+BACKUP_FOLDER = './isra'
+TEMPLATE_FILE = 'template.html'
+OUTPUT_FORMAT = 'xml'
+OUTPUT_FILENAME = os.path.join(BACKUP_FOLDER, 'blog.' + OUTPUT_FORMAT)
+
+STATE_OUT = 1
+STATE_POST = 2
+STATE_COMMENT = 3
+
+RE_COMMENT = '<p class="MsoNormal" dir="RTL" lang="HE" style="font-size:10.0pt; font-family: Arial; margin-right:([\d\.]+)in">(.*)'
+RE_POST = '<p class="MsoNormal" dir="RTL" lang="HE" style="font-size:12.0pt; font-family: Arial">'
+RE_DATE = '>(\d\d?/\d\d?/\d{1,4} \d\d?:\d\d?:\d\d?)<'
+RE_PAGE_END = '<!--xgemius|<script '
+RE_COMMENT_TS = ', (\d\d?:\d\d? \d\d?/\d\d?/\d{1,4}):<br>'
+post_enum = 0
+comment_enum = 0
+
+class BlogPost(object):
+    def __init__(self, post_id=None):
+        """
+
+        :param str post_id:
+        """
+        self.post_id = post_id or get_post_enum()  # type: int
+        self.title = None  # type: unicode
+        self.body = ''  # type: unicode
+        self.ts = None  # type: float
+        self.date_str = None  # type: str
+        self.comments = []  # type: dict(BlogComment)
+
+    def get_dict(self):
+        d = {
+            'post_id': self.post_id,
+            'title': self.title,
+            'body': self.body,
+            'ts': self.ts,
+            'date_str': self.date_str,
+            'comments_num': len(self.comments),
+            'comments': []
+        }
+        for comment in self.comments:  # type: BlogComment
+            d['comments'].append(comment.get_dict())
+        return d
+
+    def __repr__(self):
+        if OUTPUT_FORMAT == 'json':
+            return json.dumps(self.get_dict(), ensure_ascii=False, indent=4)
+        else:
+            rep = '<item>\n'
+            rep += '<title>%s</title>\n' % sanitize_text(self.title)
+            rep += '<link>https://wordpress.com/</link>\n'
+            rep += '<pubDate>%s</pubDate>\n' % self.date_str
+            rep += """<dc:creator>user</dc:creator>
+                    <guid isPermaLink="false">https://wordpress.com/</guid>
+        	        <description></description>\n"""
+            rep += '<content:encoded><![CDATA[\n%s]]></content:encoded>\n' % self.body
+            rep += """<excerpt:encoded><![CDATA[]]></excerpt:encoded>
+        	       <wp:post_id>{post_id}</wp:post_id>
+                   <wp:comment_status>open</wp:comment_status>
+               	   <wp:ping_status>open</wp:ping_status>\n""".format(post_id=self.post_id)
+            rep += '<wp:post_name>%s</wp:post_name>' % sanitize_text(self.title)
+            rep += """<wp:status>publish</wp:status>
+                    <wp:post_parent>0</wp:post_parent>
+               	    <wp:menu_order>0</wp:menu_order>
+               	    <wp:post_type>post</wp:post_type>
+               	    <wp:post_password></wp:post_password>
+               	    <wp:is_sticky>0</wp:is_sticky>\n"""
+            for comment in self.comments:
+                rep += comment.__repr__()
+            rep += '</item>\n'
+            return rep
+
+
+class BlogComment(object):
+    def __init__(self, comment_id=None):
+        """
+
+        :param str comment_id:
+        """
+        self.comment_id = comment_id or get_comment_enum()  # type: int
+        self.name = None  # type: str
+        self.email = None  # type: str
+        self.url = None  # type: str
+        self.ts = None  # type: float
+        self.date_str = None  # type: str
+        self.indent = -1  # type: float
+        self.level = -1  # type: int
+        self.parent_id = None  # type: int
+        self.post_id = None  # type: int
+        self.body = None  # type: str
+
+    def get_dict(self):
+        d = {
+            'id': self.comment_id,
+            'name': self.name,
+            'email': self.email,
+            'url': self.url,
+            'ts': self.ts,
+            'date_str': self.date_str,
+            'level': self.level,
+            'post_id': self.post_id,
+        }
+        if self.parent_id:
+            d['parent_id'] = self.parent_id
+        return d
+
+    def __repr__(self):
+        rep = '<wp:comment>\n'
+        rep += '<wp:comment_id>%s</wp:comment_id>\n' % self.comment_id
+        rep += '<wp:comment_author><![CDATA[%s]]></wp:comment_author>\n' % sanitize_text(self.name)
+        rep += '<wp:comment_author_email>%s</wp:comment_author_email>\n' % sanitize_text(self.email)
+        rep += '<wp:comment_author_url>%s</wp:comment_author_url>\n' % sanitize_text(self.url)
+        rep += '<wp:comment_author_IP></wp:comment_author_IP>\n'
+        rep += '<wp:comment_date>%s</wp:comment_date>\n' % self.date_str
+        rep += '<wp:comment_content><![CDATA[%s]]></wp:comment_content>\n' % self.body
+        rep += '<wp:comment_approved>1</wp:comment_approved>\n<wp:comment_type></wp:comment_type>\n'
+        rep += '<wp:comment_parent>{parent_id}</wp:comment_parent>\n'.format(parent_id=' parent_id="%d"' % self.parent_id if self.parent_id else 0)
+        rep += '</wp:comment>\n'
+
+        return rep
+
+
+class ParseBackupFile(object):
+    """
+    Parse the HTML
+
+    """
+
+    def __init__(self, backup_file_text):
+        """
+
+        :param list backup_file_text: a list of lines
+        """
+        self.backup_file_text = backup_file_text  # type: str
+        self.state = STATE_OUT
+        # self.previous_state = self.state
+        self.current_blog_post = None  # type: BlogPost
+        self.current_blog_comment = None  # type: BlogComment
+        self.posts = []
+        self.comments = []
+        self.internal_row_enum = 0
+        self.comment_parent_track = {}  # Keeps the latest comment for each comment level
+
+    def clear_data(self):
+        self.current_blog_post = None  # type: BlogPost
+        self.current_blog_comment = None  # type: BlogComment
+        self.internal_row_enum = 0
+        self.comment_parent_track = {}
+
+    def parse_post_header(self, row):
+        """
+        Create a new blogpost object, add data and set as current post
+        :param str row:
+        """
+        try:
+            date_str = re.search(RE_DATE, row).group(1)
+        except Exception:
+            return None
+
+        new_post = BlogPost()
+        date_array = date_str.split(' ')[0].split('/')
+        time_array = date_str.split(' ')[1].split(':')
+        date_obj = datetime.datetime(int(date_array[2]),
+                                     int(date_array[1]),
+                                     int(date_array[0]),
+                                     int(time_array[0]),
+                                     int(time_array[1]),
+                                     int(time_array[2]))
+        new_post.date_str = date_str
+        new_post.ts = (date_obj - datetime.datetime(1970, 1, 1)).total_seconds()
+        new_post.body = ''
+
+        self.current_blog_post = new_post
+        self.posts.append(new_post)
+
+    def parse_comment_header(self, row):
+        comment_header = re.search(RE_COMMENT, row)
+        new_comment = BlogComment()
+
+        new_comment.post_id = self.current_blog_post.post_id
+        new_comment.indent = float(comment_header.group(1))
+        new_comment.level = int(round(new_comment.indent * 5))
+        if new_comment.level > 0:
+            new_comment.parent_id = self.comment_parent_track.get('L%d' % (new_comment.level - 1), None)
+        self.comment_parent_track['L%d' % new_comment.level] = new_comment.comment_id
+
+        try:
+            details = comment_header.group(2).split('&nbsp;')
+        except Exception:
+            details = []
+
+        if len(details) > 0:
+            new_comment.name = details[0]
+        if len(details) > 1:
+            new_comment.email = details[1]
+        if len(details) > 2:
+            new_comment.url = details[2].lstrip('(').rstrip(')')
+
+        new_comment.body = ''
+
+        self.current_blog_comment = new_comment
+        self.comments.append(new_comment)
+        self.current_blog_post.comments.append(new_comment)
+
+    def set_state(self, new_state):
+        self.internal_row_enum = 0
+        if self.state != new_state:
+            if new_state != STATE_COMMENT:
+                self.current_blog_comment = None
+        self.state = new_state
+
+    def process_row(self, row):
+        """
+
+        :type row: str
+        """
+
+        if self.state == STATE_OUT:
+            if re.search(RE_POST, row):
+                self.parse_post_header(row)
+                self.set_state(STATE_POST)
+
+        elif self.state == STATE_POST:
+            self.internal_row_enum += 1
+            if self.internal_row_enum == 1:
+                # This is the post's title
+                if row.endswith('<br>\n'):
+                    self.current_blog_post.title = row[:-5]
+                elif row.endswith('<br>'):
+                    self.current_blog_post.title = row[:-4]
+                else:
+                    # We'll take what there is here
+                    self.current_blog_post.title = row.rstrip('<br>')
+            elif re.search(RE_COMMENT, row):
+                # a blog comment started
+                self.parse_comment_header(row)
+                self.set_state(STATE_COMMENT)
+            elif re.search(RE_PAGE_END, row):
+                self.set_state(STATE_OUT)
+            else:
+                self.current_blog_post.body += row.replace('<br>', '<br/>') + '\n'
+        elif self.state == STATE_COMMENT:
+            self.internal_row_enum += 1
+            if self.internal_row_enum == 1:
+                # This should be a timestamp
+                if re.search(RE_COMMENT_TS, row):
+                    date_str = re.search(RE_COMMENT_TS, row).group(1)
+                    self.current_blog_comment.date_str = date_str
+                    date_array = date_str.split(' ')[1].split('/')
+                    time_array = date_str.split(' ')[0].split(':')
+                    date_obj = datetime.datetime(int(date_array[2]),
+                                                 int(date_array[1]),
+                                                 int(date_array[0]),
+                                                 int(time_array[0]),
+                                                 int(time_array[1]),
+                                                 int(time_array[2]) if len(time_array) > 2 else 0)
+                    self.current_blog_comment.ts = (date_obj - datetime.datetime(1970, 1, 1)).total_seconds()
+                else:
+                    # Just add as-is
+                    self.current_blog_comment.body += row + '\n'
+            elif re.search(RE_POST, row):
+                self.parse_post_header(row)
+                self.set_state(STATE_POST)
+            elif re.search(RE_COMMENT, row):
+                # a new blog comment started
+                self.parse_comment_header(row)
+                self.set_state(STATE_COMMENT)
+            elif re.search(RE_PAGE_END, row):
+                self.set_state(STATE_OUT)
+            else:
+                self.current_blog_comment.body += row.replace('<br>', '<br/>') + '\n'
+
+    def process(self):
+        # rows = self.backup_file_text.splitlines()
+
+        for row in self.backup_file_text:
+            self.process_row(row)
+
+        logging.info('Processed %d posts and %d comments', len(self.posts), len(self.comments))
+        return self.posts
+
+
+def parse_backup_files(backup_files_list):
+    """
+    :param list backup_files_list: a list of html file names
+    :return: all parsed data
+    :rtype: dict
+    """
+    parsed_data = []
+    for filename in backup_files_list:
+        with open(os.path.join(BACKUP_FOLDER, filename), encoding='cp1255') as backup_file:
+            file_text = backup_file.read()
+        #file_text = file_text.decode("cp1255", errors='ignore')
+        #file_text = file_text.encode('UTF-8', errors='ignore')
+        parse_obj = ParseBackupFile(file_text.splitlines())
+        new_data = parse_obj.process()
+        parsed_data += new_data
+
+    logging.info('Total %d posts.', len(parsed_data))
+    return parsed_data
+
+
+def save_parsed_data(parsed_data):
+    """
+    Save the data as XML
+    :param dict parsed_data:
+    """
+    with open(OUTPUT_FILENAME, mode='w') as output_file:
+        output_file.write("""<?xml version="1.0" encoding="UTF-8" ?>
+        <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your site. -->
+        <!-- It contains information about your site's posts, pages, comments, categories, and other content. -->
+        <!-- You may use this file to transfer that content from one site to another. -->
+        <!-- This file is not intended to serve as a complete backup of your site. -->
+
+        <!-- To import this information into a WordPress site follow these steps: -->
+        <!-- 1. Log in to that site as an administrator. -->
+        <!-- 2. Go to Tools: Import in the WordPress admin panel. -->
+        <!-- 3. Install the "WordPress" importer from the list. -->
+        <!-- 4. Activate & Run Importer. -->
+        <!-- 5. Upload this file using the form provided on that page. -->
+        <!-- 6. You will first be asked to map the authors in this export file to users -->
+        <!--    on the site. For each author, you may choose to map to an -->
+        <!--    existing user on the site or to create a new user. -->
+        <!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
+        <!--    contained in this file into your site. -->
+
+        <!-- generator="WordPress.com" created="2021-03-17 12:26"-->
+        <rss version="2.0"
+        	xmlns:excerpt="http://wordpress.org/export/1.2/excerpt/"
+        	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+        	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+        	xmlns:dc="http://purl.org/dc/elements/1.1/"
+        	xmlns:wp="http://wordpress.org/export/1.2/"
+        >
+
+        <channel>
+        	<title>Blog</title>
+        	<link>https://wordpress.com</link>
+        	<description></description>
+        	<pubDate>Wed, 17 Mar 2021 12:26:39 +0000</pubDate>
+        	<language></language>
+        	<wp:wxr_version>1.2</wp:wxr_version>
+        	<wp:base_site_url>http://wordpress.com/</wp:base_site_url>
+        	<wp:base_blog_url>https://wordpress.com</wp:base_blog_url>
+
+        	<wp:author><wp:author_id>0</wp:author_id><wp:author_login><![CDATA[user]]></wp:author_login></wp:author>
+
+
+        	<generator>http://wordpress.com/</generator>
+        <image>
+        		<url>http://s0.wp.com/i/buttonw-com.png</url>
+        		<title>Blog</title>
+        		<link>https://wordpress.com</link>
+        	</image>\n""")
+        for post in parsed_data:
+            output_file.write(post.__repr__())
+        output_file.write('\n</channel>\n</rss>\n')
+
+
+def main():
+    backup_files_list = get_backup_files(BACKUP_FOLDER)
+    parsed_data = parse_backup_files(backup_files_list)
+    save_parsed_data(parsed_data)
+
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG)
+    main()

From 2fb4a8cc92eb02e725057cccfa42b8896f5600d1 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 16:22:34 +0000
Subject: [PATCH 02/12] Adjusted convert.py method to enable WP conversion.

---
 src/convert.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/convert.py b/src/convert.py
index 8f76307..550c3be 100644
--- a/src/convert.py
+++ b/src/convert.py
@@ -338,13 +338,13 @@ def parse_backup_files(backup_files_list):
     return parsed_data
 
 
-def get_backup_files():
+def get_backup_files(backup_folder):
     """
     Search folder for html backup files
     :return: A list of backup files
     :rtype: list
     """
-    all_files = os.listdir(BACKUP_FOLDER)
+    all_files = os.listdir(backup_folder)
     logging.debug(all_files)
 
     file_list = []
@@ -386,7 +386,7 @@ def save_parsed_data(parsed_data):
 
 
 def main():
-    backup_files_list = get_backup_files()
+    backup_files_list = get_backup_files(BACKUP_FOLDER)
     parsed_data = parse_backup_files(backup_files_list)
     save_parsed_data(parsed_data)
 

From a9af88fb0af6b99a5c7b8ea0b169ed43695e946f Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 16:23:57 +0000
Subject: [PATCH 03/12] Adjusted file reading to Python3.

---
 src/convert.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/convert.py b/src/convert.py
index 550c3be..d9597a5 100644
--- a/src/convert.py
+++ b/src/convert.py
@@ -324,12 +324,8 @@ def parse_backup_files(backup_files_list):
     """
     parsed_data = []
     for filename in backup_files_list:
-        # with codecs.open(os.path.join(BACKUP_FOLDER, filename), encoding='cp1255') as backup_file:
-        #     file_text = backup_file.readlines()
-        with open(os.path.join(BACKUP_FOLDER, filename)) as backup_file:
+        with open(os.path.join(BACKUP_FOLDER, filename), encoding='cp1255') as backup_file:
             file_text = backup_file.read()
-        file_text = file_text.decode("cp1255", errors='ignore')
-        file_text = file_text.encode('UTF-8', errors='ignore')
         parse_obj = ParseBackupFile(file_text.splitlines())
         new_data = parse_obj.process()
         parsed_data += new_data

From bd45db3615aaa84d56fb8e61fbb041c9c7f3fb50 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 16:26:24 +0000
Subject: [PATCH 04/12] Fixed an issue that caused all posts to be merged into
 one.

---
 src/convert.py       | 6 +++++-
 src/convert_to_wp.py | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/convert.py b/src/convert.py
index d9597a5..259a05a 100644
--- a/src/convert.py
+++ b/src/convert.py
@@ -18,6 +18,7 @@
 
 RE_COMMENT = '<p class="MsoNormal" dir="RTL" lang="HE" style="font-size:10.0pt; font-family: Arial; margin-right:([\d\.]+)in">(.*)'
 RE_POST = '<p class="MsoNormal" dir="RTL" lang="HE" style="font-size:12.0pt; font-family: Arial">'
+RE_BREAKER_AND_POST = '<br clear="all" style="mso-special-character:line-break;page-break-before:always"><p class="MsoNormal" dir="RTL" lang="HE" style="font-size:12.0pt; font-family: Arial">'
 RE_DATE = '>(\d\d?/\d\d?/\d{1,4} \d\d?:\d\d?:\d\d?)<'
 RE_PAGE_END = '<!--xgemius|<script '
 RE_COMMENT_TS = ', (\d\d?:\d\d? \d\d?/\d\d?/\d{1,4}):<br>'
@@ -271,6 +272,9 @@ def process_row(self, row):
                 # a blog comment started
                 self.parse_comment_header(row)
                 self.set_state(STATE_COMMENT)
+            elif re.search(RE_BREAKER_AND_POST, row):
+                self.parse_post_header(row)
+                self.set_state(STATE_POST)
             elif re.search(RE_PAGE_END, row):
                 self.set_state(STATE_OUT)
             else:
@@ -294,7 +298,7 @@ def process_row(self, row):
                 else:
                     # Just add as-is
                     self.current_blog_comment.body += row + '\n'
-            elif re.search(RE_POST, row):
+            elif re.search(RE_POST, row) or re.search(RE_BREAKER_AND_POST, row):
                 self.parse_post_header(row)
                 self.set_state(STATE_POST)
             elif re.search(RE_COMMENT, row):
diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index d8a625a..15857e1 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -28,6 +28,7 @@
 
 RE_COMMENT = '<p class="MsoNormal" dir="RTL" lang="HE" style="font-size:10.0pt; font-family: Arial; margin-right:([\d\.]+)in">(.*)'
 RE_POST = '<p class="MsoNormal" dir="RTL" lang="HE" style="font-size:12.0pt; font-family: Arial">'
+RE_BREAKER_AND_POST = '<br clear="all" style="mso-special-character:line-break;page-break-before:always"><p class="MsoNormal" dir="RTL" lang="HE" style="font-size:12.0pt; font-family: Arial">'
 RE_DATE = '>(\d\d?/\d\d?/\d{1,4} \d\d?:\d\d?:\d\d?)<'
 RE_PAGE_END = '<!--xgemius|<script '
 RE_COMMENT_TS = ', (\d\d?:\d\d? \d\d?/\d\d?/\d{1,4}):<br>'
@@ -254,6 +255,9 @@ def process_row(self, row):
                 # a blog comment started
                 self.parse_comment_header(row)
                 self.set_state(STATE_COMMENT)
+            elif re.search(RE_BREAKER_AND_POST, row):
+                self.parse_post_header(row)
+                self.set_state(STATE_POST)
             elif re.search(RE_PAGE_END, row):
                 self.set_state(STATE_OUT)
             else:
@@ -277,7 +281,7 @@ def process_row(self, row):
                 else:
                     # Just add as-is
                     self.current_blog_comment.body += row + '\n'
-            elif re.search(RE_POST, row):
+            elif re.search(RE_POST, row) or re.search(RE_BREAKER_AND_POST, row):
                 self.parse_post_header(row)
                 self.set_state(STATE_POST)
             elif re.search(RE_COMMENT, row):

From fcbc0121dc7d3c5d3827d664df99152243e8bccf Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 19:02:05 +0000
Subject: [PATCH 05/12] Fixed the date and time of imported posts (to show the
 original time).

---
 .gitignore           |  2 ++
 src/convert_to_wp.py | 15 +++++++++++++--
 src/requirements.txt |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 src/requirements.txt

diff --git a/.gitignore b/.gitignore
index e69de29..82adb58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+__pycache__
+venv
diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index 15857e1..768a21c 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -10,6 +10,8 @@
 import os
 import datetime
 import json
+import datetime
+from pytz import timezone
 from convert import (
                     get_post_enum,
                     get_comment_enum,
@@ -47,6 +49,7 @@ def __init__(self, post_id=None):
         self.ts = None  # type: float
         self.date_str = None  # type: str
         self.comments = []  # type: dict(BlogComment)
+        self.date = None # type: DateTime
 
     def get_dict(self):
         d = {
@@ -55,6 +58,7 @@ def get_dict(self):
             'body': self.body,
             'ts': self.ts,
             'date_str': self.date_str,
+            'date': self.date,
             'comments_num': len(self.comments),
             'comments': []
         }
@@ -69,15 +73,20 @@ def __repr__(self):
             rep = '<item>\n'
             rep += '<title>%s</title>\n' % sanitize_text(self.title)
             rep += '<link>https://wordpress.com/</link>\n'
-            rep += '<pubDate>%s</pubDate>\n' % self.date_str
+            rep += '<pubDate>%s</pubDate>\n' % self.date.strftime('%a, %d %b %Y %H:%M:%S %z')
             rep += """<dc:creator>user</dc:creator>
                     <guid isPermaLink="false">https://wordpress.com/</guid>
         	        <description></description>\n"""
             rep += '<content:encoded><![CDATA[\n%s]]></content:encoded>\n' % self.body
             rep += """<excerpt:encoded><![CDATA[]]></excerpt:encoded>
         	       <wp:post_id>{post_id}</wp:post_id>
+                   <wp:post_date>{post_time}</wp:post_date>
+           		   <wp:post_date_gmt>{post_gmt_time}</wp:post_date_gmt>
                    <wp:comment_status>open</wp:comment_status>
-               	   <wp:ping_status>open</wp:ping_status>\n""".format(post_id=self.post_id)
+               	   <wp:ping_status>open</wp:ping_status>\n""".format(
+                                                        post_id=self.post_id,
+                                                        post_time=self.date.isoformat(),
+                                                        post_gmt_time=timezone('UTC').normalize(self.date).isoformat())
             rep += '<wp:post_name>%s</wp:post_name>' % sanitize_text(self.title)
             rep += """<wp:status>publish</wp:status>
                     <wp:post_parent>0</wp:post_parent>
@@ -187,6 +196,8 @@ def parse_post_header(self, row):
                                      int(time_array[1]),
                                      int(time_array[2]))
         new_post.date_str = date_str
+        post_date = datetime.datetime.strptime(date_str, '%d/%m/%Y %H:%M:%S')
+        new_post.date = timezone('Israel').localize(post_date)
         new_post.ts = (date_obj - datetime.datetime(1970, 1, 1)).total_seconds()
         new_post.body = ''
 
diff --git a/src/requirements.txt b/src/requirements.txt
new file mode 100644
index 0000000..5aa4f9f
--- /dev/null
+++ b/src/requirements.txt
@@ -0,0 +1 @@
+pytz==2021.1

From 099835f5570a21a638049b51b3c0d7d905372193 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 19:19:13 +0000
Subject: [PATCH 06/12] Deleted unneeded comments title from post text.

---
 src/convert_to_wp.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index 768a21c..1737530 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -34,6 +34,7 @@
 RE_DATE = '>(\d\d?/\d\d?/\d{1,4} \d\d?:\d\d?:\d\d?)<'
 RE_PAGE_END = '<!--xgemius|<script '
 RE_COMMENT_TS = ', (\d\d?:\d\d? \d\d?/\d\d?/\d{1,4}):<br>'
+RE_COMMENT_TITLE = 'תגובות:'
 post_enum = 0
 comment_enum = 0
 
@@ -271,6 +272,8 @@ def process_row(self, row):
                 self.set_state(STATE_POST)
             elif re.search(RE_PAGE_END, row):
                 self.set_state(STATE_OUT)
+            elif re.search(RE_COMMENT_TITLE, row):
+                self.current_blog_post.body += row.replace(RE_COMMENT_TITLE, '')
             else:
                 self.current_blog_post.body += row.replace('<br>', '<br/>') + '\n'
         elif self.state == STATE_COMMENT:

From 341231558d9a0457d8d528c87fdea1f030d82d43 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 19:43:02 +0000
Subject: [PATCH 07/12] Fixed comments date and time (to display the correct
 time).

---
 src/convert_to_wp.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index 1737530..1992e3b 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -135,13 +135,17 @@ def get_dict(self):
         return d
 
     def __repr__(self):
+        post_date = datetime.datetime.strptime(self.date_str, '%H:%M %d/%m/%Y')
+        post_date_localized = timezone('Israel').localize(post_date)
+
         rep = '<wp:comment>\n'
         rep += '<wp:comment_id>%s</wp:comment_id>\n' % self.comment_id
         rep += '<wp:comment_author><![CDATA[%s]]></wp:comment_author>\n' % sanitize_text(self.name)
         rep += '<wp:comment_author_email>%s</wp:comment_author_email>\n' % sanitize_text(self.email)
         rep += '<wp:comment_author_url>%s</wp:comment_author_url>\n' % sanitize_text(self.url)
         rep += '<wp:comment_author_IP></wp:comment_author_IP>\n'
-        rep += '<wp:comment_date>%s</wp:comment_date>\n' % self.date_str
+        rep += '<wp:comment_date>%s</wp:comment_date>\n' % post_date_localized.isoformat()
+        rep += '<wp:comment_date_gmt>%s</wp:comment_date_gmt>\n' % timezone('UTC').normalize(post_date_localized).isoformat()
         rep += '<wp:comment_content><![CDATA[%s]]></wp:comment_content>\n' % self.body
         rep += '<wp:comment_approved>1</wp:comment_approved>\n<wp:comment_type></wp:comment_type>\n'
         rep += '<wp:comment_parent>{parent_id}</wp:comment_parent>\n'.format(parent_id=' parent_id="%d"' % self.parent_id if self.parent_id else 0)

From 8377358b33734d708416f7447e6e3d345c3b2f03 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 19:50:56 +0000
Subject: [PATCH 08/12] Fixed comments to comments (they're not shown
 correctly).

---
 src/convert_to_wp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index 1992e3b..73899c7 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -148,7 +148,7 @@ def __repr__(self):
         rep += '<wp:comment_date_gmt>%s</wp:comment_date_gmt>\n' % timezone('UTC').normalize(post_date_localized).isoformat()
         rep += '<wp:comment_content><![CDATA[%s]]></wp:comment_content>\n' % self.body
         rep += '<wp:comment_approved>1</wp:comment_approved>\n<wp:comment_type></wp:comment_type>\n'
-        rep += '<wp:comment_parent>{parent_id}</wp:comment_parent>\n'.format(parent_id=' parent_id="%d"' % self.parent_id if self.parent_id else 0)
+        rep += '<wp:comment_parent>{parent_id}</wp:comment_parent>\n'.format(parent_id='%s' % self.parent_id if self.parent_id else 0)
         rep += '</wp:comment>\n'
 
         return rep

From eccaa53082a742ca780f2fe280f10254f63171fc Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 20:00:32 +0000
Subject: [PATCH 09/12] Deleted unneeded JSON-related methods.

---
 src/convert_to_wp.py | 89 ++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 61 deletions(-)

diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index 73899c7..adaae31 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -52,53 +52,35 @@ def __init__(self, post_id=None):
         self.comments = []  # type: dict(BlogComment)
         self.date = None # type: DateTime
 
-    def get_dict(self):
-        d = {
-            'post_id': self.post_id,
-            'title': self.title,
-            'body': self.body,
-            'ts': self.ts,
-            'date_str': self.date_str,
-            'date': self.date,
-            'comments_num': len(self.comments),
-            'comments': []
-        }
-        for comment in self.comments:  # type: BlogComment
-            d['comments'].append(comment.get_dict())
-        return d
-
     def __repr__(self):
-        if OUTPUT_FORMAT == 'json':
-            return json.dumps(self.get_dict(), ensure_ascii=False, indent=4)
-        else:
-            rep = '<item>\n'
-            rep += '<title>%s</title>\n' % sanitize_text(self.title)
-            rep += '<link>https://wordpress.com/</link>\n'
-            rep += '<pubDate>%s</pubDate>\n' % self.date.strftime('%a, %d %b %Y %H:%M:%S %z')
-            rep += """<dc:creator>user</dc:creator>
-                    <guid isPermaLink="false">https://wordpress.com/</guid>
-        	        <description></description>\n"""
-            rep += '<content:encoded><![CDATA[\n%s]]></content:encoded>\n' % self.body
-            rep += """<excerpt:encoded><![CDATA[]]></excerpt:encoded>
-        	       <wp:post_id>{post_id}</wp:post_id>
-                   <wp:post_date>{post_time}</wp:post_date>
-           		   <wp:post_date_gmt>{post_gmt_time}</wp:post_date_gmt>
-                   <wp:comment_status>open</wp:comment_status>
-               	   <wp:ping_status>open</wp:ping_status>\n""".format(
-                                                        post_id=self.post_id,
-                                                        post_time=self.date.isoformat(),
-                                                        post_gmt_time=timezone('UTC').normalize(self.date).isoformat())
-            rep += '<wp:post_name>%s</wp:post_name>' % sanitize_text(self.title)
-            rep += """<wp:status>publish</wp:status>
-                    <wp:post_parent>0</wp:post_parent>
-               	    <wp:menu_order>0</wp:menu_order>
-               	    <wp:post_type>post</wp:post_type>
-               	    <wp:post_password></wp:post_password>
-               	    <wp:is_sticky>0</wp:is_sticky>\n"""
-            for comment in self.comments:
-                rep += comment.__repr__()
-            rep += '</item>\n'
-            return rep
+        rep = '<item>\n'
+        rep += '<title>%s</title>\n' % sanitize_text(self.title)
+        rep += '<link>https://wordpress.com/</link>\n'
+        rep += '<pubDate>%s</pubDate>\n' % self.date.strftime('%a, %d %b %Y %H:%M:%S %z')
+        rep += """<dc:creator>user</dc:creator>
+                <guid isPermaLink="false">https://wordpress.com/</guid>
+    	        <description></description>\n"""
+        rep += '<content:encoded><![CDATA[\n%s]]></content:encoded>\n' % self.body
+        rep += """<excerpt:encoded><![CDATA[]]></excerpt:encoded>
+    	       <wp:post_id>{post_id}</wp:post_id>
+               <wp:post_date>{post_time}</wp:post_date>
+       		   <wp:post_date_gmt>{post_gmt_time}</wp:post_date_gmt>
+               <wp:comment_status>open</wp:comment_status>
+           	   <wp:ping_status>open</wp:ping_status>\n""".format(
+                                                    post_id=self.post_id,
+                                                    post_time=self.date.isoformat(),
+                                                    post_gmt_time=timezone('UTC').normalize(self.date).isoformat())
+        rep += '<wp:post_name>%s</wp:post_name>' % sanitize_text(self.title)
+        rep += """<wp:status>publish</wp:status>
+                <wp:post_parent>0</wp:post_parent>
+           	    <wp:menu_order>0</wp:menu_order>
+           	    <wp:post_type>post</wp:post_type>
+           	    <wp:post_password></wp:post_password>
+           	    <wp:is_sticky>0</wp:is_sticky>\n"""
+        for comment in self.comments:
+            rep += comment.__repr__()
+        rep += '</item>\n'
+        return rep
 
 
 class BlogComment(object):
@@ -119,21 +101,6 @@ def __init__(self, comment_id=None):
         self.post_id = None  # type: int
         self.body = None  # type: str
 
-    def get_dict(self):
-        d = {
-            'id': self.comment_id,
-            'name': self.name,
-            'email': self.email,
-            'url': self.url,
-            'ts': self.ts,
-            'date_str': self.date_str,
-            'level': self.level,
-            'post_id': self.post_id,
-        }
-        if self.parent_id:
-            d['parent_id'] = self.parent_id
-        return d
-
     def __repr__(self):
         post_date = datetime.datetime.strptime(self.date_str, '%H:%M %d/%m/%Y')
         post_date_localized = timezone('Israel').localize(post_date)

From 4bc5df5ff74821c2163a3fed294c832e365ad205 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 20:03:35 +0000
Subject: [PATCH 10/12] Commenting improvements.

---
 src/convert.py       |  6 +++++-
 src/convert_to_wp.py | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/convert.py b/src/convert.py
index 259a05a..635dda4 100644
--- a/src/convert.py
+++ b/src/convert.py
@@ -211,6 +211,10 @@ def parse_post_header(self, row):
         self.posts.append(new_post)
 
     def parse_comment_header(self, row):
+        """
+        Create a new comment object and add data to it
+        :param str row:
+        """
         comment_header = re.search(RE_COMMENT, row)
         new_comment = BlogComment()
 
@@ -248,7 +252,7 @@ def set_state(self, new_state):
 
     def process_row(self, row):
         """
-
+        Read the current row and deal with it in accordance with its type
         :type row: str
         """
 
diff --git a/src/convert_to_wp.py b/src/convert_to_wp.py
index adaae31..a4e1b8b 100644
--- a/src/convert_to_wp.py
+++ b/src/convert_to_wp.py
@@ -38,6 +38,7 @@
 post_enum = 0
 comment_enum = 0
 
+# Blog Post
 class BlogPost(object):
     def __init__(self, post_id=None):
         """
@@ -83,6 +84,7 @@ def __repr__(self):
         return rep
 
 
+# Blog Comment
 class BlogComment(object):
     def __init__(self, comment_id=None):
         """
@@ -121,6 +123,8 @@ def __repr__(self):
         return rep
 
 
+# ParseBackupFile
+# Responsible for parsing the HTML into XML
 class ParseBackupFile(object):
     """
     Parse the HTML
@@ -177,6 +181,10 @@ def parse_post_header(self, row):
         self.posts.append(new_post)
 
     def parse_comment_header(self, row):
+        """
+        Create a new comment object and add data to it
+        :param str row:
+        """
         comment_header = re.search(RE_COMMENT, row)
         new_comment = BlogComment()
 
@@ -214,7 +222,7 @@ def set_state(self, new_state):
 
     def process_row(self, row):
         """
-
+        Read the current row and deal with it in accordance with its type
         :type row: str
         """
 

From 385c51b4ed1637abc519ddf2df304aa3486ecb17 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <51282497+shirblc@users.noreply.github.com>
Date: Wed, 17 Mar 2021 20:19:15 +0000
Subject: [PATCH 11/12] Readability improvements to README.

---
 README.md | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 92bbca9..5d85367 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1,39 @@
-לפני סגירה,
+לפני סגירה&#x202b;,
 אמנם גיביתי כבר את הבלוג שלי, בפעם הקודמת שהיה חשש לסגירה, אבל הפעם רציתי לנסות לבצע גיבוי רציני יותר שישמר כמה שיותר ממאפייני הבלוג וייצור ארכיון אמיתי.
 
-שימו לב, זה הרבה יותר טוב מגיבוי רגיל!
+שימו לב, זה הרבה יותר טוב מגיבוי רגיל&#x202b;!
 
-אז ראשית - גיבוי התכנים## .
+## &#x202b; גיבוי התכנים
 
-מנגנון הגיבוי לצערי הרב לא משמר את המידע בצורה מסודרת, אלא בעיקר זורק את התוכן בערבוביה.
-כדי לגבות את הבלוג על פי שנים, עם תגובות, צריך להשתמש בקישור הבא, ורק לשנות את השנה ב URL בכל פעם. (בשני מקומות, שימו לב)
-http://israblog.nana10.co.il/edit/backup_this.asp?FromDay=1&FromMonth=1&FromYear=2003&ToDay=31&ToMonth=12&ToYear=2003&DocType=html&IncludeComments=on
+מנגנון הגיבוי לצערי הרב לא משמר את המידע בצורה מסודרת, אלא בעיקר זורק את התוכן בערבוביה&#x202b;.
+כדי לגבות את הבלוג על פי שנים, עם תגובות, צריך להשתמש בקישור הבא, ורק לשנות את השנה ב&#x202b; URL בכל פעם. (בשני מקומות, שימו לב)
+http://israblog.org/edit/backup_this.asp?FromDay=1&FromMonth=1&FromYear=2003&ToDay=31&ToMonth=12&ToYear=2003&DocType=html&IncludeComments=on
 (אם לא מופיע כלום, ודאו שאתם מחוברים לחשבון ובנוסף, שאכן יש תוכן בשנים שנבחרו.
 לאחר שהדף עם התכנים מופיע, שומרים את הדף (כפתור ימני, save as, בוחרים web page - complete) בתיקיה נקיה על המחשב (תיקיית israblog) כשבתור שם מכניסים את השנה (חשוב, למען הסדר הטוב) ואז עוברים לשנה הבאה, עד 2017.
 
-בסיום התהליך, תהיה לכם תיקיה שבה קבצי html ותיקיות על פי שנה.
+בסיום התהליך, תהיה לכם תיקיה שבה קבצי&#x202b; html ותיקיות על פי שנה.
 
-זה הזמן לוודא שאכן שמרתם את כל השנים ולא פספסתם אף שנה.
+זה הזמן לוודא שאכן שמרתם את כל השנים ולא פספסתם אף שנה&#x202b;.
 
-גיבוי עיצוב הבלוג## 
+## &#x202b; גיבוי עיצוב הבלוג
 
-גם לעיצוב הבלוג הנוסטלגי יש חשיבות בעיני. כדי לגבות את העיצוב, הולכים לדף כלשהו בבלוג (עדיף הדף הראשי של הבלוג) ושומרים באמצעות לחיצה על הכפתור הימני, save as ובפורמט complete.
-חשוב מאד: לקובץ יש לקרוא template.html
+גם לעיצוב הבלוג הנוסטלגי יש חשיבות בעיני. כדי לגבות את העיצוב, הולכים לדף כלשהו בבלוג (עדיף הדף הראשי של הבלוג) ושומרים באמצעות לחיצה על הכפתור הימני&#x202b;, save as ובפורמט complete.
+חשוב מאד: לקובץ יש לקרוא&#x202b; template.html
 
-אני נתקלתי בבעיות קלות בשמירת ה template שלי, בעיקר כי היו שם רכיבי פלאש ישנים שכבר לא פעלו.
-שימו לב שרצוי לנטרל את כל המנגנונים שחוסמים פרסומות וכו׳, כדי לשמור כמה שיותר רכיבים.
+אני נתקלתי בבעיות קלות בשמירת ה&#x202b; template שלי, בעיקר כי היו שם רכיבי פלאש ישנים שכבר לא פעלו.
+שימו לב שרצוי לנטרל את כל המנגנונים שחוסמים פרסומות וכו׳, כדי לשמור כמה שיותר רכיבים&#x202b;.
 
-גיבוי לפורמט וורד## 
+גיבוי לפורמט וורד&#x202b;## 
 
-אני לא אוהב את הפורמט הזה, אבל כגיבוי לגיבוי ורק כי אולי משהו שם יהיה שימושי, אני ממליץ לשמור גם גיבוי בפורמט הזה.
-http://israblog.nana10.co.il/edit/backup_this.asp?FromDay=1&FromMonth=1&FromYear=2003&ToDay=31&ToMonth=12&ToYear=2003&DocType=doc&IncludeComments=on
+אני לא אוהב את הפורמט הזה, אבל כגיבוי לגיבוי ורק כי אולי משהו שם יהיה שימושי, אני ממליץ לשמור גם גיבוי בפורמט הזה&#x202b;.
+http://israblog.nana10.org/edit/backup_this.asp?FromDay=1&FromMonth=1&FromYear=2003&ToDay=31&ToMonth=12&ToYear=2003&DocType=doc&IncludeComments=on
 
+## &#x202b; עיבוד והמרת התוכן למשהו מסודר יותר
 
-עיבוד והמרת התוכן למשהו מסודר יותר## 
-
-מתישהו, מזמן, כשיריב התלבט לאיזה פורמט לכתוב מנוע גיבוי, הפצרתי בו לאפשר ייצוא ל xml. זה היה לפני ש json היה נפוץ, והיה חוסך לי את השלב הזה, או לפחות הופך אותו לקל בהרבה.
-כדי להמיר את קבצי ה html לפורמט מסודר יותר, אשב עכשיו לכתוב סקיפט פייתון שינסה:
-- לזהות בהצלחה את הקטעים השונים
-- לייצר קובץ xml יחיד שמכיל את כל הפוסטים (אני בד״כ מעדיף JSON, אבל כשמדובר בפוסטים עם הרבה שורות, עיצוב, תוכן וכו׳, מוטב XML)
-- לנקות את ה template ששמרנו קודם.
+מתישהו, מזמן, כשיריב התלבט לאיזה פורמט לכתוב מנוע גיבוי, הפצרתי בו לאפשר ייצוא ל&#x202b; xml. זה היה לפני ש json היה נפוץ, והיה חוסך לי את השלב הזה, או לפחות הופך אותו לקל בהרבה.
+&#x202b;הסקריפט שכאן ממיר את קבצי הHTML לפורמט מסודר יותר (XML או JSON).
+&#x202b;הסקריפט:
+- &#x202b;מזהה בהצלחה את הקטעים השונים
+- &#x202b;מייצר קובץ xml יחיד שמכיל את כל הפוסטים (אני בד״כ מעדיף JSON, אבל כשמדובר בפוסטים עם הרבה שורות, עיצוב, תוכן וכו׳, מוטב XML)
+- &#x202b;מנקה את ה template ששמרנו קודם.
+- &#x202b;למי שצריך יש גם סקריפט שממיר את קובץ הגיבוי של ישראבלוג לXML של וורדפרס. כמעט כל פלטפורמות הבלוגים תומכות ביבוא הקבצים הללו.

From 1a4a57d59847a8cac729e6c4eaacb05919139ea3 Mon Sep 17 00:00:00 2001
From: Shir Bar Lev <shirblc@gmail.com>
Date: Wed, 17 Mar 2021 20:29:07 +0000
Subject: [PATCH 12/12] Added README to source folder.

---
 src/README.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 src/README.md

diff --git a/src/README.md b/src/README.md
new file mode 100644
index 0000000..4607f32
--- /dev/null
+++ b/src/README.md
@@ -0,0 +1,37 @@
+# Israblog Backup
+
+## Version
+
+Version 12.4.
+
+## Requirements
+
+- Python 3
+
+## Installation and Usage (Source directory!)
+
+1. Save your Israblog backup (in accordance with the main [README](https://github.com/shirblc/israblog/blob/master/README.md)).
+2. Download or clone the repo.
+3. cd into the project directory.
+4. cd into src.
+5. Run ```pip install -r requirements.txt``` to install dependencies (they're necessary for the Wordpress conversion).
+6. Update the ```BACKUP_FOLDER``` constant to the location of your downloaded backup.
+  - If you want to use the Wordpress converter, do it in the [convert_to_wp file](https://github.com/shirblc/israblog/blob/master/src/convert_to_wp.py).
+  - Otherwise, do it in the [convert file](https://github.com/shirblc/israblog/blob/master/src/convert.py).
+7. Run the script:
+  - If using the Wordpress converter, run ```python convert_to_wp.py``` (run ```python3 convert_to_wp.py``` if you're on macOS).
+  - If using the regular converter, run ```python convert.py``` (run ```python3 convert.py``` if you're on macOS).
+
+## Contents
+
+1. **convert.py** - Converts the Israblog HTML backup into XML/JSON.
+2. **convert_to_wp.py** - Converts the Israblog HTML backup into a Wordpress XML.
+3. **download_blog_posts.py** - Crawls over the given blog and saves its posts.
+
+## Dependencies
+
+1. **pytz** - A timezone utility for Python. For more information, check their [PyPI page](https://pypi.org/project/pytz/).
+
+## Known Issues
+
+There are no current issues at the time.