From 241d0d6315ec7d68af974223ed35efa0e8bd9808 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 5 Mar 2025 17:50:35 +0100
Subject: [PATCH] Solved clone bug

---
 main.py | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/main.py b/main.py
index 3259da3..1dd8881 100644
--- a/main.py
+++ b/main.py
@@ -266,6 +266,7 @@ def get_repo_dir(repositories_base_dir:str,repo:{})->str:
         sys.exit(1)
 
 def clone_repos(selected_repos, repositories_base_dir: str, all_repos, preview=False):
+    import subprocess  # ensure subprocess is imported
     for repo in selected_repos:
         repo_identifier = get_repo_identifier(repo, all_repos)
         repo_dir = get_repo_dir(repositories_base_dir, repo)
@@ -276,17 +277,32 @@ def clone_repos(selected_repos, repositories_base_dir: str, all_repos, preview=F
         parent_dir = os.path.dirname(repo_dir)
         os.makedirs(parent_dir, exist_ok=True)
         
-        try:
-            target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}:{repo.get('account')}/{repo.get('repository')}"
-            clone_url = f"git@{target}.git"
-            print(f"[INFO] Attempting to clone '{repo_identifier}' using SSH from {clone_url} into '{repo_dir}'.")
-            run_command(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, preview=preview)
-        except Exception as exception1:
-            print(f"[WARNING] SSH clone failed for '{repo_identifier}' (error: {exception1}). Trying HTTPS...")
-            target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}/{repo.get('account')}/{repo.get('repository')}"
-            clone_url = f"https://{target}.git"
-            print(f"[INFO] Attempting to clone '{repo_identifier}' using HTTPS from {clone_url} into '{repo_dir}'.")
-            run_command(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, preview=preview)
+        # Attempt SSH clone first.
+        target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}:{repo.get('account')}/{repo.get('repository')}"
+        clone_url = f"git@{target}.git"
+        print(f"[INFO] Attempting to clone '{repo_identifier}' using SSH from {clone_url} into '{repo_dir}'.")
+        
+        if preview:
+            print(f"[Preview] Would run: git clone {clone_url} {repo_dir} in {parent_dir}")
+            # Simulate a successful clone in preview mode.
+            result = subprocess.CompletedProcess(args=[], returncode=0)
+        else:
+            result = subprocess.run(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, shell=True)
+        
+        # If SSH clone returns an error code, ask user whether to try HTTPS.
+        if result.returncode != 0:
+            print(f"[WARNING] SSH clone failed for '{repo_identifier}' with return code {result.returncode}.")
+            choice = input("Do you want to attempt HTTPS clone instead? (y/N): ").strip().lower()
+            if choice == 'y':
+                target = repo.get("replacement") if repo.get("replacement") else f"{repo.get('provider')}/{repo.get('account')}/{repo.get('repository')}"
+                clone_url = f"https://{target}.git"
+                print(f"[INFO] Attempting to clone '{repo_identifier}' using HTTPS from {clone_url} into '{repo_dir}'.")
+                if preview:
+                    print(f"[Preview] Would run: git clone {clone_url} {repo_dir} in {parent_dir}")
+                else:
+                    subprocess.run(f"git clone {clone_url} {repo_dir}", cwd=parent_dir, shell=True)
+            else:
+                print(f"[INFO] HTTPS clone not attempted for '{repo_identifier}'.")
 
 def deinstall_repos(selected_repos, repositories_base_dir, bin_dir, all_repos, preview=False):
     for repo in selected_repos: