pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 19:56:50 +00:00
Code Issues

feat: show current file name in progress bar

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2024-01-24 13:05:07 +01:00
parent adcce76f5c
commit a6657842c4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/checks/osb.rs
View File

@ -1,7 +1,7 @@
/* /*
* MIT License * MIT License
* *
* Copyright (c) 2023 Comprehensive Cancer Center Mainfranken * Copyright (c) 2024 Comprehensive Cancer Center Mainfranken
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -26,7 +26,7 @@ use std::fs;
use std::io::Read; use std::io::Read;
use std::path::Path; use std::path::Path;
use indicatif::ProgressBar; use indicatif::{ProgressBar, ProgressStyle};
use crate::checks::{osc, CheckNotice}; use crate::checks::{osc, CheckNotice};
@ -54,11 +54,16 @@ pub fn check_file(file: &Path, password: &str) -> Result<Vec<CheckNotice>, Check
let mut result = vec![]; let mut result = vec![];
let progress_bar = ProgressBar::new(archive.len() as u64); let mut progress_bar = ProgressBar::new(archive.len() as u64).with_style(
ProgressStyle::default_bar()
.template("{wide_bar} {msg:32} {pos}/{len}")
.unwrap(),
);
for i in 0..archive.len() { for i in 0..archive.len() {
progress_bar.inc(1); progress_bar.inc(1);
if let Ok(Ok(mut zip_file)) = archive.by_index_decrypt(i, password.as_bytes()) { if let Ok(Ok(mut zip_file)) = archive.by_index_decrypt(i, password.as_bytes()) {
progress_bar.set_message(zip_file.name().to_string());
if zip_file.is_file() && zip_file.name().ends_with(".osc") { if zip_file.is_file() && zip_file.name().ends_with(".osc") {
let mut buf = String::new(); let mut buf = String::new();
let _ = zip_file.read_to_string(&mut buf); let _ = zip_file.read_to_string(&mut buf);
@ -97,7 +102,7 @@ pub fn check_file(file: &Path, password: &str) -> Result<Vec<CheckNotice>, Check
} }
} else { } else {
return Err(CheckNotice::Error { return Err(CheckNotice::Error {
description: format!("Kann Datei nicht lesen"), description: "Kann Datei nicht lesen".to_string(),
line: None, line: None,
}); });
} }