diff --git a/database/database.py b/database/database.py index 8705c27..a0822ca 100644 --- a/database/database.py +++ b/database/database.py @@ -1,11 +1,14 @@ import psycopg2 +from shell_arguments import ShellArguments class Database: conn = None + verbose = False def __init__(self, dbname): self.conn = psycopg2.connect('dbname={}'.format(dbname)) + self.verbose = ShellArguments.get_args().verbose def save_tweet(self, id = None, @@ -30,7 +33,14 @@ def save_tweet(self, cur.execute(statement, (id, text, geo, user_id, longitude, latitude, place_id, retweeted_id, original_tweet_retweet_count, in_reply_to_status_id, in_reply_to_user_id, lang)) self.conn.commit() cur.close() - # print ('Tweet Saved!') + if(self.verbose): + print('Saving tweet') + print(""" + id ={0}, text={1}, geo={2}, user_id={3}, longitude={4}, latitude={5}, + place_id={6}, retweeted_id={7}, original_tweet_retweet_count={8}, + in_reply_to_status_id={9}, in_reply_to_user_id={10}, lang={11} + """.format(id, text, geo, user_id, longitude, latitude, place_id, + retweeted_id, original_tweet_retweet_count, in_reply_to_status_id, in_reply_to_user_id, lang)) def tweet_exists(self, tweet_id): cur = self.conn.cursor() @@ -65,6 +75,15 @@ def save_user(self, cur.execute(statement, (user_id, user_screen_name, user_name, user_location, user_description, user_followers_count, user_friends_count, user_time_zone, user_lang, user_url, user_geo_enabled)) self.conn.commit() cur.close + if self.verbose: + print("Saving user") + print(""" + user_id={0}, user_screen_name={1}, user_name={2}, user_location={3}, user_description={4}, + user_followers_count={5}, user_friends_count={6}, user_time_zone={7}, + user_lang={8}, user_url={9}, user_geo_enabled={10} + """.format(user_id, user_screen_name, user_name, user_location, user_description, + user_followers_count, user_friends_count, user_time_zone, user_lang, user_url, user_geo_enabled)) + # print ('User Saved!') def user_exists(self, user_id): @@ -121,7 +140,14 @@ def update_user(self, cur.execute(statement, data) self.conn.commit() cur.close - # print('User updated') + if self.verbose: + print("Updating user") + print(""" + user_id={0}, user_screen_name={1}, user_name={2}, user_location={3}, user_description={4}, + user_followers_count={5}, user_friends_count={6}, user_time_zone={7}, + user_lang={8}, user_url={9}, user_geo_enabled={10} + """.format(user_id, user_screen_name, user_name, user_location, user_description, + user_followers_count, user_friends_count, user_time_zone, user_lang, user_url, user_geo_enabled)) def save_place(self, place_id = None, @@ -145,8 +171,14 @@ def save_place(self, cur.execute(statement, (place_id, place_name, place_country, place_country_code, place_full_name, place_type, place_street_address, place_locality, place_region, place_iso3_country_code, place_postal_code)) self.conn.commit() cur.close - - # print('Place Saved!') + if self.verbose: + print("Saving place") + print(""" + place_id={0}, place_name={1}, place_country={2}, place_country_code={3}, place_full_name={4}, + place_type={5}, place_street_address={6}, place_locality={7}, place_region,={8} + place_iso3_country_code={9}, place_postal_code={10} + """.format(place_id, place_name, place_country, place_country_code, place_full_name, place_type, + place_street_address, place_locality, place_region, place_iso3_country_code, place_postal_code)) def place_exists(self, place_id): cur = self.conn.cursor() @@ -202,4 +234,11 @@ def update_place(self, cur.execute(statement, data) self.conn.commit() cur.close - # print('Place updated') + if self.verbose: + print("Updating place") + print(""" + place_id={0}, place_name={1}, place_country={2}, place_country_code={3}, place_full_name={4}, + place_type={5}, place_street_address={6}, place_locality={7}, place_region,={8} + place_iso3_country_code={9}, place_postal_code={10} + """.format(place_id, place_name, place_country, place_country_code, place_full_name, place_type, + place_street_address, place_locality, place_region, place_iso3_country_code, place_postal_code)) diff --git a/shell_arguments.py b/shell_arguments.py index 971b154..a2c0254 100644 --- a/shell_arguments.py +++ b/shell_arguments.py @@ -2,18 +2,12 @@ class ShellArguments: - args = None - - def __init__(self): + def get_args(): program_description = "A program that stores information from twitter according to a specified filter" parser = argparse.ArgumentParser(description=program_description) parser.add_argument('filter', metavar='filter', nargs='+', help='filter for twitter API') - parser.add_argument('-v', action='store_true', help='increase verbosity') + parser.add_argument('--verbose', '-v', action='store_true', help='increase verbosity') - self.args = parser.parse_args() - - def get_filter(self): - return self.args.filter - + return parser.parse_args() diff --git a/twitter_stream.py b/twitter_stream.py index f6a4500..c6cc0ec 100644 --- a/twitter_stream.py +++ b/twitter_stream.py @@ -17,6 +17,8 @@ stream = tweepy.Stream(auth=api.auth, listener=streamListener) # Create a stream connection -filter = ShellArguments().get_filter() -print("Filter is set to: " + str(filter)) -stream.filter(track=filter) \ No newline at end of file +args = ShellArguments.get_args() +if args.verbose: print("Verbose mode on") +print("Filter is set to: " + str(args.filter)) + +stream.filter(track=args.filter) \ No newline at end of file