Fix issue #441

Author: Arrowar

.github/.domain/domains.json

@@ -36,10 +36,10 @@
     "time_change": "2025-11-18 07:21:01"
   },
   "streamingcommunity": {
-    "domain": "dk",
-    "full_url": "https://streamingcommunityz.dk/",
-    "old_domain": "bet",
-    "time_change": "2025-11-17 15:24:22"
+    "domain": "lol",
+    "full_url": "https://streamingcommunityz.lol/",
+    "old_domain": "dk",
+    "time_change": "2025-11-21 18:28:02"
   },
   "altadefinizionegratis": {
     "domain": "shop",

StreamingCommunity/Upload/update.py

@@ -109,4 +109,4 @@ def update():
         [yellow]{get_execution_mode()} - [green]Current installed version: [yellow]{current_version} [green]last commit: [white]'[yellow]{latest_commit_message.splitlines()[0]}[white]'\n\
         [cyan]Help the repository grow today by leaving a [yellow]star [cyan]and [yellow]sharing [cyan]it with others online!")
 
-    time.sleep(0.8)
+    time.sleep(1)

StreamingCommunity/run.py

@@ -30,7 +30,6 @@
 
 # Config
 TELEGRAM_BOT = config_manager.get_bool('DEFAULT', 'telegram_bot')
-BYPASS_DNS = config_manager.get_bool('DEFAULT', 'bypass_dns')
 COLOR_MAP = {
     "anime": "red",
     "film_&_serie": "yellow", 

update.py

@@ -13,13 +13,70 @@
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
+from rich.prompt import Prompt
 
 from StreamingCommunity.Upload.version import __author__, __title__
 
+
 # Variable
 max_timeout = 15
 console = Console()
 local_path = os.path.join(".")
+REQUIRED_PROJECT_FILES = {"update.py", "Video"}
+PROJECT_MARKER_FILE = "update.py"
+
+
+def verify_project_directory(directory: str) -> bool:
+    """
+    Verify that we're in the correct project directory by checking for required files.
+    
+    Parameters:
+        - directory (str): The path to verify
+        
+    Returns:
+        - bool: True if this appears to be the correct project directory
+    """
+    if not os.path.isdir(directory):
+        console.print(f"[red]Error: '{directory}' is not a valid directory.")
+        return False
+    
+    marker_path = os.path.join(directory, PROJECT_MARKER_FILE)
+    if not os.path.exists(marker_path):
+        console.print(f"[red]Safety check failed: '{PROJECT_MARKER_FILE}' not found in {os.path.abspath(directory)}")
+        console.print("[yellow]Please ensure you're running this script from the project root directory.")
+        return False
+    
+    return True
+
+
+def dry_run_deletion(directory: str, keep_folder: str, keep_file: str) -> list:
+    """
+    Simulate what would be deleted without actually deleting anything.
+    
+    Parameters:
+        - directory (str): The path to the directory
+        - keep_folder (str): The name of the folder to keep
+        - keep_file (str): The name of the file to keep
+        
+    Returns:
+        - list: Items that would be deleted
+    """
+    if not os.path.exists(directory) or not os.path.isdir(directory):
+        return []
+    
+    skip_folders = {keep_folder, ".git"}
+    skip_files = {keep_file}
+    items_to_delete = []
+    
+    for item in os.listdir(directory):
+        if item in skip_folders or item in skip_files:
+            continue
+        
+        item_path = os.path.join(directory, item)
+        item_type = "directory" if os.path.isdir(item_path) else "file"
+        items_to_delete.append((item, item_type, item_path))
+    
+    return items_to_delete
 
 
 def move_content(source: str, destination: str):
@@ -44,39 +101,45 @@ def move_content(source: str, destination: str):
             shutil.move(source_path, destination_path)
 
 
-def keep_specific_items(directory: str, keep_folder: str, keep_file: str):
+def keep_specific_items(directory: str, keep_folder: str, keep_file: str, dry_run: bool = False):
     """
-    Deletes all items in the given directory except for the specified folder, 
-    the specified file, and the '.git' directory.
+    Deletes all items in the given directory except for the specified folder, the specified file, and the '.git' directory.
 
     Parameters:
         - directory (str): The path to the directory.
         - keep_folder (str): The name of the folder to keep.
         - keep_file (str): The name of the file to keep.
+        - dry_run (bool): If True, only show what would be deleted without deleting.
     """
-    if not os.path.exists(directory) or not os.path.isdir(directory):
-        console.print(f"[red]Error: '{directory}' is not a valid directory.")
-        return
+    if not verify_project_directory(directory):
+        return False
 
-    # Define folders and files to skip
     skip_folders = {keep_folder, ".git"}
     skip_files = {keep_file}
 
-    # Iterate through items in the directory
     for item in os.listdir(directory):
         if item in skip_folders or item in skip_files:
             continue
 
         item_path = os.path.join(directory, item)
         try:
-            if os.path.isdir(item_path):
-                shutil.rmtree(item_path)
-                console.log(f"[green]Removed directory: {item_path}")
-            elif os.path.isfile(item_path):
-                os.remove(item_path)
-                console.log(f"[green]Removed file: {item_path}")
+            if dry_run:
+                item_type = "directory" if os.path.isdir(item_path) else "file"
+                console.log(f"[yellow][DRY RUN] Would remove {item_type}: {item_path}")
+
+            else:
+                if os.path.isdir(item_path):
+                    shutil.rmtree(item_path)
+                    console.log(f"[green]Removed directory: {item_path}")
+
+                elif os.path.isfile(item_path):
+                    os.remove(item_path)
+                    console.log(f"[green]Removed file: {item_path}")
+
         except Exception as e:
             console.log(f"[yellow]Skipping {item_path} due to error: {e}")
+    
+    return True
 
 
 def print_commit_info(commit_info: dict):
@@ -177,41 +240,100 @@ def download_and_extract_latest_commit():
         console.print(f"[red]An unexpected error occurred: {e}")
 
 
-def main_upload(auto_confirm=None):
+def main_upload(auto_confirm=None, dry_run=False):
     """
-    Main function to upload the latest commit of a GitHub repository.
+    Main function to update to the latest commit of a GitHub repository with safety checks.
+    
+    Parameters:
+        - auto_confirm (str or None): 'y', 'n', or None for interactive prompt
+        - dry_run (bool): If True, only show what would be deleted
     """
-
+    
+    # Verify we're in the correct project directory
+    if not verify_project_directory("."):
+        console.print("[red]Aborted: Cannot verify project directory. Refusing to proceed.")
+        return
+    
+    current_dir = os.path.abspath(".")
+    console.print(f"[cyan]Project directory: {current_dir}")
+    
+    # Show what will be deleted
+    items_to_delete = dry_run_deletion(".", "Video", "upload.py")
+    
+    if items_to_delete:
+        console.print("\n[bold yellow]Files and folders that will be deleted:")
+        for item_name, item_type, item_path in items_to_delete:
+            console.print(f"  [red]• {item_type}: {item_name}")
+        console.print()
+    
+    # First confirmation: Basic yes/no
     if auto_confirm is None:
-        # fallback al prompt interattivo
-        from rich.prompt import Prompt
         cmd_insert = Prompt.ask(
-            "[bold red]Are you sure you want to delete all files? (Only 'Video' folder and 'update_version.py' will remain)",
+            "[bold red]Are you sure you want to delete all files except 'Video' folder and 'upload.py'?",
             choices=['y', 'n'],
-            default='y',
+            default='n',
             show_choices=True
         )
+        
     else:
         cmd_insert = auto_confirm
 
-    if cmd_insert.lower().strip() in ('y', 'yes'):
-        console.print("[red]Deleting all files except 'Video' folder and 'update_version.py'...")
-        keep_specific_items(".", "Video", "upload.py")
+    if cmd_insert.lower().strip() not in ('y', 'yes'):
+        console.print("[yellow]Operation cancelled.")
+        return
+
+    # Second confirmation: Require explicit phrase
+    console.print("\n[bold red]WARNING: This action cannot be undone!")
+    confirmation_phrase = "DELETE MY FILES"
+    user_input = Prompt.ask(
+        f"[bold red]Type '{confirmation_phrase}' to confirm deletion",
+        default=""
+    )
+    
+    if user_input.strip() != confirmation_phrase:
+        console.print("[yellow]Confirmation phrase incorrect. Operation cancelled.")
+        return
+    
+    # Perform dry run first
+    if dry_run:
+        console.print("\n[bold cyan]DRY RUN MODE - No files will be deleted")
+        keep_specific_items(".", "Video", "upload.py", dry_run=True)
+        return
+    
+    # Perform actual deletion
+    console.print("[red]Deleting all files except 'Video' folder and 'upload.py'...")
+    if keep_specific_items(".", "Video", "upload.py"):
         download_and_extract_latest_commit()
     else:
-        console.print("[red]Operation cancelled.")
+        console.print("[red]Deletion aborted due to safety check failure.")
 
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Upload the latest commit of a GitHub repository.")
+    parser = argparse.ArgumentParser(
+        description="Safely update to the latest commit of a GitHub repository.",
+        epilog="SAFETY: This script will only work from the project root directory."
+    )
+    parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="Show what would be deleted without actually deleting anything."
+    )
     group = parser.add_mutually_exclusive_group()
-    group.add_argument("-y", "--yes", action="store_true", help="Automatically confirm deletion.")
-    group.add_argument("-n", "--no", action="store_true", help="Automatically cancel deletion.")
+    group.add_argument(
+        "-y", "--yes",
+        action="store_true",
+        help="Skip first confirmation (you'll still need to type the confirmation phrase)."
+    )
+    group.add_argument(
+        "-n", "--no",
+        action="store_true",
+        help="Automatically cancel without prompting."
+    )
     args = parser.parse_args()
 
-    if args.yes:
-        main_upload("y")
-    elif args.no:
+    if args.no:
         main_upload("n")
+    elif args.yes:
+        main_upload("y", dry_run=args.dry_run)
     else:
-        main_upload()
+        main_upload(dry_run=args.dry_run)