From d08d2ec783cba456c6e4c96026772c4a60ad936e Mon Sep 17 00:00:00 2001 From: David Wendt Date: Sat, 11 Sep 2021 10:34:46 -0400 Subject: [PATCH] Actually copy all the file results field from the child into the parent --- scanner/src/scan.rs | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/scanner/src/scan.rs b/scanner/src/scan.rs index 5dd04fc45..75575a935 100644 --- a/scanner/src/scan.rs +++ b/scanner/src/scan.rs @@ -53,9 +53,40 @@ pub fn scan_file>(exec_path: P, file: DirEntry, name: String) -> for row in reader.deserialize::() { match row { Ok(child_results) => { - file_results.progress = child_results.progress; - file_results.error = child_results.error; - file_results.vm_type = child_results.vm_type; + let FileResults { + name: _name, + hash, + progress, + testing_time, + compressed_len, + uncompressed_len, + error, + compression, + version, + stage_size, + frame_rate, + num_frames, + use_direct_blit, + use_gpu, + use_network_sandbox, + vm_type, + } = child_results; + + file_results.hash = hash; + file_results.progress = progress; + file_results.testing_time = testing_time; + file_results.compressed_len = compressed_len; + file_results.uncompressed_len = uncompressed_len; + file_results.error = error; + file_results.compression = compression; + file_results.version = version; + file_results.stage_size = stage_size; + file_results.frame_rate = frame_rate; + file_results.num_frames = num_frames; + file_results.use_direct_blit = use_direct_blit; + file_results.use_gpu = use_gpu; + file_results.use_network_sandbox = use_network_sandbox; + file_results.vm_type = vm_type; } Err(e) => { file_results.error = Some(e.to_string());