Update cli.py

cli.py

@@ -1,37 +1,15 @@
 import threading
 import time
 import traceback
-import pickle
-import os
-import requests
-import cloudscraper  # Required for Udemy session handling
+import sys
+
 from base import VERSION, LoginException, Scraper, Udemy, scraper_dict
 from colors import bw, by, fb, fg, fr
-from requests.utils import cookiejar_from_dict, dict_from_cookiejar
 
 # DUCE-CLI
 
-COOKIE_FILE = "udemy_cookies.pkl"  # File to store cookies
-
-
-def save_cookies(session):
-    """Save session cookies as a dictionary"""
-    with open(COOKIE_FILE, "wb") as f:
-        pickle.dump(dict_from_cookiejar(session.cookies), f)  # Convert cookies to a dictionary
-
-
-def load_cookies():
-    """Load cookies from a file if it exists and return as a dictionary"""
-    if os.path.exists(COOKIE_FILE):
-        with open(COOKIE_FILE, "rb") as f:
-            cookies = pickle.load(f)
-            if isinstance(cookies, dict):  # Ensure cookies are stored as a dictionary
-                return cookies
-    return None
-
-
 def create_scraping_thread(site: str):
-    """Creates a separate thread to scrape each site"""
+    """Creates a separate thread for scraping each site."""
     code_name = scraper_dict[site]
     try:
         t = threading.Thread(target=getattr(scraper, code_name), daemon=True)
@@ -43,98 +21,113 @@ def create_scraping_thread(site: str):
         if getattr(scraper, f"{code_name}_length") == -1:
             raise Exception(f"Error in: {site}")
 
-        print(f"Scraping {site} completed successfully.")
+        prev_progress = 0
+        total = getattr(scraper, f"{code_name}_length")
+
+        while not getattr(scraper, f"{code_name}_done"):
+            time.sleep(0.5)
+            current_progress = getattr(scraper, f"{code_name}_progress")
+            percent = (current_progress / total) * 100 if total else 0
+            print(f"[{site}] Progress: {percent:.2f}%")
+            sys.stdout.flush()
+
+        print(f"[{site}] Scraping Completed ✅")
+        sys.stdout.flush()
 
     except Exception as e:
-        error = traceback.format_exc()
-        print(f"Error in {site}: {error}")
+        error = getattr(scraper, f"{code_name}_error", traceback.format_exc())
+        print(f"[ERROR] {site}: {error}")
+        sys.stdout.flush()
 
+##########################################
 
-############## MAIN #############
 udemy = Udemy("cli")
 udemy.load_settings()
 login_title, main_title = udemy.check_for_update()
 
 if "Update" in login_title:
-    print(login_title)
+    print(by + fr + login_title)
+    sys.stdout.flush()
 
-login_successful = False
-session = cloudscraper.create_scraper()  # Use cloudscraper instead of requests.Session()
+############## MAIN #############
 
-# Attempt to use saved cookies first
-cookies = load_cookies()
-if cookies:
-    print("Trying to log in using saved cookies...")
+login_successful = False
+while not login_successful:
     try:
-        session.cookies = cookiejar_from_dict(cookies)  # Convert dict back to cookie jar
-        udemy.client = session  # Attach session to Udemy object
-        udemy.cookie_dict = cookies  # Set the cookie dictionary
-        udemy.get_session_info()  # Check if session is valid
-        print(f"Logged in as {udemy.display_name} using cookies ✅")
-        login_successful = True
-    except LoginException:
-        print("Cookies expired or invalid. Switching to manual login.")
-        os.remove(COOKIE_FILE)  # Delete invalid cookies
-
-# If cookies are not valid, use email/password login
-if not login_successful:
-    while not login_successful:
-        try:
-            if udemy.settings.get("email") and udemy.settings.get("password"):
-                email, password = udemy.settings["email"], udemy.settings["password"]
-                print(f"Trying to log in using saved credentials: {email}")
-            else:
-                email = input("Email: ")
-                password = input("Password: ")
-
+        if udemy.settings["use_browser_cookies"]:
+            udemy.fetch_cookies()
+            login_method = "Browser Cookies"
+        elif udemy.settings["email"] and udemy.settings["password"]:
+            email, password = udemy.settings["email"], udemy.settings["password"]
+            login_method = "Saved Email and Password"
+        else:
+            email = input("Email: ")
+            password = input("Password: ")
+            login_method = "Email and Password"
+
+        print(fb + f"Trying to login using {login_method}")
+        sys.stdout.flush()
+
+        if "Email" in login_method:
             udemy.manual_login(email, password)
