Remove PREFIX option to add-directory

Previously, it could be used inconsistently with the CRATESFYI_PREFIX
environment variable, which was confusing.

Author: jyn514

src/bin/cratesfyi.rs

@@ -388,9 +388,6 @@ enum DatabaseSubcommand {
         /// Path of file or directory
         #[structopt(name = "DIRECTORY")]
         directory: PathBuf,
-        /// Prefix of files in database
-        #[structopt(name = "PREFIX", env = "CRATESFYI_PREFIX")]
-        prefix: String,
     },
 
     /// Remove documentation from the database
@@ -440,8 +437,8 @@ impl DatabaseSubcommand {
                 )?;
             }
 
-            Self::AddDirectory { directory, prefix } => {
-                add_path_into_database(&*ctx.storage()?, &prefix, directory)
+            Self::AddDirectory { directory } => {
+                add_path_into_database(&*ctx.storage()?, &ctx.config()?.prefix, directory)
                     .context("Failed to add directory into database")?;
             }
 

src/db/file.rs

@@ -24,10 +24,10 @@ use std::path::{Path, PathBuf};
 /// and files generated by rustdoc.
 pub fn add_path_into_database<P: AsRef<Path>>(
     storage: &Storage,
-    prefix: &str,
+    prefix: impl AsRef<Path>,
     path: P,
 ) -> Result<(Value, CompressionAlgorithms)> {
-    let (file_list, algorithms) = storage.store_all(prefix, path.as_ref())?;
+    let (file_list, algorithms) = storage.store_all(prefix.as_ref(), path.as_ref())?;
     Ok((
         file_list_to_json(file_list.into_iter().collect()),
         algorithms,

src/storage/mod.rs

@@ -152,7 +152,7 @@ impl Storage {
     // This returns (map<filename, mime type>, set<compression algorithms>).
     pub(crate) fn store_all(
         &self,
-        prefix: &str,
+        prefix: &Path,
         root_dir: &Path,
     ) -> Result<(HashMap<PathBuf, String>, HashSet<CompressionAlgorithm>), Error> {
         let mut file_paths_and_mimes = HashMap::new();
@@ -171,7 +171,7 @@ impl Storage {
             .map(|(file_path, file)| -> Result<_, Error> {
                 let alg = CompressionAlgorithm::default();
                 let content = compress(file, alg)?;
-                let bucket_path = Path::new(prefix).join(&file_path).to_slash().unwrap();
+                let bucket_path = prefix.join(&file_path).to_slash().unwrap();
 
                 let mime = detect_mime(&file_path);
                 file_paths_and_mimes.insert(file_path, mime.to_string());
@@ -464,7 +464,7 @@ mod backend_tests {
             fs::write(path, "data")?;
         }
 
-        let (stored_files, algs) = storage.store_all("prefix", dir.path())?;
+        let (stored_files, algs) = storage.store_all(Path::new("prefix"), dir.path())?;
         assert_eq!(stored_files.len(), files.len());
         for name in &files {
             let name = Path::new(name);