Update Spacing / Add Values

twint/elasticsearch.py

 from elasticsearch import Elasticsearch, helpers
 import contextlib
-import datetime
 import time
 import sys
 
 class RecycleObject(object):
     def write(self, junk): pass
-	def flush(self): pass
+    def flush(slef): pass
 
 @contextlib.contextmanager
 def nostdout():
@@ -15,7 +14,7 @@ def nostdout():
     yield
     sys.stdout = savestdout
 
-def weekday(day):
+def weekdate(day):
     weekdays = {
             "Monday": 1,
             "Tuesday": 2,
@@ -28,9 +27,11 @@ def weekday(day):
 
     return weekdays[day]
 
+def hour(datetime):
+    return time.strftime("%H", time.localtime(datetime))
+
 def Tweet(Tweet, es, session):
-	# Todo play around with this some more
-	day = weekday(Tweet.date.strftime("%A"))
+    day = weekday(time.strftime("%A", time.localtime(Tweet.datetime)))
 
     actions = []
     nLikes = 0
@@ -53,12 +54,13 @@ def Tweet(Tweet, es, session):
                 "user_id": Tweet.user_id,
                 "username": Tweet.username,
                 "day": day,
-				"hour": Tweet.time.strftime("%H"),
+                "hour": hour(Tweet.datetime),
                 "link": Tweet.link,
+                "retweet": Tweet.is_retweet,
+                "user_rt": Tweet.user_rt,
                 "essid": session
                 }
             }
-
     actions.append(j_data)
 
     for l in range(int(Tweet.likes)):
@@ -77,12 +79,13 @@ def Tweet(Tweet, es, session):
                     "user_id": Tweet.user_id,
                     "username": Tweet.username,
                     "day": day,
-					"hour": Tweet.time.strftime("%H"),
+                    "hour": hour(Tweet.datetime),
                     "link": Tweet.link,
+                    "retweet": Tweet.is_retweet,
+                    "user_rt": Tweet.user_rt,
                     "essid": session
                     }
                 }
-
         actions.append(j_data)
         nLikes += 1
 
@@ -102,12 +105,13 @@ def Tweet(Tweet, es, session):
                     "user_id": Tweet.user_id,
                     "username": Tweet.username,
                     "day": day,
-						"hour": Tweet.time.strftime("%H"),
+                    "hour": hour(Tweet.datetime),
                     "link": Tweet.link,
+                    "retweet": Tweet.is_retweet,
+                    "user_rt": Tweet.user_rt,
                     "essid": session
                     }
                 }
-
         actions.append(j_data)
         nReplies += 1
 
@@ -127,12 +131,13 @@ def Tweet(Tweet, es, session):
                     "user_id": Tweet.user_id,
                     "username": Tweet.username,
                     "day": day,
-					"hour": Tweet.time.strftime("%H"),
+                    "hour": hour(Tweet.datetime),
                     "link": Tweet.link,
+                    "retweet": Tweet.is_retweet,
+                    "user_rt": Tweet.user_rt,
                     "essid": session
                     }
                 }
-
         actions.append(j_data)
         nRetweets += 1
 
@@ -154,7 +159,6 @@ def Follow(es, user, follow, session):
                 "essid": session
                 }
             }
-
     actions.append(j_data)
 
     es = Elasticsearch(es)