Add record parameter overriding

Cargo.toml

@@ -20,10 +20,11 @@ cmd = ["clap", "tracing-error", "tracing-subscriber"]
 aes-gcm = { version = "0.10.3", features = ["std"] }
 chrono = { version = "0.4", features = ["arbitrary"] }
 color-eyre = "0.6.3"
+derive_more = "0.99.17"
 ed25519-dalek = { version = "2.1.1", features = ["rand_core", "pem"] }
 futures = "0.3.30"
 include_dir = { version = "0.7.4", features = ["nightly"] }
-rrr = { git = "https://github.com/recursive-record-registry/rrr.git", rev = "782db4752ee74fc56199151e5b261f33b32cfbfa" }
+rrr = { git = "https://github.com/recursive-record-registry/rrr.git", rev = "826ae06afaf769a64bdb215ba507e69f78fc1a0e" }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_bytes = "0.11.14"
 serde_with = "3.8.1"

README.md

@@ -16,3 +16,10 @@ Launch it by running the following:
     # On Unix
     target/release/rrr-make
     ```
+
+## TODO
+* [ ] Better error reporting for incomplete record parameters
+* [ ] Output registry staging
+    * [ ] Checking whether the stored record is identical to the to-be-written one
+    * [ ] `published` directory
+    * [ ] `revisions` directory

src/cmd/mod.rs

@@ -21,12 +21,12 @@ pub enum Command {
         /// Path to a source directory.
         #[arg(short, long, default_value = ".")]
         input_directory: PathBuf,
-        /// Path to a directory in which to put the RRR registry.
-        #[arg(short, long, default_value = "target")]
-        output_directory: PathBuf,
         /// Force existing files to be overwritten.
         #[arg(short, long, default_value = "false")]
         force: bool,
+        /// Whether a new revision should be created in the published directory.
+        #[arg(long, default_value = "false")]
+        publish: bool,
     },
 }
 
@@ -39,13 +39,13 @@ impl Command {
             }
             Command::Make {
                 input_directory,
-                output_directory,
                 force,
+                publish,
             } => {
                 let input_registry = OwnedRegistry::load(input_directory).await?;
                 let input_root_record = input_registry.load_root_record().await?;
                 let mut output_registry = Registry::create(
-                    output_directory,
+                    input_registry.get_staging_directory_path(),
                     RegistryConfig::from(&input_registry),
                     force,
                 )

src/lib.rs

@@ -3,8 +3,9 @@ use futures::{future::BoxFuture, FutureExt};
 use record::OwnedRecord;
 use registry::OwnedRegistry;
 use rrr::{
-    crypto::encryption::EncryptionAlgorithm,
-    record::{Record, RecordKey, RecordMetadata, RecordName, SuccessionNonce},
+    record::{
+        segment::SegmentEncryption, Record, RecordKey, RecordMetadata, RecordName, SuccessionNonce,
+    },
     registry::{Registry, WriteLock},
     utils::serde::BytesOrAscii,
 };
@@ -13,6 +14,7 @@ use tokio::io::AsyncReadExt;
 pub mod assets;
 pub mod error;
 pub mod owned;
+pub mod util;
 
 #[cfg(feature = "cmd")]
 pub mod cmd;
@@ -61,10 +63,16 @@ pub fn make_recursive<'a>(
                 &input_registry.signing_keys,
                 &hashed_key,
                 &output_record,
-                0.into(),                              // TODO
-                0,                                     // TODO
-                &[],                                   // TODO
-                Some(&EncryptionAlgorithm::Aes256Gcm), // TODO
+                0.into(), // TODO
+                0,        // TODO
+                &[],      // TODO
+                input_record
+                    .config
+                    .parameters
+                    .encryption
+                    .as_ref()
+                    .map(SegmentEncryption::from)
+                    .as_ref(),
                 force,
             )
             .await?;