Fix log references to alocs or prims

Author: dbierek

src/extract/aloc_or_prim_extraction.rs

@@ -16,7 +16,7 @@ impl AlocOrPrimExtraction {
         let runtime_folder_ref = &runtime_folder;
         let aloc_or_prim_type_ref = &aloc_or_prim_type;
         println!("Creating directory '{}' if it doesn't exist.", alocs_or_prims_output_folder);
-        fs::create_dir_all(alocs_or_prims_output_folder_ref).expect("Failed to create aloc or primfolder");
+        fs::create_dir_all(alocs_or_prims_output_folder_ref).expect("Failed to create aloc or prim folder");
         println!("Found {} needed alocs or prims. Using {} threads of ~{} alocs or prims per thread.", aloc_or_prim_count, target_num_threads, aloc_or_prim_count / target_num_threads);
         thread::scope(|scope| {
             let mut handles: Vec<ScopedJoinHandle<()>> = Vec::new();

src/json_serde/entities_json.rs

@@ -13,10 +13,10 @@ pub struct EntitiesJson {
 
 impl EntitiesJson {
     pub fn build_from_nav_json_file(nav_json_file: String) -> EntitiesJson {
-        println!("Building EntitiesJson from nav.json file: {}", nav_json_file);
+        println!("Loading scene from nav.json file: {}", nav_json_file);
         io::stdout().flush().unwrap();
         let nav_json_string = fs::read_to_string(nav_json_file.as_str())
-            .expect("Should have been able to read the file");
+            .expect("Error reading nav.json file");
         return EntitiesJson::build_from_nav_json_string(nav_json_string);
     }
 

src/main.rs

@@ -16,7 +16,7 @@ pub fn main() {
     let needed_aloc_or_prim_hashes = AlocOrPrimExtraction::get_all_aloc_or_prim_hashes(&nav_json, args[5].clone(), args[6].clone());
 
     if needed_aloc_or_prim_hashes.is_empty() {
-        println!("All aloc files already exist. Skipping extraction.");
+        println!("All aloc or prim files already exist. Skipping extraction.");
         io::stdout().flush().unwrap();
     } else {
         if args[6].clone() == "ALOC" {
@@ -31,6 +31,6 @@ pub fn main() {
         let partition_manager = PackageScan::scan_packages(args[1].clone(), args[2].clone()).unwrap();
         AlocOrPrimExtraction::extract_alocs_or_prims(args[4].clone(), needed_aloc_or_prim_hashes, &partition_manager, args[5].clone(), args[6].clone());
     }
-    println!("Done building extracting alocs, pf boxes, and pf seed points from scenario and building output.nav.json.");
+    println!("Done extracting alocs or prims.");
     io::stdout().flush().unwrap();
 }