Fixed project creation and sdk issues for windows, dang bugs

Fixed some bugs on Windows release.

src/main.rs

@@ -87,6 +87,10 @@ enum SdkCommands {
 }
 
 fn main() -> Result<()> {
+    // Enable colors on Windows
+    #[cfg(windows)]
+    colored::control::set_virtual_terminal(true).ok();
+    
     let cli = Cli::parse();
     
     print_banner();

src/sdk/android.rs

@@ -8,19 +8,33 @@ use colored::*;
 
 const ANDROID_SDK_URL_LINUX: &str = "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip";
 const ANDROID_SDK_URL_MAC: &str = "https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip";
+const ANDROID_SDK_URL_WINDOWS: &str = "https://dl.google.com/android/repository/commandlinetools-win-11076708_latest.zip";
 
 pub fn install(sdk_path: &Path) -> Result<()> {
+    // Check if SDK exists AND is complete
     if sdk_path.exists() {
+        match verify(sdk_path) {
+            Ok(_) => {
                 println!("{} Android SDK already installed at: {}", 
                     "✓".green(), 
                     sdk_path.display()
                 );
                 return Ok(());
             }
+            Err(_) => {
+                println!("{} Android SDK found but incomplete, reinstalling...", 
+                    "⚠".yellow()
+                );
+                // Continue with installation
+            }
+        }
+    }
     
     println!("{}", "Installing Android SDK...".bright_yellow());
     
-    let url = if cfg!(target_os = "macos") {
+    let url = if cfg!(target_os = "windows") {
+        ANDROID_SDK_URL_WINDOWS
+    } else if cfg!(target_os = "macos") {
         ANDROID_SDK_URL_MAC
     } else {
         ANDROID_SDK_URL_LINUX
@@ -58,11 +72,37 @@ pub fn install(sdk_path: &Path) -> Result<()> {
     let mut archive = zip::ZipArchive::new(file)?;
     
     std::fs::create_dir_all(sdk_path)?;
-    archive.extract(sdk_path)?;
+    archive.extract(sdk_path)
+        .context("Failed to extract Android SDK")?;
     
     // Cleanup
     std::fs::remove_file(&temp_zip)?;
     
+    // The zip extracts to cmdline-tools/ but we need it in cmdline-tools/latest/
+    let extracted_tools = sdk_path.join("cmdline-tools");
+    let target_location = sdk_path.join("cmdline-tools").join("latest");
+    
+    if extracted_tools.exists() && !target_location.exists() {
+        println!("Reorganizing cmdline-tools directory structure...");
+        
+        let temp_dir = sdk_path.join("cmdline-tools-temp");
+        std::fs::rename(&extracted_tools, &temp_dir)
+            .context("Failed to rename cmdline-tools to temp directory")?;
+        
+        std::fs::create_dir_all(&target_location)
+            .context("Failed to create cmdline-tools/latest directory")?;
+        
+        for entry in std::fs::read_dir(&temp_dir)? {
+            let entry = entry?;
+            let dest = target_location.join(entry.file_name());
+            std::fs::rename(entry.path(), dest)
+                .with_context(|| format!("Failed to move {} to latest/", entry.file_name().to_string_lossy()))?;
+        }
+        
+        std::fs::remove_dir_all(&temp_dir)
+            .context("Failed to remove temporary directory")?;
+    }
+    
     // Install required packages
     install_packages(sdk_path)?;
     
@@ -74,68 +114,120 @@ pub fn install(sdk_path: &Path) -> Result<()> {
 fn install_packages(sdk_path: &Path) -> Result<()> {
     println!("Installing Android SDK packages...");
     
-    let sdkmanager = sdk_path
+    let sdkmanager_path = sdk_path.join("cmdline-tools").join("latest").join("bin");
-        .join("cmdline-tools/bin/sdkmanager");
+    
+    let sdkmanager = if cfg!(target_os = "windows") {
+        sdkmanager_path.join("sdkmanager.bat")
+    } else {
+        sdkmanager_path.join("sdkmanager")
+    };
     
     if !sdkmanager.exists() {
-        // Try alternate location
+        anyhow::bail!(
-        let alt = sdk_path.join("cmdline-tools/latest/bin/sdkmanager");
+            "sdkmanager not found at expected location: {}\n\
-        if alt.exists() {
+             Directory structure may be incorrect.",
-            return run_sdkmanager(&alt, sdk_path);
+            sdkmanager.display()
+        );
     }
     
-        // Need to move cmdline-tools to correct location
+    println!("Found sdkmanager at: {}", sdkmanager.display());
-        let from = sdk_path.join("cmdline-tools");
-        let to = sdk_path.join("cmdline-tools/latest");
-        if from.exists() {
-            std::fs::create_dir_all(sdk_path.join("cmdline-tools"))?;
-            std::fs::rename(&from, &to)?;
-            return run_sdkmanager(&to.join("bin/sdkmanager"), sdk_path);
-        }
-    }
     
     run_sdkmanager(&sdkmanager, sdk_path)
 }
 
 fn run_sdkmanager(sdkmanager: &Path, sdk_root: &Path) -> Result<()> {
-    use std::process::Command;
+    use std::process::{Command, Stdio};
     use std::io::Write;
     
-    // Accept licenses
+    println!("Accepting licenses...");
-    let mut yes_cmd = Command::new("yes");
-    let yes_output = yes_cmd.output()?;
     
-    let mut cmd = Command::new(sdkmanager);
+    // Build command based on OS
-    cmd.arg("--sdk_root")
+    let mut cmd = if cfg!(target_os = "windows") {
-        .arg(sdk_root)
+        let mut c = Command::new("cmd");
-        .arg("--licenses")
+        c.arg("/c");
-        .stdin(std::process::Stdio::piped())
+        c.arg(sdkmanager);
-        .spawn()?
+        c
-        .stdin
+    } else {
-        .as_mut()
-        .unwrap()
-        .write_all(&yes_output.stdout)?;
-    
-    // Install packages
         Command::new(sdkmanager)
-        .arg("--sdk_root")
+    };
-        .arg(sdk_root)
+    
+    cmd.arg(format!("--sdk_root={}", sdk_root.display()))
+        .arg("--licenses")
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+    
+    let mut child = cmd.spawn()
+        .context("Failed to spawn sdkmanager for licenses")?;
+    
+    // Write 'y' responses to accept all licenses
+    if let Some(mut stdin) = child.stdin.take() {
+        // Create a string with many 'y' responses
+        let responses = "y\n".repeat(20);
+        stdin.write_all(responses.as_bytes())
+            .context("Failed to write license responses")?;
+        // Explicitly drop stdin to close the pipe
+        drop(stdin);
+    }
+    
+    let output = child.wait_with_output()
+        .context("Failed to wait for license acceptance")?;
+    
+    if !output.status.success() {
+        eprintln!("License stderr: {}", String::from_utf8_lossy(&output.stderr));
+        eprintln!("License stdout: {}", String::from_utf8_lossy(&output.stdout));
+        println!("{} License acceptance may have failed, continuing anyway...", "⚠".yellow());
+    } else {
+        println!("{} Licenses accepted", "✓".green());
+    }
+    
+    println!("Installing SDK packages (this may take a few minutes)...");
+    
+    // Build command for package installation
+    let mut cmd = if cfg!(target_os = "windows") {
+        let mut c = Command::new("cmd");
+        c.arg("/c");
+        c.arg(sdkmanager);
+        c
+    } else {
+        Command::new(sdkmanager)
+    };
+    
+    let status = cmd
+        .arg(format!("--sdk_root={}", sdk_root.display()))
         .arg("platform-tools")
         .arg("platforms;android-34")
         .arg("build-tools;34.0.0")
-        .status()?;
+        .stdout(Stdio::inherit())
+        .stderr(Stdio::inherit())
+        .status()
+        .context("Failed to run sdkmanager for package installation")?;
+    
+    if !status.success() {
+        anyhow::bail!("Failed to install Android SDK packages");
+    }
     
     Ok(())
 }
 
 pub fn verify(sdk_path: &Path) -> Result<()> {
     if !sdk_path.exists() {
-        anyhow::bail!("Android SDK not found at: {}", sdk_path.display());
+        anyhow::bail!(
+            "Android SDK not found at: {}\n\
+             Run 'weevil sdk install' to download it automatically,\n\
+             or install manually from: https://developer.android.com/studio#command-tools",
+            sdk_path.display()
+        );
     }
     
     let platform_tools = sdk_path.join("platform-tools");
     if !platform_tools.exists() {
-        anyhow::bail!("Android SDK incomplete: platform-tools not found");
+        anyhow::bail!(
+            "Android SDK incomplete: platform-tools not found\n\
+             Expected at: {}\n\
+             Run 'weevil sdk install' to complete the installation",
+            platform_tools.display()
+        );
     }
     
     Ok(())