work in progress

idaholab · Oct 31, 2024 · 77b5e67 · 77b5e67
1 parent 1905171
commit 77b5e67
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/maltest/maltest.py b/src/maltest/maltest.py
@@ -12,7 +12,13 @@
 import signal
 import sys
 
-from maltest.utils import MalcolmVM, MalcolmTestCollection, ShuttingDown, set_malcolm_vm_info
+from maltest.utils import (
+    MalcolmVM,
+    MalcolmTestCollection,
+    ShuttingDown,
+    set_malcolm_vm_info,
+    shakey_file_hash,
+)
 
 ###################################################################################################
 script_name = os.path.basename(__file__)
@@ -321,9 +327,13 @@ def main():
                     for pcapFile in pcaps:
                         # TODO: would it be better to use SFTP for this? or even the upload interface?
                         # TODO: Assuming the Malcolm directory like this might not be very robust
-                        malcolmVm.CopyFile(
-                            pcapFile, f'/home/{args.vmImageUsername}/Malcolm/pcap/upload/', tolerateFailure=True
-                        )
+                        pcapFileParts = os.path.splitext(pcapFile)
+                        if pcapHash := shakey_file_hash(pcapFile):
+                            malcolmVm.CopyFile(
+                                pcapFile,
+                                f'/home/{args.vmImageUsername}/Malcolm/pcap/upload/{pcapHash}{pcapFileParts[1]}',
+                                tolerateFailure=True,
+                            )
 
                 # TODO: wait until all data has been processed (no new documents are being indexed for X amount of time)
 

diff --git a/src/maltest/utils.py b/src/maltest/utils.py
@@ -2,6 +2,7 @@
 
 import ast
 import glob
+import hashlib
 import json
 import mmguero
 import os
@@ -31,6 +32,15 @@
 )
 
 
+###################################################################################################
+def shakey_file_hash(filename, digest_len=8):
+    try:
+        with open(filename, 'rb', buffering=0) as f:
+            return hashlib.file_digest(f, 'shake_256').hexdigest(digest_len)
+    except:
+        return None
+
+
 ###################################################################################################
 def set_malcolm_vm_info(info):
     global MalcolmVmInfo