Fix merge errors from other PR's

.env.template

@@ -4,11 +4,11 @@ REDDIT_CLIENT_SECRET=""
 REDDIT_USERNAME=""
 REDDIT_PASSWORD=""
 
-# Valid options are "yes" and "no" 
+# Valid options are "yes" and "no"
 REDDIT_2FA=""
 
-#If no, it will ask you a thread link to extract the thread, if yes it will randomize it. 
-RANDOM_THREAD="no"
+#If no, it will ask you a thread link to extract the thread, if yes it will randomize it.
+RANDOM_THREAD="yes"
 
 # Valid options are "light" and "dark"
 THEME=""

main.py

@@ -54,7 +54,7 @@ if not os.path.exists(".env"):
     console.log("[red] Your .env file is invalid, or was never created. Standby.")
 
 for val in REQUIRED_VALUES:
-    print(os.getenv(val))
+    #print(os.getenv(val))
     if val not in os.environ or not os.getenv(val):
         console.log(f'[bold red]Missing Variable: "{val}"')
         configured = False
@@ -70,8 +70,8 @@ for val in REQUIRED_VALUES:
             console.log("[bold green]Here goes nothing! Launching setup wizard...")
             time.sleep(0.5)
             os.system("python3 setup.py")
-    else:
-        if setup_ask == "no":
+
+        elif setup_ask == "no":
             console.print("[red]Exiting...")
             time.sleep(0.5)
             exit()
@@ -79,8 +79,6 @@ for val in REQUIRED_VALUES:
             console.print("[red]I don't understand that. Exiting...")
             time.sleep(0.5)
             exit()
-
-    exit()
 try:
     float(os.getenv("OPACITY"))
 except:
@@ -91,16 +89,6 @@ except:
     exit()
 console.log("[bold green]Enviroment Variables are set! Continuing...")
 
-
-length, number_of_comments = save_text_to_mp3(reddit_object)
-download_screenshots_of_reddit_posts(
-    reddit_object, number_of_comments, os.getenv("THEME")
-)
-download_background()
-chop_background_video(length)
-final_video = make_final_video(number_of_comments)
-
-
 if configured:
     reddit_object = get_subreddit_threads()
     length, number_of_comments = save_text_to_mp3(reddit_object)

reddit/subreddit.py

@@ -33,7 +33,7 @@ def get_subreddit_threads():
         username=os.getenv("REDDIT_USERNAME"),
         password=passkey,
     )
-    
+
     # 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
     if not os.getenv("RANDOM_THREAD") or os.getenv("RANDOM_THREAD") == "no":
         print_substep("Insert the full thread link:", style="bold green")