impl repo remove, building

Author: Taxrosdev

build_manifest.yml

@@ -0,0 +1,11 @@
+id: "example_package"
+aliases: ["example"]
+
+metadata:
+  name: "Example Package"
+  description: "This is an example package. It should include the entire Flint source Repository."
+  license: "MIT or APACHE-2.0"
+  homepage_url: "https://github.com/TimelessOS/Flint"
+  # This package does not have a version.
+
+directory: src

src/build/mod.rs

@@ -1,37 +1,45 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use std::{
     fs,
     path::{Path, PathBuf},
 };
 
 use crate::{
     chunks::save_tree,
-    crypto::signing::sign,
-    repo::{self, Metadata, PackageManifest, update_manifest},
+    repo::{self, Metadata, PackageManifest, insert_package},
 };
 
 #[derive(serde::Deserialize, serde::Serialize, Clone)]
 struct BuildManifest {
     /// ID of this package, the main alias
     id: String,
     /// Aliases for installation
+    #[serde(default)]
     aliases: Vec<String>,
     /// Package Metadata
     metadata: Metadata,
     /// A list of commands that this will give access to
+    #[serde(default)]
     commands: Vec<String>,
     /// Directory relative to the manifest
     directory: PathBuf,
 }
 
 pub fn build(build_manifest_path: &Path, repo_path: &Path) -> Result<PackageManifest> {
+    let build_manifest_path = &build_manifest_path.canonicalize()?;
+
     let build_manifest: BuildManifest =
         serde_yaml::from_str(&fs::read_to_string(build_manifest_path)?)?;
 
-    let repo_manifest = repo::read_manifest(repo_path)?;
+    let repo_manifest =
+        repo::read_manifest(repo_path).with_context(|| "The target Repostiory does not exist")?;
+
+    let build_manifest_parent = &build_manifest_path
+        .parent()
+        .unwrap_or_else(|| Path::new("/"));
 
     let chunks = save_tree(
-        &build_manifest_path.join(build_manifest.directory),
+        &build_manifest_parent.join(build_manifest.directory),
         &repo_path.join("chunks"),
         repo_manifest.hash_kind,
     )?;
@@ -44,13 +52,7 @@ pub fn build(build_manifest_path: &Path, repo_path: &Path) -> Result<PackageMani
         chunks,
     };
 
-    let package_manifest_serialized = &serde_yaml::to_string(&package_manifest)?;
-
-    update_manifest(
-        repo_path,
-        package_manifest_serialized,
-        &sign(repo_path, package_manifest_serialized)?.to_bytes(),
-    )?;
+    insert_package(&package_manifest, repo_path)?;
 
     Ok(package_manifest)
 }

src/chunks/tree.rs

@@ -29,6 +29,10 @@ pub fn save_tree(
         let hash = hash(hash_kind, &contents);
         let mode = file.metadata()?.permissions().mode() & 0o777;
 
+        if !chunk_store_path.exists() {
+            fs::create_dir_all(chunk_store_path)?;
+        }
+
         let chunk_path = &chunk_store_path.join(get_chunk_filename(&hash, mode));
         if fs::hard_link(file.path(), chunk_path).is_err() {
             fs::write(chunk_path, contents)?;

src/main.rs

@@ -1,8 +1,14 @@
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use comfy_table::Table;
-use flint::repo::{self, update_manifest};
-use std::{fs, path::Path};
+use flint::{
+    build::build,
+    repo::{self, update_manifest},
+};
+use std::{
+    fs,
+    path::{Path, PathBuf},
+};
 
 use crate::{crypto::signing::sign, utils::config::get_repos_dir};
 
@@ -34,7 +40,10 @@ enum Command {
         command: RepoCommands,
     },
     /// Builds a package from a local manifest and directory
-    Build,
+    Build {
+        build_manifest_path: PathBuf,
+        repo_name: String,
+    },
     /// Install a package
     Install,
     /// Remove a package
@@ -151,7 +160,9 @@ fn main() -> Result<()> {
                 remote_url,
             } => todo!(),
 
-            RepoCommands::Remove { repo_name } => todo!(),
+            RepoCommands::Remove { repo_name } => {
+                fs::remove_dir_all(path.join(repo_name))?;
+            }
 
             RepoCommands::Update {
                 homepage_url,
@@ -183,7 +194,12 @@ fn main() -> Result<()> {
             }
         },
 
-        Command::Build => todo!(),
+        Command::Build {
+            build_manifest_path,
+            repo_name,
+        } => {
+            build(&build_manifest_path, &path.join(repo_name))?;
+        }
 
         Command::Install => todo!(),