Skip to content

Commit

Permalink
Merge pull request #46 from VolumeGraphics/prepare-0.5.3
Browse files Browse the repository at this point in the history
Prepare release 0.5.3
  • Loading branch information
TheAdiWijaya committed Feb 19, 2024
2 parents 452c00e + b01a488 commit c29a2a1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "A flexible rule-based file and folder comparison tool and crate i
repository = "https://github.com/VolumeGraphics/havocompare"
homepage = "https://github.com/VolumeGraphics/havocompare"
documentation = "https://docs.rs/havocompare"
version = "0.5.2"
version = "0.5.3"
edition = "2021"
license = "MIT"
authors = ["Volume Graphics GmbH"]
Expand Down
10 changes: 6 additions & 4 deletions config_scheme.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,15 @@
"type": "object",
"properties": {
"ignore_keys": {
"type": [
"array",
"null"
],
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"sort_arrays": {
"default": false,
"type": "boolean"
}
}
},
Expand Down
6 changes: 2 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,7 @@ pub fn compare_files(
) -> Difference {
let file_name_nominal = nominal.as_ref().to_string_lossy();
let file_name_actual = actual.as_ref().to_string_lossy();
let _file_span = span!(tracing::Level::INFO, "Processing");
let _file_span = _file_span.enter();
let _file_span = span!(tracing::Level::INFO, "Processing").entered();

info!("File: {file_name_nominal} | {file_name_actual}");

Expand Down Expand Up @@ -247,8 +246,7 @@ fn process_rule(
rule: &Rule,
compare_results: &mut Vec<Difference>,
) -> Result<bool, Error> {
let _file_span = span!(tracing::Level::INFO, "Rule");
let _file_span = _file_span.enter();
let _file_span = span!(tracing::Level::INFO, "Rule").entered();
info!("Name: {}", rule.name.as_str());
if !nominal.as_ref().is_dir() {
error!(
Expand Down
9 changes: 3 additions & 6 deletions src/report/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,7 @@ pub(crate) fn create_reports(
rule_differences: &[RuleDifferences],
report_path: impl AsRef<Path>,
) -> Result<(), Error> {
let _reporting_span = span!(tracing::Level::INFO, "Reporting");
let _reporting_span = _reporting_span.enter();
let _reporting_span = span!(tracing::Level::INFO, "Reporting").entered();
let report_dir = report_path.as_ref();
if report_dir.is_dir() {
info!("Delete report folder");
Expand All @@ -604,8 +603,7 @@ pub(crate) fn create_json(
rule_differences: &[RuleDifferences],
report_path: impl AsRef<Path>,
) -> Result<(), Error> {
let _reporting_span = span!(tracing::Level::INFO, "JSON");
let _reporting_span = _reporting_span.enter();
let _reporting_span = span!(tracing::Level::INFO, "JSON").entered();
let report_dir = report_path.as_ref();
let writer = report_dir.join("report.json");
let writer = fat_io_wrap_std(writer, &File::create)?;
Expand All @@ -617,8 +615,7 @@ pub(crate) fn create_html(
rule_differences: &[RuleDifferences],
report_path: impl AsRef<Path>,
) -> Result<(), Error> {
let _reporting_span = span!(tracing::Level::INFO, "HTML");
let _reporting_span = _reporting_span.enter();
let _reporting_span = span!(tracing::Level::INFO, "HTML").entered();
let report_dir = report_path.as_ref();

let mut html_rule_differences: Vec<RenderToHtmlRuleDifferences> = Vec::new();
Expand Down

0 comments on commit c29a2a1

Please sign in to comment.