removed the duplicate code blocks

pull/280/head
iaacornus 3 years ago
parent 65f74f586b
commit f1cb1a3cbc
No known key found for this signature in database
GPG Key ID: 281739AE7252598C

@ -39,17 +39,7 @@ def get_subreddit_threads(subreddit_, thread_link_):
password=passkey.strip(), password=passkey.strip(),
) )
try:
if subreddit_ is None:
raise ValueError
subreddit = reddit.subreddit(subreddit_)
except ValueError:
if os.getenv("SUBREDDIT"):
subreddit = reddit.subreddit(re.sub(r"r\/", "", os.getenv("SUBREDDIT").strip()))
else:
subreddit = reddit.subreddit("askreddit")
print_substep("Subreddit not defined. Using AskReddit.")
# If the user specifies that he doesnt want a random thread, or if # If the user specifies that he doesnt want a random thread, or if
# he doesn't insert the "RANDOM_THREAD" variable at all, ask the thread link # he doesn't insert the "RANDOM_THREAD" variable at all, ask the thread link
@ -58,16 +48,17 @@ def get_subreddit_threads(subreddit_, thread_link_):
print_step(f"Getting the inserted thread...") print_step(f"Getting the inserted thread...")
submission = reddit.submission(url=thread_link) submission = reddit.submission(url=thread_link)
else: else:
# Otherwise, picks a random thread from the inserted subreddit try:
if os.getenv("SUBREDDIT"): if subreddit_ is None:
subreddit = reddit.subreddit(re.sub(r"r\/", "", os.getenv("SUBREDDIT"))) raise ValueError
else:
# ! Prompt the user to enter a subreddit subreddit = reddit.subreddit(subreddit_)
try: except ValueError:
if os.getenv("SUBREDDIT"):
subreddit = reddit.subreddit( subreddit = reddit.subreddit(
re.sub(r"r\/", "",input("What subreddit would you like to pull from? ")) re.sub(r"r\/", "", os.getenv("SUBREDDIT").strip())
) )
except ValueError: else:
subreddit = reddit.subreddit("askreddit") subreddit = reddit.subreddit("askreddit")
print_substep("Subreddit not defined. Using AskReddit.") print_substep("Subreddit not defined. Using AskReddit.")

Loading…
Cancel
Save