Add flag to delete database file and report clean results

Author: Hendrik van Antwerpen

stack-graphs/src/storage.rs

@@ -101,29 +101,28 @@ impl SQLiteWriter {
 
     /// Clean file data from the database.  If a path is given, data for all descendants of
     /// that path is cleaned.  Otherwise, data for all files is cleaned.
-    pub fn clean<P: AsRef<Path>>(&mut self, path: Option<P>) -> Result<()> {
-        if let Some(path) = path {
+    pub fn clean<P: AsRef<Path>>(&mut self, path: Option<P>) -> Result<usize> {
+        let count = if let Some(path) = path {
             let file = format!("{}%", path.as_ref().to_string_lossy());
             self.conn.execute("BEGIN;", [])?;
             self.conn
                 .execute("DELETE FROM file_paths WHERE file LIKE ?", [&file])?;
             self.conn
                 .execute("DELETE FROM root_paths WHERE file LIKE ?", [&file])?;
-            self.conn
+            let count = self
+                .conn
                 .execute("DELETE FROM graphs WHERE file LIKE ?", [&file])?;
             self.conn.execute("COMMIT;", [])?;
+            count
         } else {
-            self.conn.execute_batch(
-                r#"
-                        BEGIN;
-                        DELETE FROM file_paths;
-                        DELETE FROM root_paths;
-                        DELETE FROM graphs;
-                        COMMIT;
-                    "#,
-            )?;
-        }
-        Ok(())
+            self.conn.execute("BEGIN;", [])?;
+            self.conn.execute("DELETE FROM file_paths", [])?;
+            self.conn.execute("DELETE FROM root_paths", [])?;
+            let count = self.conn.execute("DELETE FROM graphs", [])?;
+            self.conn.execute("COMMIT;", [])?;
+            count
+        };
+        Ok(count)
     }
 
     fn init(conn: &Connection) -> Result<()> {

tree-sitter-stack-graphs/src/cli/clean.rs

@@ -9,6 +9,7 @@ use clap::ArgGroup;
 use clap::Args;
 use clap::ValueHint;
 use stack_graphs::storage::SQLiteWriter;
+use std::path::Path;
 use std::path::PathBuf;
 
 use super::util::path_exists;
@@ -19,7 +20,7 @@ use super::util::provided_or_default_database_path;
 #[clap(group(
     ArgGroup::new("paths")
         .required(true)
-        .args(&["source-paths", "all"]),
+        .args(&["source-paths", "all", "delete"]),
 ))]
 pub struct CleanArgs {
     /// Source file or directory paths.
@@ -40,21 +41,53 @@ pub struct CleanArgs {
     )]
     pub database: Option<PathBuf>,
 
+    /// Remove all data from the database.
     #[clap(long, short = 'a')]
     pub all: bool,
+
+    /// Delete the database file.
+    #[clap(long)]
+    pub delete: bool,
+
+    #[clap(long, short = 'v')]
+    pub verbose: bool,
 }
 
 impl CleanArgs {
     pub fn run(&self) -> anyhow::Result<()> {
         let db_path = provided_or_default_database_path(&self.database)?;
+        if self.delete {
+            self.delete(&db_path)
+        } else {
+            self.clean(&db_path)
+        }
+    }
+
+    fn delete(&self, db_path: &Path) -> anyhow::Result<()> {
+        if !db_path.exists() {
+            return Ok(());
+        }
+        std::fs::remove_file(db_path)?;
+        if self.verbose {
+            println!("deleted database {}", db_path.display());
+        }
+        Ok(())
+    }
+
+    fn clean(&self, db_path: &Path) -> anyhow::Result<()> {
         let mut db = SQLiteWriter::open(&db_path)?;
-        if self.all {
-            db.clean(None::<&PathBuf>)?;
+        let count = if self.all {
+            db.clean(None::<&PathBuf>)?
         } else {
+            let mut count = 0usize;
             for path in &self.source_paths {
                 let path = path.canonicalize()?;
-                db.clean(Some(path))?;
+                count += db.clean(Some(path))?;
             }
+            count
+        };
+        if self.verbose {
+            println!("removed data for {} files", count);
         }
         Ok(())
     }