Merge pull request #117 from ascmitc/dev/fix113

(Temporary) fix for issue #113.

ascmhl/cli/ascmhl.py

@@ -41,6 +41,7 @@ def update(*args, **kwargs):
 mhltool_cli.add_command(commands.flatten)
 mhltool_cli.add_command(commands.info)
 mhltool_cli.add_command(commands.xsd_schema_check)
+mhltool_cli.add_command(commands.hash)
 
 
 if __name__ == "__main__":

ascmhl/commands.py

@@ -716,6 +716,24 @@ def _compare_and_log_directory_hashes(
 # TODO def verify_single_file_subcommand(root_path, verbose):
 
 
+@click.command()
+@click.argument("file_path", type=click.Path(exists=True))
+@click.option(
+    "--hash_format",
+    "-h",
+    type=click.Choice(ascmhl_supported_hashformats),
+    multiple=False,
+    required=True,
+    help="Algorithm",
+)
+def hash(file_path, hash_format):
+    """
+    Create and print a hash value for a file
+    """
+    result = hash_file(file_path, hash_format)
+    logger.info(hash_format + " (" + file_path + ") = " + result)
+
+
 @click.command()
 @click.argument("root_path", type=click.Path(exists=True))
 @click.option(

ascmhl/history.py

@@ -326,7 +326,13 @@ def _resolve_hash_list_references(self) -> None:
                 history = self.child_history_mappings[reference_path]
                 referenced_hash_list = history.hash_list_with_file_name(os.path.basename(reference.path))
                 assert referenced_hash_list is not None
-                assert referenced_hash_list.generate_reference_hash() == reference.reference_hash
+                generated_hash = referenced_hash_list.generate_reference_hash()
+                if generated_hash != reference.reference_hash:
+                    logger.error("ASC MHL file: " + hash_list.file_path)
+                    logger.error('  referenced manifest file "' + referenced_hash_list.file_path + '"')
+                    logger.error("  should have hash:  " + reference.reference_hash)
+                    logger.error("  but file has hash: " + generated_hash)
+
                 hash_list.referenced_hash_lists.append(referenced_hash_list)
 
     # writing new generations