From 79637e993283d4a849ebf957a9d6553f63fe3a0a Mon Sep 17 00:00:00 2001
From: Jens Steidl <Jens.Steidl@slub-dresden.de>
Date: Wed, 19 Jan 2022 13:14:35 +0100
Subject: [PATCH] - minor report rework (skipping details more clear)
---
deep_fixitycheck.pl | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/deep_fixitycheck.pl b/deep_fixitycheck.pl
index a8147a2..19341ea 100644
--- a/deep_fixitycheck.pl
+++ b/deep_fixitycheck.pl
@@ -370,7 +370,7 @@ sub stage2_for_ie {
}
}
if ($ie_errors == 0) {
- $report_path->append_utf8(" none\n");
+ $report_path->append_utf8(" no fixity errors\n");
}
# write report
@@ -403,7 +403,6 @@ sub stage2 ($$$$) {
$stat->{errors} = 0;
$stat->{scansize} = 0;
$stat->{begin} = time;
- my $prev_ie = "";
$fh_unsorted_file = $tmp_ies_unsorted_path->openr();
while (<$fh_unsorted_file>) {
chomp;
@@ -414,7 +413,7 @@ sub stage2 ($$$$) {
my $bfusage = int($bf->key_count() * 100 / $capacity);
print $progressbar->report("parse IE files: %40b running: %L ETA: %E ($count/$cnt_unsorted_files IEs, tfr=$transferrate_in_MBs MB/s, bfu=$bfusage%) \r", ++$count);
my $timestamp = strftime("%Y-%m-%d %H:%M:%S %z (%Z)", localtime(time));
- $report_path->append_utf8("$timestamp, IE $actual_ie with following errors:\n");
+ $report_path->append_utf8("$timestamp, IE $actual_ie:\n");
if (! -f $actual_ie ) {
$report_path->append_utf8("IE file does not exist (anymore)!");
$stat->{errors}++;
@@ -433,8 +432,14 @@ sub stage2 ($$$$) {
}
my $ret = parse_iexml($actual_ie, $recovery);
my $unseen = bloomfilter_to_unseen($bf, $ret->{files});
- if (scalar @{$unseen} == 0) {$report_path->append_utf8("skipped because files already checked using IE $prev_ie\n");}
- $prev_ie = $actual_ie;
+ my ($fcount_all, $fcount_unseen) = (scalar @{$ret->{files}}, scalar @{$unseen});
+ if ($fcount_unseen == 0) {
+ $report_path->append_utf8(" all files skipped because already checked\n");
+ }
+ elsif ($fcount_all > $fcount_unseen) {
+ my $fdiff = $fcount_all - $fcount_unseen;
+ $report_path->append_utf8(" $fdiff of $fcount_all files skipped because already checked\n");
+ }
###
$bf = stage2_for_ie($unseen, $bf, $map_path, $report_path, $stat);
}
--
GitLab