Merge pull request #35 from VolumeGraphics/swapped-nominal-actual

Fix swapped actual and nominal for hash and text-compares
VolumeGraphics · Jun 12, 2023 · d7f5df2 · d7f5df2
2 parents 9dba1a0 + 89e6bf6
commit d7f5df2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -223,6 +223,9 @@ rules:
 
 ## Changelog
 
+### 0.3.1
+- Fix swapped actual and nominal for hash and text-compares
+
 ### 0.3.0
 - Allow RGBA image comparison
 - Add file metadata comparison

diff --git a/src/hash.rs b/src/hash.rs
@@ -59,8 +59,8 @@ impl Default for HashConfig {
 }
 
 pub fn compare_files<P: AsRef<Path>>(
-    actual_path: P,
     nominal_path: P,
+    actual_path: P,
     config: &HashConfig,
 ) -> Result<report::FileCompareResult, Error> {
     let act = config
@@ -73,8 +73,8 @@ pub fn compare_files<P: AsRef<Path>>(
     let diff = if act != nom {
         vec![format!(
             "Nominal file's hash is '{}' actual is '{}'",
-            HEXLOWER.encode(&act),
-            HEXLOWER.encode(&nom)
+            HEXLOWER.encode(&nom),
+            HEXLOWER.encode(&act)
         )]
     } else {
         vec![]

diff --git a/src/html.rs b/src/html.rs
@@ -55,8 +55,8 @@ pub enum Error {
 }
 
 pub fn compare_files<P: AsRef<Path>>(
-    actual_path: P,
     nominal_path: P,
+    actual_path: P,
     config: &HTMLCompareConfig,
 ) -> Result<report::FileCompareResult, Error> {
     let actual = BufReader::new(fat_io_wrap_std(actual_path.as_ref(), &File::open)?);