`eaa264b`

canonicalize paths in import_entry, improve import diagnostics

Authored by

espadonne 1 month ago

Status	File	+	-
M	`src/cmd/import.rs`	12	3
M	`src/db/store.rs`	1	1

src/cmd/import.rsmodified

      // Find max score for normalization
      let max_score = entries.iter().map(|(_, s)| *s).fold(0.0f64, f64::max);
 +    let total_found = entries.len();
++
      // Normalize and import
 +    let mut skipped = 0;
      for (path, score) in entries {
          // Scale score to 0-MAX_IMPORT_SCORE range
          let normalized = if max_score > 0.0 {
 .0
          };
 -        if db.import_entry(&path, normalized.max(1.0)).is_ok() {
 -            total_imported += 1;
 +        match db.import_entry(&path, normalized.max(1.0)) {
 +            Ok(()) => total_imported += 1,
 +            Err(_) => skipped += 1,
+         }
+     }
      if total_imported > 0 {
          db.save()?;
 -        println!("Imported {} entries (scores normalized to 1-{})", total_imported, MAX_IMPORT_SCORE as u32);
 +    }
++
 +    println!("Found {} entries, imported {} (scores normalized to 1-{})",
 +        total_found, total_imported, MAX_IMPORT_SCORE as u32);
 +    if skipped > 0 {
 +        println!("Skipped {} entries (excluded or unresolvable paths)", skipped);
+     }
      Ok(())

src/db/store.rsmodified

      /// Import an entry with a specific score (for importing from zoxide).
      pub fn import_entry<P: AsRef<Path>>(&mut self, path: P, score: f64) -> Result<(), DatabaseError> {
 -        let path = PathBuf::from(path.as_ref());
 +        let path = self.canonicalize_path(path)?;
          // Skip if excluded
          if self.is_excluded(&path) {