review columns name

diff --git a/waybacktweets/main.py b/waybacktweets/main.py
index cd9d75df467c756608040b4cd2e8404a68b682c9..1463cfc6faf78e87901120fa47763d3dc04bed54 100644 (file)
--- a/waybacktweets/main.py
+++ b/waybacktweets/main.py
@@ -20,12 +20,12 @@ def main():
 
         if archived_tweets:
             metadata_options = [
-                'archived_urlkey', 'archived_timestamp', 'tweet',
-                'archived_tweet', 'parsed_tweet', 'parsed_tweet_mimetype_json',
-                'available_tweet_content', 'available_tweet_is_RT',
-                'available_tweet_username', 'parsed_archived_tweet',
-                'archived_mimetype', 'archived_statuscode', 'archived_digest',
-                'archived_length'
+                'archived_urlkey', 'archived_timestamp', 'original_tweet_url',
+                'archived_tweet_url', 'parsed_tweet_url',
+                'parsed_archived_tweet_url', 'parsed_tweet_text_mimetype_json',
+                'available_tweet_text', 'available_tweet_is_RT',
+                'available_tweet_username', 'archived_mimetype',
+                'archived_statuscode', 'archived_digest', 'archived_length'
             ]
 
             parser = TweetsParser(archived_tweets, username, metadata_options)

diff --git a/waybacktweets/parse_tweets.py b/waybacktweets/parse_tweets.py
index d3f9755e63040de23998c1925c3234a439fbd05b..17624bc32112f482d9a71fc533ce282eb044eb1f 100644 (file)
--- a/waybacktweets/parse_tweets.py
+++ b/waybacktweets/parse_tweets.py
@@ -130,7 +130,7 @@ class TweetsParser:
             content = embed_parser.embed()
 
             if content:
-                self.add_metadata('available_tweet_content',
+                self.add_metadata('available_tweet_text',
                                   semicolon_parse(content[0][0]))
                 self.add_metadata('available_tweet_is_RT', content[1][0])
                 self.add_metadata('available_tweet_username',
@@ -143,14 +143,15 @@ class TweetsParser:
             else:
                 parsed_text_json = None
 
-            self.add_metadata('parsed_tweet_mimetype_json', parsed_text_json)
+            self.add_metadata('parsed_tweet_text_mimetype_json',
+                              parsed_text_json)
 
             self.add_metadata('archived_urlkey', response[0])
             self.add_metadata('archived_timestamp', response[1])
-            self.add_metadata('tweet', encoded_tweet)
-            self.add_metadata('archived_tweet', encoded_archived_tweet)
-            self.add_metadata('parsed_tweet', encoded_parsed_tweet)
-            self.add_metadata('parsed_archived_tweet',
+            self.add_metadata('original_tweet_url', encoded_tweet)
+            self.add_metadata('archived_tweet_url', encoded_archived_tweet)
+            self.add_metadata('parsed_tweet_url', encoded_parsed_tweet)
+            self.add_metadata('parsed_archived_tweet_url',
                               encoded_parsed_archived_tweet)
             self.add_metadata('archived_mimetype', response[3])
             self.add_metadata('archived_statuscode', response[4])