feat: add zenodo dataset commands

Author: olevski

Cargo.lock

@@ -31,6 +31,8 @@ snafu = { version = "0.8.5" }
 tokio = { version = "1", features = ["full"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 walkdir = "2"
+tabled = "0.20.0"
+chrono = "0.4.43"
 futures = { version = "0.3" }
 regex = { version = "1.11.0" }
 iso8601-timestamp = { version = "0.2.17" }
@@ -47,6 +49,7 @@ openidconnect = { version = "3.5.0", default-features = false, features = [
 ] }
 directories = { version = "5.0" }
 comrak = { version = "0.28.0", optional = true }
+md5 = "0.8.0"
 
 [features]
 default = ["reqwest/default-tls"] # link against system library

Cargo.toml

@@ -1,9 +1,15 @@
 pub mod deposit;
 pub mod zenodo;
+mod zenodo_api;
 
-use super::Context;
-use clap::Parser;
-use snafu::Snafu;
+use super::Context as ParentContext;
+use clap::{Parser, ValueEnum};
+use snafu::{ResultExt, Snafu};
+
+#[derive(Debug, Clone, ValueEnum)]
+pub enum Provider {
+    Zenodo,
+}
 
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -21,24 +27,54 @@ pub struct Input {
 #[derive(Parser, Debug)]
 pub enum DatasetCommand {
     Deposit {
+        #[arg(long, default_value = "zenodo")]
+        provider: Provider,
         #[command(subcommand)]
         cmd: DepositCommand,
     },
 }
 
 #[derive(Parser, Debug)]
 pub enum DepositCommand {
-    #[command()]
+    #[command(name = "cp")]
     CopyFiles(deposit::CopyInput),
+    #[command(name = "ls")]
+    ListDeposits(deposit::ListInput),
+    #[command(name = "lsf")]
+    ListFiles(deposit::ListFiles),
+}
+
+pub struct Context {
+    pub parent: ParentContext,
+    pub provider: Provider,
+}
+
+impl Context {
+    pub fn new(ctx: ParentContext, provider: Provider) -> Context {
+        Context {
+            parent: ctx,
+            provider,
+        }
+    }
 }
 
 impl Input {
-    pub async fn exec(&self, _ctx: Context) -> Result<(), Error> {
-        match self.subcmd {
-            DatasetCommand::Deposit { cmd: _ } => {
-                print!("Hi");
-                Ok(())
-            }
+    pub async fn exec(&self, ctx: ParentContext) -> Result<(), Error> {
+        match &self.subcmd {
+            DatasetCommand::Deposit { provider, cmd } => match cmd {
+                DepositCommand::CopyFiles(input) => input
+                    .exec(Context::new(ctx, provider.clone()))
+                    .await
+                    .context(DepositSnafu),
+                DepositCommand::ListDeposits(input) => input
+                    .exec(Context::new(ctx, provider.clone()))
+                    .await
+                    .context(DepositSnafu),
+                DepositCommand::ListFiles(input) => input
+                    .exec(Context::new(ctx, provider.clone()))
+                    .await
+                    .context(DepositSnafu),
+            },
         }
     }
 }

src/cli/cmd/dataset.rs

@@ -1,14 +1,10 @@
 use super::zenodo;
-use super::Context;
-use clap::{Parser, ValueEnum};
+use super::{Context, Provider};
+use clap::Parser;
 use snafu::{ResultExt, Snafu};
 use std::env::VarError;
 use std::path::PathBuf;
-
-#[derive(Debug, Clone, ValueEnum)]
-pub enum Provider {
-    Zenodo,
-}
+use tabled::builder::Builder;
 
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -22,29 +18,82 @@ pub enum Error {
 /// Copies the data from a location into a data deposit
 #[derive(Parser, Debug)]
 pub struct CopyInput {
-    /// The id of the deposit the data should be copied to.
-    #[arg()]
-    pub deposit_id: String,
-
-    /// The provider for the dataset
-    #[arg()]
-    pub provider: Provider,
-
     /// The source directory where the files to be copied can be found.
     #[arg()]
     pub source_dir: PathBuf,
+
+    /// The id of the deposit the data should be copied to.
+    #[arg()]
+    pub deposit_id: String,
 }
 
 impl CopyInput {
-    pub async fn exec(&self, _ctx: Context) -> Result<(), Error> {
-        match self.provider {
+    pub async fn exec(&self, ctx: Context) -> Result<(), Error> {
+        match ctx.provider {
             Provider::Zenodo => {
                 let token = std::env::var("ZENODO_API_KEY").context(EnvVarMissingSnafu)?;
-                let clnt = zenodo::ZenodoClient::new(token);
+                let clnt = zenodo::ZenodoClient::new(token, ctx.parent.opts.verbose > 1);
                 clnt.upload_files(&self.deposit_id, &self.source_dir)
                     .await
                     .context(ZenodoSnafu)
             }
         }
     }
 }
+
+/// List all depositions for the specific provider
+#[derive(Parser, Debug)]
+pub struct ListInput {}
+
+impl ListInput {
+    pub async fn exec(&self, ctx: Context) -> Result<(), Error> {
+        match ctx.provider {
+            Provider::Zenodo => {
+                let token = std::env::var("ZENODO_API_KEY").context(EnvVarMissingSnafu)?;
+                let clnt = zenodo::ZenodoClient::new(token, ctx.parent.opts.verbose > 1);
+                let deps = clnt.get_depositions().await.context(ZenodoSnafu)?;
+                let mut table = Builder::default();
+                table.push_record(["ID", "Title", "State", "Created at"]);
+                for d in deps {
+                    table.push_record([
+                        d.id.to_string(),
+                        d.title,
+                        d.state,
+                        d.created
+                            .to_rfc3339_opts(chrono::SecondsFormat::Secs, false),
+                    ]);
+                }
+                println!("{}", table.build());
+                Ok(())
+            }
+        }
+    }
+}
+
+/// List all files in a specific deposit
+#[derive(Parser, Debug)]
+pub struct ListFiles {
+    deposit_id: String,
+}
+
+impl ListFiles {
+    pub async fn exec(&self, ctx: Context) -> Result<(), Error> {
+        match ctx.provider {
+            Provider::Zenodo => {
+                let token = std::env::var("ZENODO_API_KEY").context(EnvVarMissingSnafu)?;
+                let clnt = zenodo::ZenodoClient::new(token, ctx.parent.opts.verbose > 1);
+                let files = clnt
+                    .list_files(&self.deposit_id)
+                    .await
+                    .context(ZenodoSnafu)?;
+                let mut table = Builder::default();
+                table.push_record(["Filename", "Size", "Checksum"]);
+                for f in files {
+                    table.push_record([f.filename, f.filesize.to_string(), f.checksum]);
+                }
+                println!("{}", table.build());
+                Ok(())
+            }
+        }
+    }
+}