Skip to content

Commit 2f7773e

Browse files
committed
chore: remove unused deps; improve log output
Signed-off-by: lxl66566 <lxl66566@gmail.com>
1 parent 22c03b7 commit 2f7773e

File tree

5 files changed

+23
-101
lines changed

5 files changed

+23
-101
lines changed

Cargo.lock

Lines changed: 5 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ colored = "3.0.0"
2020
config-file2 = "0.4.1"
2121
const-str = "0.6.2"
2222
copy-metadata = "0.1.0"
23-
die-exit = { version = "0.5.0", features = ["red"] }
24-
enum-tools = "0.5.5"
25-
fuck-backslash = "0.1.0"
2623
log = "0.4"
27-
num_cpus = "1.16.0"
2824
path-absolutize = "3.1.1"
2925
pathdiff = "0.2.3"
3026
pretty_env_logger = "0.5.0"

src/crypt.rs

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ use aes_gcm_siv::{
1111
use anyhow::{Context, Result, anyhow};
1212
use colored::Colorize;
1313
use copy_metadata::copy_metadata;
14-
use die_exit::die;
15-
use log::{debug, info};
14+
use log::{debug, info, warn};
1615
use rayon::{iter::IntoParallelRefIterator, prelude::*};
1716
use sha3::{Digest, Sha3_224};
1817
use tap::Tap;
@@ -102,10 +101,13 @@ fn try_compress(bytes: Box<[u8]>, path: PathBuf, level: u8) -> anyhow::Result<(V
102101
Ok((
103102
compressed,
104103
path.append_ext(COMPRESSED_EXTENSION)
105-
.tap(|p| debug!("Compressed to: {}", p.display())),
104+
.tap(|p| debug!("Compressed to: `{}`", p.display())),
106105
))
107106
} else {
108-
info!("Compressed data size is larger than origin, do not compress.");
107+
info!(
108+
"Compressed data size is larger than origin, do not compress `{}`.",
109+
path.display()
110+
);
109111
Ok((bytes.into_vec(), path))
110112
}
111113
}
@@ -148,7 +150,10 @@ pub fn encrypt_file(
148150
);
149151
return Ok(new_file);
150152
}
151-
println!("Encrypting file: {}", format!("{}", file.display()).green());
153+
info!(
154+
"Encrypting file: `{}`",
155+
format!("{}", file.display()).green()
156+
);
152157
let bytes = fs::read(file).with_context(|| format!("{}", file.display()))?;
153158

154159
let (encrypted, new_file) = {
@@ -168,10 +173,7 @@ pub fn decrypt_file(
168173
file: impl AsRef<Path> + Send + Sync,
169174
key: &'static [u8],
170175
) -> anyhow::Result<PathBuf> {
171-
println!(
172-
"Decrypting file: {}",
173-
format!("{}", file.as_ref().display()).green()
174-
);
176+
info!("Decrypting file: {}", file.as_ref().display());
175177
let new_file = file.as_ref().to_owned();
176178
let bytes = fs::read(&file).with_context(|| format!("{}", file.as_ref().display()))?;
177179

@@ -196,9 +198,10 @@ pub fn decrypt_file(
196198
pub fn encrypt_repo(repo: &'static Repo) -> anyhow::Result<()> {
197199
assert!(!repo.get_key().is_empty(), "Key must not be empty");
198200
let patterns = &repo.conf.crypt_list;
199-
if patterns.is_empty() {
200-
die!("No file to encrypt, please exec `git-se add <FILE>` first.");
201-
}
201+
assert!(
202+
!patterns.is_empty(),
203+
"No file to encrypt, please exec `git-se add <FILE>` first."
204+
);
202205
repo.add_all()?;
203206
let encrypt_result = repo
204207
.ls_files_absolute_with_given_patterns(
@@ -209,10 +212,7 @@ pub fn encrypt_repo(repo: &'static Repo) -> anyhow::Result<()> {
209212
.collect::<Vec<_>>();
210213
encrypt_result.par_iter().for_each(|ret| {
211214
if let Err(err) = ret {
212-
eprintln!(
213-
"{}",
214-
format!("warning: failed to encrypt file: {err}").yellow()
215-
);
215+
warn!("warning: failed to encrypt file: {err}");
216216
}
217217
});
218218
repo.add_all()?;
@@ -242,10 +242,7 @@ pub fn decrypt_repo(repo: &'static Repo, path: Option<impl AsRef<Path>>) -> anyh
242242
.collect::<Vec<_>>();
243243
decrypt_results.par_iter().for_each(|ret| {
244244
if let Err(err) = ret {
245-
eprintln!(
246-
"{}",
247-
format!("warning: failed to decrypt file: {err}").yellow()
248-
);
245+
warn!("warning: failed to decrypt file: {err}");
249246
}
250247
});
251248
repo.add_all()?;

src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ mod utils;
1111

1212
use anyhow::Result;
1313
use crypt::{decrypt_repo, encrypt_repo};
14-
use log::debug;
1514
use repo::Repo;
1615

1716
pub use crate::cli::{Cli, SetField, SubCommand};
@@ -20,8 +19,6 @@ pub use crate::cli::{Cli, SetField, SubCommand};
2019
pub fn run(cli: Cli) -> Result<()> {
2120
let repo = Repo::open(&cli.repo)?;
2221
let repo = Box::leak(Box::new(repo));
23-
let num_cpus = num_cpus::get();
24-
debug!("using blocking thread size: {}", num_cpus * 2);
2522
match cli.command {
2623
SubCommand::Encrypt => encrypt_repo(repo)?,
2724
SubCommand::Decrypt { path } => decrypt_repo(repo, path)?,

src/repo.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use assert2::assert;
88
#[cfg(any(test, debug_assertions))]
99
use colored::Colorize;
1010
use config_file2::LoadConfigFile;
11-
use die_exit::Die;
1211
use log::{debug, info, warn};
1312
use path_absolutize::Absolutize;
1413
use tap::Tap;
@@ -93,7 +92,7 @@ impl Repo {
9392
}
9493
pub fn get_key(&self) -> String {
9594
self.get_config("key")
96-
.die("Key not found, please exec `git-se p` first.")
95+
.expect("Key not found, please exec `git-se p` first.")
9796
}
9897

9998
/// returns the first 16 bytes of sha3-224 of the key.

0 commit comments

Comments
 (0)