Stylize the console output

This commit is contained in:
Ali Parlakci
2018-07-25 12:24:50 +03:00
parent 80546d7094
commit cfaf2de7db
2 changed files with 13 additions and 19 deletions

View File

@@ -465,10 +465,9 @@ def downloadPost(SUBMISSION):
"imgur":Imgur,"gfycat":Gfycat,"erome":Erome,"direct":Direct,"self":Self "imgur":Imgur,"gfycat":Gfycat,"erome":Erome,"direct":Direct,"self":Self
} }
print()
if SUBMISSION['postType'] in downloaders: if SUBMISSION['postType'] in downloaders:
print(SUBMISSION['postType'].upper(),end=" ")
if SUBMISSION['postType'] == "imgur": if SUBMISSION['postType'] == "imgur":
while int(time.time() - lastRequestTime) <= 2: while int(time.time() - lastRequestTime) <= 2:
@@ -483,13 +482,14 @@ def downloadPost(SUBMISSION):
+ str(int(IMGUR_RESET_TIME%60)) \ + str(int(IMGUR_RESET_TIME%60)) \
+ " Seconds") + " Seconds")
print( if credit['ClientRemaining'] < 25 or credit['UserRemaining'] < 25:
"==> Client: {} - User: {} - Reset {}".format( print(
credit['ClientRemaining'], "==> Client: {} - User: {} - Reset {}".format(
credit['UserRemaining'], credit['ClientRemaining'],
USER_RESET credit['UserRemaining'],
),end="" USER_RESET
) ),end=""
)
if not (credit['UserRemaining'] == 0 or \ if not (credit['UserRemaining'] == 0 or \
credit['ClientRemaining'] == 0): credit['ClientRemaining'] == 0):
@@ -509,7 +509,6 @@ def downloadPost(SUBMISSION):
raise ImgurLimitError('{} LIMIT EXCEEDED\n'.format(KEYWORD.upper())) raise ImgurLimitError('{} LIMIT EXCEEDED\n'.format(KEYWORD.upper()))
print()
downloaders[SUBMISSION['postType']] (directory,SUBMISSION) downloaders[SUBMISSION['postType']] (directory,SUBMISSION)
else: else:
@@ -531,17 +530,13 @@ def download(submissions):
FAILED_FILE = createLogFile("FAILED") FAILED_FILE = createLogFile("FAILED")
for i in range(subsLenght): for i in range(subsLenght):
print("\n({}/{})".format(i+1,subsLenght))
print( print(
"https://reddit.com/r/{subreddit}/comments/{id}".format( f"\n({i+1}/{subsLenght}) ({submissions[i]['postType'].upper()}) " \
subreddit=submissions[i]['postSubreddit'], f"(r/{submissions[i]['postSubreddit']})",end=""
id=submissions[i]['postId']
)
) )
if isPostExists(submissions[i]): if isPostExists(submissions[i]):
print(submissions[i]['postType'].upper()) print("\nIt already exists")
print("It already exists")
duplicates += 1 duplicates += 1
downloadedCount -= 1 downloadedCount -= 1
continue continue
@@ -684,7 +679,6 @@ if __name__ == "__main__":
except KeyboardInterrupt: except KeyboardInterrupt:
if GLOBAL.directory is None: if GLOBAL.directory is None:
GLOBAL.directory = Path(".\\") GLOBAL.directory = Path(".\\")
print("\nQUITTING...")
except Exception as exception: except Exception as exception:
if GLOBAL.directory is None: if GLOBAL.directory is None:

View File

@@ -125,7 +125,7 @@ def getPosts(args):
if args["user"] == "me": if args["user"] == "me":
args["user"] = str(reddit.user.me()) args["user"] = str(reddit.user.me())
print("\nGETTING POSTS\n.\n.\n.\n") # print("\nGETTING POSTS\n.\n.\n.\n")
if not "search" in args: if not "search" in args:
if args["sort"] == "top" or args["sort"] == "controversial": if args["sort"] == "top" or args["sort"] == "controversial":