cache nuke, cache rm bugfix to cache add

Author: jfhbrook

Diff for: nopkg/README.md

@@ -3,12 +3,10 @@
 ## TODO
 
 - Cache
-  - Implement `nopkg cache show`
-    - Add `--since` and `--max-age` flags
-    - Add time zone conversion flag
-  - Implement `nopkg cache remove`
-  - Implement `nopkg cache nuke`
   - Implement `nopkg cache update`
+  - Add `--since` and `--max-age` flags to relevant commands
+  - Add TZ conversion to `nopkg cache show`
+    - Add time zone conversion flag
 - Install
   - Load manifest
   - Load lockfile

Diff for: nopkg/src/cache/index.rs

@@ -5,7 +5,7 @@ use anyhow::Result;
 use chrono::{DateTime, Utc};
 use refinery::embed_migrations;
 use rusqlite::{Connection, Row, Statement};
-use tracing::trace;
+use tracing::debug;
 use xdg::BaseDirectories;
 
 use crate::cache::id::get_id;
@@ -14,7 +14,7 @@ use crate::cache::id::get_id;
 fn place_index(dirs: &BaseDirectories) -> Result<PathBuf> {
     let path = dirs.place_cache_file("index.json")?;
 
-    trace!("Placing index at {:?}", path);
+    debug!("Placing index at {:?}", path);
 
     Ok(path)
 }
