asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: extract digest and compression type handling into common command functions

Browse Source
This commit is contained in:
Andrew Phillips
2025-05-14 21:54:45 -03:00
committed by Andrew Phillips (aider)
parent 947ed55fb7
commit d1edd20845
2 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/modes/save.rs
View File

@@ -1,8 +1,8 @@
use anyhow::{Context, Result, anyhow};
use gethostname::gethostname;
use anyhow::{anyhow, Context, Result};
use is_terminal::IsTerminal;
use std::collections::HashMap;
use std::io::{self, Read};
use std::str::FromStr;
use std::io::{self, Read, Write};
use clap::Command;
use clap::error::ErrorKind;
@@ -10,10 +10,10 @@ use log::debug;
use rusqlite::Connection;
use std::path::PathBuf;
use crate::compression_engine::{CompressionType, get_compression_engine};
use crate::compression_engine::get_compression_engine;
use crate::db::{self};
use crate::digest_engine::{DigestType, get_digest_engine};
use crate::modes::common::{get_meta_from_env, store_item_digest_value};
use crate::digest_engine::get_digest_engine;
use crate::modes::common::{get_meta_from_env, store_item_digest_value, cmd_args_compression_type, cmd_args_digest_type};
use chrono::Utc;
pub fn mode_save(
@@ -36,35 +36,14 @@ pub fn mode_save(
tags.push("none".to_string());
}
// Get the digest type to use
let digest_name = args
.item
.digest
.clone()
.unwrap_or(DigestType::Sha256.to_string());
let compression_name = args
.item
.compression
.unwrap_or(crate::compression_engine::default_compression_type().to_string());
use gethostname::gethostname;
use std::io::Write;
let compression_type_opt = CompressionType::from_str(&compression_name);
if compression_type_opt.is_err() {
cmd.error(
ErrorKind::InvalidValue,
format!("Unknown compression type: {}", compression_name),
)
.exit();
}
let compression_type = compression_type_opt.unwrap();
let digest_type = cmd_args_digest_type(cmd, args);
let compression_type = cmd_args_compression_type(cmd, args);
debug!("MAIN: Compression type: {}", compression_type);
debug!("MAIN: Digest type: {}", digest_type);
// Create a new digest engine
let digest_type = DigestType::from_str(&digest_name).unwrap_or(DigestType::Sha256);
let mut digest_engine = get_digest_engine(digest_type.clone());
let compression_engine =
get_compression_engine(compression_type.clone()).expect("Unable to get compression engine");
let mut item = db::Item {
id: None,
@@ -133,8 +112,6 @@ pub fn mode_save(
let mut stdout = io::stdout().lock();
let mut buffer = [0; libc::BUFSIZ as usize];
let compression_engine =
get_compression_engine(compression_type.clone()).expect("Unable to get compression engine");
let mut item_out: Box<dyn Write> =
compression_engine
.create(item_path.clone())