fix merge conficlts

setup.py

@@ -1,27 +1,72 @@
-"""
+#!/usr/bin/env python3
-
+# Setup Script for RedditVideoMakerBot
-Setup Script for RedditVideoMakerBot
 
-"""
 
 # Imports
 import os
-import time
+import subprocess
+import re
 from utils.console import print_markdown
 from utils.console import print_step
-from utils.console import print_substep
 from rich.console import Console
 from utils.loader import Loader
-from os.path import exists
+
 console = Console()
 
-setup_done = exists(".setup-block.txt")
 
-if setup_done == True:
+def handle_input(
-	console.log("[red]Setup was already completed! Do you want to run the script again?")
+    message: str = "",
+    check_type=False,
+    match: str = "",
+    err_message: str = "",
+    nmin=None,
+    nmax=None,
+    oob_error="",
+):
+    match = re.compile(match + "$")
+    while True:
+        user_input = input(message + "\n> ").strip()
+        if re.match(match, user_input) is not None:
+            if check_type is not False:
+                try:
+                    user_input = check_type(user_input)
+                    if nmin is not None and user_input < nmin:
+                        console.log("[red]" + oob_error)  # Input too low failstate
+                        continue
+                    if nmax is not None and user_input > nmax:
+                        console.log("[red]" + oob_error)  # Input too high
+                        continue
+                    break  # Successful type conversion and number in bounds
+                except ValueError:
+                    console.log("[red]" + err_message)  # Type conversion failed
+                    continue
+            if (
+                nmin is not None and len(user_input) < nmin
+            ):  # Check if string is long enough
+                console.log("[red]" + oob_error)
+                continue
+            if (
+                nmax is not None and len(user_input) > nmax
+            ):  # Check if string is not too long
+                console.log("[red]" + oob_error)
+                continue
+            break
+        console.log("[red]" + err_message)
+
+    return user_input
+
+# Check if the setup has been run before
+if os.path.isfile(".setup-done-before"):
+    # Tell the user that the setup has been run before and ask if they want to run it again
+    console.print(
+        "[red]Setup was already completed! Do you want to run the script again? [y/n]"
+    )
+    # Check if the user wants to run the setup again
     run_again = input("> ")
+    # If the user wants to run the setup again, delete the .setup-done-before file and continue
     if run_again == "y":
-		os.remove(".setup-block.txt")
+        os.remove(".setup-done-before")
+    # If the user does not want to run the setup again, exit the script
     else:
         exit()
 
@@ -30,30 +75,32 @@ if setup_done == True:
 # - knows that they are about to erase any other setup files/data.
 
 print_step("Setup Assistant")
-
 print_markdown(
     "### You're in the setup wizard. Ensure you're supposed to be here, then type yes to continue. If you're not sure, type no to quit."
 )
 
+
 # This Input is used to ensure the user is sure they want to continue.
-ensureSetupIsRequired = input("Are you sure you want to continue? > ").casefold()
+if input("Are you sure you want to continue? > ").strip().casefold() != "yes":
-if ensureSetupIsRequired != "yes":
     console.print("[red]Exiting...")
-	time.sleep(0.5)
     exit()
-else:
+# This code is inaccessible if the prior check fails, and thus an else statement is unnecessary
+
+
 # Again, let them know they are about to erase all other setup data.
-	console.print("[bold red] This will overwrite your current settings. Are you sure you want to continue? [bold green]yes/no")
+console.print(
-	overwriteSettings = input("Are you sure you want to continue? > ").casefold()
+    "[bold red] This will overwrite your current settings. Are you sure you want to continue? [bold green]yes/no"
-	if overwriteSettings != "yes":
+)
+
+
+if input("Are you sure you want to continue? > ").strip().casefold() != "yes":
     console.print("[red]Abort mission! Exiting...")
-		time.sleep(0.5)
     exit()
-	else:
+# This is once again inaccessible if the prior checks fail
 # Once they confirm, move on with the script.
 console.print("[bold green]Alright! Let's get started!")
-		time.sleep(1)
 
+print("\n")
 console.log("Ensure you have the following ready to enter:")
 console.log("[bold green]Reddit Client ID")
 console.log("[bold green]Reddit Client Secret")
@@ -63,69 +110,117 @@ console.log("[bold green]Reddit 2FA (yes or no)")
 console.log("[bold green]Opacity (range of 0-1, decimals are OK)")
 console.log("[bold green]Subreddit (without r/ or /r/)")
 console.log("[bold green]Theme (light or dark)")
-time.sleep(0.5)
+console.print(
-console.print("[green]If you don't have these, please follow the instructions in the README.md file to set them up.")
+    "[green]If you don't have these, please follow the instructions in the README.md file to set them up."
-console.print("[green]If you do have these, type yes to continue. If you dont, go ahead and grab those quickly and come back.")
+)
-confirmUserHasCredentials = input("Are you sure you have the credentials? > ").casefold()
+console.print(
-if confirmUserHasCredentials != "yes":
+    "[green]If you do have these, type yes to continue. If you dont, go ahead and grab those quickly and come back."
+)
+print()
+
+
+if input("Are you sure you have the credentials? > ").strip().casefold() != "yes":
     console.print("[red]I don't understand that.")
     console.print("[red]Exiting...")
     exit()