@@ -40,6 +40,7 @@ fn from_timestamp(timestamp: f64) -> DateTime<Utc> {
 pub(crate) fn map_entry(row: &Row) -> std::result::Result<Entry, rusqlite::Error> {
     let url = row.get(0)?;
     let id = row.get(1)?;
+    debug!("mapping entry");
     let modified_at = from_timestamp(row.get(2)?);
 
     Ok(Entry {
@@ -70,13 +71,20 @@ impl Index {
 
         self.db.execute(
             "insert into files (url, id, modified_at) values (?1, ?2, ?3) \
-            on conflict(id) do update set url = ?1, modified_at = ?2",
+            on conflict(id) do update set url = ?1, modified_at = ?3;",
             (url, &id, &modified_at),
         )?;
 
         Ok(())
     }
 
+    pub(crate) fn remove_file(&mut self, url_or_id: &str) -> Result<()> {
+        self.db
+            .execute("delete from files where url = ?1 or id = ?1;", (url_or_id,))?;
+
+        Ok(())
+    }
+
     pub(crate) fn entries(&self) -> Result<Statement> {
         let stmt = self.db.prepare("select url, id, modified_at from files;")?;
         Ok(stmt)

Diff for: nopkg/src/cache/mod.rs

@@ -12,15 +12,19 @@ use crate::cache::download::download_file;
 use crate::cache::id::get_id;
 use crate::cache::index::Index;
 
-fn file_path(url: &str) -> Result<PathBuf> {
-    let id = get_id(url)?;
-
-    let path = format!("file/{}", id.as_str());
+fn id_path(id: &str) -> Result<PathBuf> {
+    let path = format!("file/{}", id);
     let path = Path::new(&path);
 
     Ok(path.to_path_buf())
 }
 
+fn url_path(url: &str) -> Result<PathBuf> {
+    let id = get_id(url)?;
+    let path = id_path(id.as_str())?;
+    Ok(path)
+}
+
 /*
 fn unpacked_file_path(url: &str, path: &str) -> Result<PathBuf> {
     let id = get_id(url)?;
@@ -40,7 +44,7 @@ fn repo_path(url: &str) -> Result<PathBuf> {
 }
 
 pub(crate) struct Cache {
-    dirs: BaseDirectories,
+    pub(crate) dirs: BaseDirectories,
     pub(crate) index: Index,
 }
 
@@ -55,16 +59,41 @@ impl Cache {
         Ok(Cache { dirs, index })
     }
 
-    // TODO: Should these take &str?
+    pub(crate) fn destroy(&self) -> Result<()> {
+        let path = self.dirs.get_cache_home();
+        std::fs::remove_dir_all(path)?;
+        Ok(())
+    }
+
     pub(crate) fn place_file(&self, url: &str) -> Result<PathBuf> {
-        let path = file_path(url)?;
+        let path = url_path(url)?;
         let path = self.dirs.place_cache_file(path)?;
 
         trace!("Placing {} at {:?}", url, path);
 
         Ok(path)
     }
 
+    pub(crate) fn find_file(&self, url_or_id: &str) -> Result<Option<PathBuf>> {
+        let path = self.find_file_by_id(url_or_id)?;
+
+        if let Some(path) = path {
+            return Ok(Some(path));
+        }
+
+        Ok(self.find_file_by_url(url_or_id)?)
+    }
+
+    pub(crate) fn find_file_by_id(&self, id: &str) -> Result<Option<PathBuf>> {
+        let path = id_path(id)?;
+        Ok(self.dirs.find_cache_file(path))
+    }
+
+    pub(crate) fn find_file_by_url(&self, url: &str) -> Result<Option<PathBuf>> {
+        let path = url_path(url)?;
+        Ok(self.dirs.find_cache_file(path))
+    }
+
     /*
     pub(crate) fn place_unpacked_file(&self, url: &str, path: &str) -> Result<PathBuf> {
         let unpacked_path = unpacked_file_path(url, path)?;
@@ -96,6 +125,17 @@ pub(crate) async fn get_file(cache: &mut Cache, url: &str) -> Result<PathBuf> {
     Ok(path)
 }
 
+pub(crate) fn remove_file(cache: &mut Cache, url_or_id: &str) -> Result<()> {
+    let path = cache.find_file(url_or_id)?;
+
+    if let Some(path) = path {
+        std::fs::remove_file(path)?;
+    }
+
+    cache.index.remove_file(url_or_id)?;
+    Ok(())
+}
+
 // TODO: git clone
 // TODO: git checkout
 // TODO: git pull

Diff for: nopkg/src/commands/cache.rs

@@ -3,15 +3,23 @@ use chrono::{DateTime, Local};
 use tabled::{builder::Builder, settings::Style};
 
 use crate::cache::index::map_entry;
-use crate::cache::{Cache, get_file};
+use crate::cache::{Cache, get_file, remove_file};
 
 pub(crate) async fn cache_add_command(url: &String) -> Result<()> {
     let mut cache = Cache::new()?;
     get_file(&mut cache, url).await?;
     Ok(())
 }
 
-pub(crate) fn cache_clean_command() -> Result<()> {
+pub(crate) fn cache_remove_command(url: &String) -> Result<()> {
+    let mut cache = Cache::new()?;
+    remove_file(&mut cache, url)?;
+    Ok(())
+}
+
+pub(crate) fn cache_destroy_command() -> Result<()> {
+    let cache = Cache::new()?;
+    cache.destroy()?;
     Ok(())
 }
 
@@ -26,7 +34,10 @@ pub(crate) fn cache_show_command() -> Result<()> {
 
     root_builder.push_record(["cache entries"]);
 
+    let mut seen = false;
+
     for entry in entries {
+        seen = true;
         let entry = entry?;
 
         // TODO: Flag for when to do this conversion
@@ -45,6 +56,10 @@ pub(crate) fn cache_show_command() -> Result<()> {
         root_builder.push_record([format!("{}", entry_table)]);
     }
 
+    if !seen {
+        root_builder.push_record(["(the cache is empty)"]);
+    }
+
     let mut root_table = root_builder.build();
     root_table.with(Style::rounded());
 

Diff for: nopkg/src/main.rs

@@ -11,7 +11,9 @@ mod manifest;
 mod solver;
 
 use crate::commands::add::add_command;
-use crate::commands::cache::{cache_add_command, cache_clean_command, cache_show_command};
+use crate::commands::cache::{
+    cache_add_command, cache_destroy_command, cache_remove_command, cache_show_command,
+};
 use crate::commands::completion::completion_command;
 use crate::commands::init::init_command;
 use crate::commands::install::install_command;
@@ -83,9 +85,14 @@ enum CacheCommand {
         url: String,
     },
 
+    /// Remove a url from the cache
+    Remove {
+        url: String,
+    },
+
     // Clear the cache
     #[clap(alias = "nuke")]
-    Clear,
+    Destroy,
 
     // Show the state of the cache
     Show,
@@ -133,7 +140,8 @@ async fn main() -> Result<()> {
         } => add_command(url, file, unpack, manifest_path),
         Commands::Cache { command } => match &command {
             CacheCommand::Add { url } => cache_add_command(url).await,
-            CacheCommand::Clear => cache_clean_command(),
+            CacheCommand::Remove { url } => cache_remove_command(url),
+            CacheCommand::Destroy => cache_destroy_command(),
             CacheCommand::Show => cache_show_command(),
         },
         Commands::Completion { shell } => {