From 8bc863db834dc229aef490a489ad651adfe7e44e Mon Sep 17 00:00:00 2001
From: pteek <pteek@users.noreply.github.com>
Date: Mon, 23 Mar 2015 15:47:49 +0530
Subject: [PATCH 1/2] #25 Added json dump for submissions

Changed utcnow to now because praw's utc time is actually in current
timezone. line 125
Removed u prefix from random string. line 167
---
 shreddit.cfg.example |  3 +++
 shreddit.py          | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/shreddit.cfg.example b/shreddit.cfg.example
index e839e0f..2fe9306 100644
--- a/shreddit.cfg.example
+++ b/shreddit.cfg.example
@@ -28,6 +28,9 @@ clear_vote = False
 # Overview: both submissions and comments. Comments / Submitted are as expected.
 item = overview 
 
+# Save comments and posts before deleting them?
+keep_a_copy = True
+
 # Anything in this list won't be deleted, coma delimited
 # spaces should work as .strip() is called after splitting
 # on comma.
diff --git a/shreddit.py b/shreddit.py
index 6543e75..7e8e667 100755
--- a/shreddit.py
+++ b/shreddit.py
@@ -2,6 +2,7 @@
 
 import os
 import argparse
+import json
 
 from re import sub
 from random import shuffle, randint
@@ -52,6 +53,7 @@ clear_vote = config.getboolean('main', 'clear_vote')
 trial_run = config.getboolean('main', 'trial_run')
 edit_only = config.getboolean('main', 'edit_only')
 item = config.get('main', 'item')
+keep_a_copy = config.get('main', 'keep_a_copy')
 whitelist_distinguished = config.getboolean('main', 'whitelist_distinguished')
 whitelist_gilded = config.getboolean('main', 'whitelist_gilded')
 nuke_hours = config.getint('main', 'nuke_hours')
@@ -59,6 +61,8 @@ _user = config.get('main', 'username')
 _pass = config.get('main', 'password')
 
 r = praw.Reddit(user_agent="shreddit/3.2")
+if keep_a_copy:
+    r.config.store_json_result = True
 
 
 def login(user=None, password=None):
@@ -80,6 +84,12 @@ if not r.is_logged_in():
 if verbose:
     print("Logged in as {user}".format(user=r.user))
 
+if keep_a_copy:
+    fname = str(datetime.utcnow()).replace(':','')+'.txt'
+    if verbose:
+        print("Saving {user}'s stuff in {name}".format(user=r.user, name=fname))
+    copy_file = open(fname, 'w')
+    
 if verbose:
     print("Deleting messages before {time}.".format(
         time=datetime.now() - timedelta(hours=hours))
@@ -104,9 +114,10 @@ else:
     raise Exception("Your deletion section is wrong")
 
 for thing in things:
+    # Seems to be in users's timezone. Unclear.
     thing_time = datetime.fromtimestamp(thing.created_utc)
     # Exclude items from being deleted unless past X hours.
-    after_time = datetime.utcnow() - timedelta(hours=hours)
+    after_time = datetime.now() - timedelta(hours=hours)
     if thing_time > after_time:
         if thing_time + timedelta(hours=nuke_hours) < datetime.utcnow():
             pass
@@ -134,9 +145,25 @@ for thing in things:
 
     if clear_vote:
         thing.clear_vote()
+
+    #html is not playing well with json
+    d = thing.json_dict
+    if 'body_html' in d:
+        del d['body_html']
+    elif 'selftext_html' in d:
+        del d['selftext_html']
+    thing_json = json.dumps(d)
+    
     if isinstance(thing, Submission):
         if verbose:
-            print(u'Deleting submission: #{id} {url}'.format(
+            print('Saving a copy of submission: #{id} {url}'.format(
+                id=thing.id,
+                url=thing.url)
+            )
+        if keep_a_copy:
+            copy_file.write(thing_json + '\n')
+        if verbose:
+            print('Deleting submission: #{id} {url}'.format(
                 id=thing.id,
                 url=thing.url)
             )
@@ -153,6 +180,11 @@ for thing in things:
                 print('Editing {msg}'.format(msg=msg))
             else:
                 print('Editing and deleting {msg}'.format(msg=msg))
+        
+        if keep_a_copy:
+            copy_file.write(thing_json + '\n')
         thing.edit(replacement_text)
     if not edit_only:
         thing.delete()
+
+copy_file.close()

From 09cdcb4c718f68ea7216612beec940fcbf11ec15 Mon Sep 17 00:00:00 2001
From: pteek <pteek@users.noreply.github.com>
Date: Mon, 23 Mar 2015 15:52:23 +0530
Subject: [PATCH 2/2] #25 Fix a print

---
 shreddit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shreddit.py b/shreddit.py
index 7e8e667..944ed06 100755
--- a/shreddit.py
+++ b/shreddit.py
@@ -155,7 +155,7 @@ for thing in things:
     thing_json = json.dumps(d)
     
     if isinstance(thing, Submission):
-        if verbose:
+        if verbose && keep_a_copy:
             print('Saving a copy of submission: #{id} {url}'.format(
                 id=thing.id,
                 url=thing.url)