NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add debug segment percentage (#93)

Browse source 
* Fix file extension unwrap panic

* Change log output name from crunchy_cli_core to crunchy_cli

* Add percentage output
This commit is contained in:
ByteDream 2022-12-28 15:45:33 +01:00 • committed by GitHub
parent 9e0edda7c2
commit 03db38b31c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crunchy-cli-core/src/cli/log.rs
View file

@ -75,8 +75,9 @@ impl CliLogger {
// replace the 'progress' prefix if this function is invoked via 'progress!'
record
.target()
.replacen("progress", "crunchy_cli", 1)
.replacen("progress_end", "crunchy_cli", 1),
.replacen("crunchy_cli_core", "crunchy_cli", 1)
.replacen("progress_end", "crunchy_cli", 1)
.replacen("progress", "crunchy_cli", 1),
format!("{:?}", thread::current().id())
.replace("ThreadId(", "")
.replace(')', ""),

8
crunchy-cli-core/src/cli/utils.rs
View file

@ -80,14 +80,18 @@ pub async fn download_segments(
let mut buf = response.bytes().await?.to_vec();
buf = VariantSegment::decrypt(buf.borrow_mut(), segment.key)?.to_vec();
let mut c = thread_count.lock().unwrap();
debug!(
"Downloaded and decrypted segment {} ({})",
"Downloaded and decrypted segment [{}/{} {:.2}%] {}",
num + (i * cpus),
total_segments,
((*c + 1) as f64 / total_segments as f64) * 100f64,
segment.url
);
thread_sender.send((num + (i * cpus), buf))?;
*thread_count.lock().unwrap() += 1;
*c += 1;
}
Ok(())

4
crunchy-cli-core/src/utils/os.rs
View file

@ -46,8 +46,8 @@ pub fn free_file(mut path: PathBuf) -> PathBuf {
while path.exists() {
i += 1;
let ext = path.extension().unwrap().to_string_lossy();
let mut filename = path.file_stem().unwrap().to_str().unwrap();
let ext = path.extension().unwrap_or_default().to_string_lossy();
let mut filename = path.file_stem().unwrap_or_default().to_str().unwrap();
if filename.ends_with(&format!(" ({})", i - 1)) {
filename = filename.strip_suffix(&format!(" ({})", i - 1)).unwrap();