-else:
-	console.print("[bold green]Alright! Let's get started!")
-	time.sleep(1)
 
 
-console.log("[green]Saving your old .env in .env-save credentials...")
+console.print("[bold green]Alright! Let's get started!")
+
+# Create a backup of the current settings file
+console.print("[green]Saving your old .env in .env-save credentials...")
+try:
     with open(".env", "r") as f:
         with open(".env-save", "w") as f2:
             f2.write(f.read())
+except FileNotFoundError:
+    console.print("[red]No .env file found.")
 
-"""
+# Begin the setup process.
-
-Begin the setup process.
-
-"""
 
 console.log("Enter your credentials now.")
-cliID = input("Client ID > ")
+client_id = handle_input(
-cliSec = input("Client Secret > ")
+    "Client ID > ",
-user = input("Username > ")
+    False,
-passw = input("Password > ")
+    "[-a-zA-Z0-9._~+/]+=*",
-twofactor = input("2fa Enabled? (yes/no) > ")
+    "That is somehow not a correct ID, try again.",
-opacity = input("Opacity? (range of 0-1) > ")
+    12,
-subreddit = input("Subreddit (without r/) > ")
+    30,
-theme = input("Theme? (light or dark) > ")
+    "The ID should be over 12 and under 30 characters, double check your input.",
-console.log("Attempting to save your credentials...")
+)
-loader = Loader("Saving Credentials...", "Done!").start()
+client_sec = handle_input(
+    "Client Secret > ",
+    False,
+    "[-a-zA-Z0-9._~+/]+=*",
+    "That is somehow not a correct secret, try again.",
+    20,
+    40,
+    "The secret should be over 20 and under 40 characters, double check your input.",
+)
+user = handle_input(
+    "Username > ",
+    False,
+    r"[_0-9a-zA-Z]+",
+    "That is not a valid user",
+    3,
+    20,
+    "A username HAS to be between 3 and 20 characters",
+)
+passw = handle_input("Password > ", False, ".*", "", 8, None, "Password too short")
+twofactor = handle_input(
+    "2fa Enabled? (yes/no) > ",
+    False,
+    r"(yes)|(no)",
+    "You need to input either yes or no",
+)
+opacity = handle_input(
+    "Opacity? (range of 0-1) > ",
+    float,
+    ".*",
+    "You need to input a number between 0 and 1",
+    0,
+    1,
+    "Your number is not between 0 and 1",
+)
+subreddit = handle_input(
+    "Subreddit (without r/) > ",
+    False,
+    r"[_0-9a-zA-Z]+",
+    "This subreddit cannot exist, make sure you typed it in correctly and removed the r/ (or /r/).",
+    3,
+    20,
+    "A subreddit name HAS to be between 3 and 20 characters",
+)
+theme = handle_input(
+    "Theme? (light or dark) > ",
+    False,
+    r"(light)|(dark)",
+    "You need to input 'light' or 'dark'",
+)
+loader = Loader("Attempting to save your credentials...", "Done!").start()
 # you can also put a while loop here, e.g. while VideoIsBeingMade == True: ...
-time.sleep(0.5)
+console.log("Writing to the .env file...")
-console.log("Removing old .env file...")
+with open(".env", "w") as f:
-time.sleep(0.5)
+    f.write(
-console.log("Creating new .env file...")
+        f"""REDDIT_CLIENT_ID="{client_id}"
-with open('.env', 'w') as f:
+REDDIT_CLIENT_SECRET="{client_sec}"
-	f.write(f'REDDIT_CLIENT_ID="{cliID}"\n')
+REDDIT_USERNAME="{user}"
-	time.sleep(0.5)
+REDDIT_PASSWORD="{passw}"
-	f.write(f'REDDIT_CLIENT_SECRET="{cliSec}"\n')
+REDDIT_2FA="{twofactor}"
-	time.sleep(0.5)
+THEME="{theme}"
-	f.write(f'REDDIT_USERNAME="{user}"\n')
+SUBREDDIT="{subreddit}"
-	time.sleep(0.5)
+OPACITY={opacity}
-	f.write(f'REDDIT_PASSWORD="{passw}"\n')
+"""
-	time.sleep(0.5)
+    )
-	f.write(f'REDDIT_2FA="{twofactor}"\n')
+
-	time.sleep(0.5)
+with open(".setup-done-before", "w") as f:
-	f.write(f'THEME="{theme}"\n')
+    f.write(
-	time.sleep(0.5)
+        "This file blocks the setup assistant from running again. Delete this file to run setup again."
-	f.write(f'SUBREDDIT="{subreddit}"\n')
+    )
-	time.sleep(0.5)
-	f.write(f'OPACITY="{opacity}"\n')
-
-with open('.setup-block.txt', 'a') as f:
-	f.write("This file blocks the setup assistant from running again unless you re-run the script.")
 
 loader.stop()
 
 console.log("[bold green]Setup Complete! Returning...")
 
 # Post-Setup: send message and try to run main.py again.
-os.system("python3 main.py")
+subprocess.call("python3 main.py", shell=True)