From 3869e5a99a0b65da6789dc43943672b99fbd96fa Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Thu, 8 Oct 2020 13:15:05 -0700 Subject: [PATCH] Use the same print format for get_submissions and get_comments. --- timesearch_modules/get_comments.py | 2 +- timesearch_modules/get_submissions.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/timesearch_modules/get_comments.py b/timesearch_modules/get_comments.py index d206906..a9ddee8 100644 --- a/timesearch_modules/get_comments.py +++ b/timesearch_modules/get_comments.py @@ -74,11 +74,11 @@ def get_comments( elif username: comments = pushshift.get_comments_from_user(username, lower=lower, upper=upper) - form = '{lower} ({lower_unix}) - {upper} ({upper_unix}) +{gain}' if do_supplement: comments = pushshift.supplement_reddit_data(comments, chunk_size=100) + form = '{lower} ({lower_unix}) - {upper} ({upper_unix}) +{gain}' comments = common.generator_chunker(comments, 500) for chunk in comments: step = database.insert(chunk) diff --git a/timesearch_modules/get_submissions.py b/timesearch_modules/get_submissions.py index 5f0db88..9becc2a 100644 --- a/timesearch_modules/get_submissions.py +++ b/timesearch_modules/get_submissions.py @@ -69,14 +69,16 @@ def get_submissions( submissions = pushshift.supplement_reddit_data(submissions, chunk_size=100) submissions = common.generator_chunker(submissions, 200) - form = '{lower} - {upper} +{gain}' + form = '{lower} ({lower_unix}) - {upper} ({upper_unix}) +{gain}' for chunk in submissions: chunk.sort(key=lambda x: x.created_utc) - new_count = database.insert(chunk)['new_submissions'] + step = database.insert(chunk) message = form.format( lower=common.human(chunk[0].created_utc), upper=common.human(chunk[-1].created_utc), - gain=new_count, + lower_unix=int(chunk[0].created_utc), + upper_unix=int(chunk[-1].created_utc), + gain=step['new_submissions'], ) print(message)