Migrate atomic_cli to use the derive API #890

Author: joepio

CHANGELOG.md

@@ -5,9 +5,11 @@ By far most changes relate to `atomic-server`, so if not specified, assume the c
 **Changes to JS assets (including the front-end and JS libraries) are not shown here**, but in [`/browser/CHANGELOG`](/browser/CHANGELOG.md).
 See [STATUS.md](server/STATUS.md) to learn more about which features will remain stable.
 
-## [UNRELEASED]
+## [v0.38.0] - UNRELEASED
 
 - Remove `process-management` feature #324 #334
+- Add `atomic_lib::client::search` for building queries
+- Migrate atomic_cli to use the derive API #890
 
 ## [v0.37.0] - 2024-02-01
 

cli/Cargo.toml

@@ -9,11 +9,14 @@ repository = "https://github.com/atomicdata-dev/atomic-server"
 version = "0.37.0"
 
 [dependencies]
-atomic_lib = {version = "0.37.0", path = "../lib", features = ["config", "rdf"]}
-clap = {version = "4", features = ["cargo"]}
+atomic_lib = { version = "0.37.0", path = "../lib", features = [
+    "config",
+    "rdf",
+] }
+clap = { version = "4", features = ["cargo", "derive"] }
 colored = "2"
 dirs = "4"
-edit = {version = "0.1", optional = true}
+edit = { version = "0.1", optional = true }
 promptly = "0.3"
 regex = "1"
 

cli/src/commit.rs

@@ -2,14 +2,11 @@ use crate::Context;
 use atomic_lib::{errors::AtomicResult, Storelike};
 
 /// Apply a Commit using the Set method - create or update a value in a resource
-pub fn set(context: &Context) -> AtomicResult<()> {
-    let subject = argument_to_url(context, "subject")?;
-    let property = argument_to_string(context, "property")?;
-    let value = argument_to_string(context, "value")?;
+pub fn set(context: &Context, subject: &str, property: &str, value: &str) -> AtomicResult<()> {
     // If the resource is not found, create it
-    let mut resource = match context.store.get_resource(&subject) {
+    let mut resource = match context.store.get_resource(subject) {
         Ok(r) => r,
-        Err(_) => atomic_lib::Resource::new(subject),
+        Err(_) => atomic_lib::Resource::new(subject.into()),
     };
     resource.set_shortname(&property, &value, &context.store)?;
     resource.save(&context.store)?;
@@ -18,13 +15,11 @@ pub fn set(context: &Context) -> AtomicResult<()> {
 
 /// Apply a Commit using the Set method, where the value is edited in the user's text editor.
 #[cfg(feature = "native")]
-pub fn edit(context: &Context) -> AtomicResult<()> {
-    let subject = argument_to_url(context, "subject")?;
-    let prop = argument_to_string(context, "property")?;
+pub fn edit(context: &Context, subject: &str, prop: &str) -> AtomicResult<()> {
     // If the resource is not found, create it
     let mut resource = match context.store.get_resource(&subject) {
         Ok(r) => r,
-        Err(_) => atomic_lib::Resource::new(subject),
+        Err(_) => atomic_lib::Resource::new(subject.into()),
     };
     // If the prop is not found, create it
     let current_val = match resource.get_shortname(&prop, &context.store) {
@@ -40,45 +35,16 @@ pub fn edit(context: &Context) -> AtomicResult<()> {
 }
 
 /// Apply a Commit using the Remove method - removes a property from a resource
-pub fn remove(context: &Context) -> AtomicResult<()> {
-    let subject = argument_to_url(context, "subject")?;
-    let prop = argument_to_string(context, "property")?;
-    let mut resource = context.store.get_resource(&subject)?;
+pub fn remove(context: &Context, subject: &str, prop: &str) -> AtomicResult<()> {
+    let mut resource = context.store.get_resource(subject)?;
     resource.remove_propval_shortname(&prop, &context.store)?;
     resource.save(&context.store)?;
     Ok(())
 }
 
 /// Apply a Commit using the destroy method - removes a resource
-pub fn destroy(context: &Context) -> AtomicResult<()> {
-    let subject = argument_to_url(context, "subject")?;
-    let mut resource = context.store.get_resource(&subject)?;
+pub fn destroy(context: &Context, subject: &str) -> AtomicResult<()> {
+    let mut resource = context.store.get_resource(subject)?;
     resource.destroy(&context.store)?;
     Ok(())
 }
-
-/// Parses a single argument as string
-fn argument_to_string(context: &Context, argument: &str) -> AtomicResult<String> {
-    let command_name = context.matches.subcommand_name().unwrap();
-    let subcommand_matches = context.matches.subcommand_matches(command_name).unwrap();
-    let user_arg = subcommand_matches
-        .get_one::<String>(argument)
-        .ok_or(format!("No argument value for {} found", argument))?;
-    Ok(user_arg.to_string())
-}
-
-/// Parses a single argument (URL or Bookmark), should return a valid URL
-fn argument_to_url(context: &Context, argument: &str) -> AtomicResult<String> {
-    let command_name = context.matches.subcommand_name().unwrap();
-    let subcommand_matches = context.matches.subcommand_matches(command_name).unwrap();
-    let user_arg = subcommand_matches
-        .get_one::<String>(argument)
-        .ok_or(format!("No argument value for {} found", argument))?;
-    let id_url: String = context
-        .mapping
-        .lock()
-        .unwrap()
-        .try_mapping_or_url(&String::from(user_arg))
-        .ok_or(&*format!("No url found for {}", user_arg))?;
-    Ok(id_url)
-}