squashme: minor fixes

Author: olevski

Cargo.lock

@@ -23,6 +23,7 @@ openssl = { version = "0.10.75", optional = true }
 reqwest = { version = "0.12.28", default-features = false, features = [
   "json",
   "multipart",
+  "stream",
 ] }
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
@@ -65,7 +66,7 @@ default = ["reqwest/default-tls"] # link against system library
 rustls = [
   "reqwest/rustls-tls",
   "openidconnect/rustls-tls",
-  "self_update/rustls"
+  "self_update/rustls",
 ] # include rustls, ssl library written in rust
 vendored-openssl = ["openssl/vendored"] # include compiled openssl library
 vendored-zlib = [

Cargo.toml

@@ -32,7 +32,15 @@ impl CopyInput {
         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 clnt = zenodo::ZenodoClient::new(
+                    token,
+                    ctx.parent
+                        .opts
+                        .verbosity
+                        .log_level()
+                        .unwrap_or(log::Level::Warn)
+                        > log::Level::Info,
+                );
                 clnt.upload_files(&self.deposit_id, &self.source_dir)
                     .await
                     .context(ZenodoSnafu)
@@ -50,7 +58,15 @@ impl ListInput {
         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 clnt = zenodo::ZenodoClient::new(
+                    token,
+                    ctx.parent
+                        .opts
+                        .verbosity
+                        .log_level()
+                        .unwrap_or(log::Level::Warn)
+                        > log::Level::Info,
+                );
                 let deps = clnt.get_depositions().await.context(ZenodoSnafu)?;
                 let mut table = Builder::default();
                 table.push_record(["ID", "Title", "State", "Created at"]);
@@ -81,7 +97,15 @@ impl ListFiles {
         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 clnt = zenodo::ZenodoClient::new(
+                    token,
+                    ctx.parent
+                        .opts
+                        .verbosity
+                        .log_level()
+                        .unwrap_or(log::Level::Warn)
+                        > log::Level::Info,
+                );
                 let files = clnt
                     .list_files(&self.deposit_id)
                     .await

src/cli/cmd/dataset/deposit.rs

@@ -1,6 +1,6 @@
 use futures::stream::StreamExt;
 use md5::Context as Md5Context;
-use reqwest::header::{HeaderMap, ACCEPT, CONTENT_LENGTH, CONTENT_TYPE};
+use reqwest::header::{ACCEPT, CONTENT_LENGTH, CONTENT_TYPE, HeaderMap};
 use reqwest::{self, Body, Response, StatusCode};
 use serde::de::DeserializeOwned;
 use snafu::{ResultExt, Snafu};