-            udemy.get_session_info()  # Ensure login was successful
 
-            # Save successful login credentials
+        udemy.get_session_info()
+        if "Email" in login_method:
             udemy.settings["email"], udemy.settings["password"] = email, password
-            udemy.save_settings()
-
-            # Save cookies after successful login
-            save_cookies(udemy.client)
-
-            print(f"Logged in as {udemy.display_name} ✅")
-            login_successful = True
+        login_successful = True
+    except LoginException as e:
+        print(fr + f"Login Failed: {e}")
+        sys.stdout.flush()
+        if "Browser" in login_method:
+            print("Can't login using cookies. Switching to manual login.")
+            udemy.settings["use_browser_cookies"] = False
+        elif "Email" in login_method:
+            udemy.settings["email"], udemy.settings["password"] = "", ""
 
-        except LoginException as e:
-            print(f"Login Failed: {e}")
-            if "Browser" in login_title:
-                print("Can't login using cookies")
-                os.remove(COOKIE_FILE)  # Delete invalid cookies
-            elif "Email" in login_title:
-                udemy.settings["email"], udemy.settings["password"] = "", ""
-                udemy.save_settings()
+udemy.save_settings()
 
 print(fg + f"Logged in as {udemy.display_name}")
+sys.stdout.flush()
+
+user_dumb = udemy.is_user_dumb()
 
-# Check if the user has valid settings
-if udemy.is_user_dumb():
-    print(bw + fr + "Invalid settings! Exiting.")
+if user_dumb:
+    print(bw + fr + "Invalid user settings. Exiting...")
+    sys.stdout.flush()
     exit()
 
 scraper = Scraper(udemy.sites)
 
 try:
-    # Scrape courses
-    print("Starting to scrape free Udemy courses...")
+    print("🔎 Starting Course Scraping...")
+    sys.stdout.flush()
+
     udemy.scraped_data = scraper.get_scraped_courses(create_scraping_thread)
     time.sleep(0.5)
-    print("\nScraping completed. Enrolling in courses...\n")
 
-    # Start enrolling
+    print("\n✅ Scraping Completed. Starting Enrollment...\n")
+    sys.stdout.flush()
+
     udemy.start_enrolling()
 
-    print(f"\nSuccessfully Enrolled: {udemy.successfully_enrolled_c}")
-    print(f"Amount Saved: {round(udemy.amount_saved_c, 2)} {udemy.currency.upper()}")
-    print(f"Already Enrolled: {udemy.already_enrolled_c}")
-    print(f"Excluded Courses: {udemy.excluded_c}")
-    print(f"Expired Courses: {udemy.expired_c}")
+    udemy.print(
+        f"\n✔ Successfully Enrolled: {udemy.successfully_enrolled_c}", color="green"
+    )
+    udemy.print(
+        f"💰 Amount Saved: {round(udemy.amount_saved_c,2)} {udemy.currency.upper()}",
+        color="light green",
+    )
+    udemy.print(f"🔵 Already Enrolled: {udemy.already_enrolled_c}", color="blue")
+    udemy.print(f"⚠️ Excluded Courses: {udemy.excluded_c}", color="yellow")
+    udemy.print(f"❌ Expired Courses: {udemy.expired_c}", color="red")
+
+    sys.stdout.flush()
 
 except Exception as e:
-    print(f"Error:\n{traceback.format_exc()}\n")
+    error = traceback.format_exc()
+    print(f"\n[ERROR] {error}\n")
+    sys.stdout.flush()
 
-input("Press Enter to exit...")
+# ✅ Remove `input("Press Enter to exit...")` to prevent blocking in Flask
+print("✅ Process Completed!")
+sys.stdout.flush()