Refactor function signatures for consistency and readability across commands, crypto, db, parser, and scanner modules. Simplified code formatting by removing unnecessary line breaks.

Author: shiva-hack

src-tauri/src/commands.rs

@@ -118,10 +118,7 @@ pub fn compare_envs(
 // ── Vault management ─────────────────────────────────────────────────
 
 #[tauri::command]
-pub fn setup_vault(
-    state: State<'_, AppState>,
-    master_pw: String,
-) -> Result<(), String> {
+pub fn setup_vault(state: State<'_, AppState>, master_pw: String) -> Result<(), String> {
     let mut vs = vault_state().lock();
     let (salt, password_hash) = vs.setup(&master_pw).map_err(|e| e.to_string())?;
 
@@ -137,10 +134,7 @@ pub fn setup_vault(
 }
 
 #[tauri::command]
-pub fn unlock_vault(
-    state: State<'_, AppState>,
-    master_pw: String,
-) -> Result<bool, String> {
+pub fn unlock_vault(state: State<'_, AppState>, master_pw: String) -> Result<bool, String> {
     let db = state.db.lock();
 
     let salt = db
@@ -216,10 +210,7 @@ pub fn change_password(
 }
 
 #[tauri::command]
-pub fn export_all(
-    state: State<'_, AppState>,
-    target_dir: String,
-) -> Result<u32, String> {
+pub fn export_all(state: State<'_, AppState>, target_dir: String) -> Result<u32, String> {
     let vs = vault_state().lock();
     let encryptor = vs.get_encryptor().ok_or("Vault is locked")?;
     let db = state.db.lock();
@@ -228,14 +219,10 @@ pub fn export_all(
     let mut exported = 0u32;
 
     for project in &projects {
-        let files = db
-            .get_env_files(&project.id)
-            .map_err(|e| e.to_string())?;
+        let files = db.get_env_files(&project.id).map_err(|e| e.to_string())?;
 
         for file in &files {
-            let vars = db
-                .get_env_variables(&file.id)
-                .map_err(|e| e.to_string())?;
+            let vars = db.get_env_variables(&file.id).map_err(|e| e.to_string())?;
 
             let mut content = String::new();
             for var in &vars {
@@ -253,8 +240,7 @@ pub fn export_all(
             let out_path = std::path::Path::new(&target_dir)
                 .join(&project.name)
                 .join(&file.filename);
-            std::fs::create_dir_all(out_path.parent().unwrap())
-                .map_err(|e| e.to_string())?;
+            std::fs::create_dir_all(out_path.parent().unwrap()).map_err(|e| e.to_string())?;
             std::fs::write(&out_path, &content).map_err(|e| e.to_string())?;
             exported += 1;
         }
@@ -287,10 +273,7 @@ pub fn search(
 // ── File watcher ─────────────────────────────────────────────────────
 
 #[tauri::command]
-pub fn start_watcher(
-    app: tauri::AppHandle,
-    state: State<'_, AppState>,
-) -> Result<(), String> {
+pub fn start_watcher(app: tauri::AppHandle, state: State<'_, AppState>) -> Result<(), String> {
     let db = state.db.lock();
     let roots = db.get_roots().map_err(|e| e.to_string())?;
     let root_paths: Vec<String> = roots.iter().map(|r| r.path.clone()).collect();

src-tauri/src/crypto/mod.rs

@@ -42,9 +42,9 @@ impl Encryptor {
             .hash_password(password.as_bytes(), &salt_str)
             .map_err(|e| CryptoError::KeyDerivationFailed(e.to_string()))?;
 
-        let hash_output = hash.hash.ok_or_else(|| {
-            CryptoError::KeyDerivationFailed("No hash output".to_string())
-        })?;
+        let hash_output = hash
+            .hash
+            .ok_or_else(|| CryptoError::KeyDerivationFailed("No hash output".to_string()))?;
 
         let bytes = hash_output.as_bytes();
         let mut key = [0u8; 32];
@@ -72,8 +72,8 @@ impl Encryptor {
 
     /// Verify a password against a stored hash
     pub fn verify_password(password: &str, hash: &str) -> Result<bool, CryptoError> {
-        let parsed_hash = PasswordHash::new(hash)
-            .map_err(|e| CryptoError::KeyDerivationFailed(e.to_string()))?;
+        let parsed_hash =
+            PasswordHash::new(hash).map_err(|e| CryptoError::KeyDerivationFailed(e.to_string()))?;
         Ok(Argon2::default()
             .verify_password(password.as_bytes(), &parsed_hash)
             .is_ok())
@@ -119,10 +119,7 @@ impl VaultState {
     }
 
     /// Set up a new vault with a master password
-    pub fn setup(
-        &mut self,
-        password: &str,
-    ) -> Result<(Vec<u8>, String), CryptoError> {
+    pub fn setup(&mut self, password: &str) -> Result<(Vec<u8>, String), CryptoError> {
         let salt = Encryptor::generate_salt();
         let key = Encryptor::derive_key(password, &salt)?;
         let password_hash = Encryptor::hash_password(password)?;

src-tauri/src/db/mod.rs

@@ -290,8 +290,10 @@ impl Database {
             "DELETE FROM env_vars WHERE file_id IN (SELECT id FROM env_files WHERE project_id = ?1)",
             params![project_id],
         )?;
-        self.conn
-            .execute("DELETE FROM env_files WHERE project_id = ?1", params![project_id])?;
+        self.conn.execute(
+            "DELETE FROM env_files WHERE project_id = ?1",
+            params![project_id],
+        )?;
         Ok(())
     }
 
@@ -380,10 +382,7 @@ impl Database {
         if let Some(pids) = project_ids {
             if !pids.is_empty() {
                 let placeholders: Vec<String> = pids.iter().map(|_| "?".to_string()).collect();
-                sql.push_str(&format!(
-                    " AND p.id IN ({})",
-                    placeholders.join(",")
-                ));
+                sql.push_str(&format!(" AND p.id IN ({})", placeholders.join(",")));
             }
         }
         if let Some(t) = tiers {
@@ -424,9 +423,9 @@ impl Database {
 
         for fid in file_ids {
             // Get file info
-            let mut stmt = self.conn.prepare(
-                "SELECT id, filename, tier FROM env_files WHERE id = ?1",
-            )?;
+            let mut stmt = self
+                .conn
+                .prepare("SELECT id, filename, tier FROM env_files WHERE id = ?1")?;
             let file = stmt.query_row(params![fid], |row| {
                 Ok(ComparisonFile {
                     file_id: row.get(0)?,
@@ -453,7 +452,8 @@ impl Database {
         let keys: Vec<ComparisonKey> = all_keys
             .into_iter()
             .map(|key| {
-                let presence: Vec<bool> = file_key_sets.iter().map(|ks| ks.contains(&key)).collect();
+                let presence: Vec<bool> =
+                    file_key_sets.iter().map(|ks| ks.contains(&key)).collect();
                 let count = presence.iter().filter(|&&p| p).count();
                 let status = if count == file_ids.len() {
                     "all".to_string()

src-tauri/src/parser/mod.rs

@@ -68,12 +68,7 @@ pub fn parse_env_contents(contents: &str) -> Vec<ParsedVar> {
             parse_single_quoted(raw_value)
         } else {
             // Unquoted: strip inline comments
-            raw_value
-                .split('#')
-                .next()
-                .unwrap_or("")
-                .trim()
-                .to_string()
+            raw_value.split('#').next().unwrap_or("").trim().to_string()
         };
 
         vars.push(ParsedVar {

src-tauri/src/scanner/mod.rs

@@ -60,7 +60,10 @@ pub fn scan_root(
 ) -> Result<ScanResult, String> {
     let root = Path::new(root_path);
     if !root.exists() || !root.is_dir() {
-        return Err(format!("Root path does not exist or is not a directory: {}", root_path));
+        return Err(format!(
+            "Root path does not exist or is not a directory: {}",
+            root_path
+        ));
     }
 
     // Step 1: Discover projects
@@ -212,9 +215,7 @@ fn discover_projects(root: &Path) -> Vec<(PathBuf, String)> {
 
         if is_marker || is_dotnet {
             if let Some(parent) = entry.path().parent() {
-                projects
-                    .entry(parent.to_path_buf())
-                    .or_insert(filename);
+                projects.entry(parent.to_path_buf()).or_insert(filename);
             }
         }
     }
@@ -238,7 +239,10 @@ fn find_env_files(project_path: &Path) -> Vec<PathBuf> {
             let name = entry.file_name().to_string_lossy().to_string();
             if name.starts_with(".env") && entry.file_type().map(|t| t.is_file()).unwrap_or(false) {
                 // Skip .env.example files
-                if name.ends_with(".example") || name.ends_with(".sample") || name.ends_with(".template") {
+                if name.ends_with(".example")
+                    || name.ends_with(".sample")
+                    || name.ends_with(".template")
+                {
                     continue;
                 }
                 env_files.push(entry.path());