Consistent naming for methods. Return error instead of panic with expect.

Author: Neloreck

crates/xray-db/src/data/particles/particle_effect.rs

@@ -7,7 +7,7 @@ use crate::data::particles::particle_effect_editor_data::ParticleEffectEditorDat
 use crate::data::particles::particle_effect_frame::ParticleEffectFrame;
 use crate::data::particles::particle_effect_sprite::ParticleEffectSprite;
 use crate::export::LtxImportExport;
-use crate::file_import::{read_ini_optional_field, read_ltx_field};
+use crate::file_import::{read_ltx_field, read_ltx_optional_field};
 use byteorder::{ByteOrder, WriteBytesExt};
 use serde::{Deserialize, Serialize};
 use xray_chunk::{
@@ -299,17 +299,17 @@ impl LtxImportExport for ParticleEffect {
       flags: read_ltx_field("flags", section)?,
       frame: ParticleEffectFrame::import_optional(&Self::get_frame_section(section_name), ltx)?,
       sprite: ParticleEffectSprite::import(&Self::get_sprite_section(section_name), ltx)?,
-      time_limit: read_ini_optional_field("time_limit", section)?,
+      time_limit: read_ltx_optional_field("time_limit", section)?,
       collision: ParticleEffectCollision::import_optional(
         &Self::get_collision_section(section_name),
         ltx,
       )?,
-      velocity_scale: read_ini_optional_field("velocity_scale", section)?,
+      velocity_scale: read_ltx_optional_field("velocity_scale", section)?,
       description: ParticleDescription::import_optional(
         &Self::get_description_section(section_name),
         ltx,
       )?,
-      rotation: read_ini_optional_field("rotation", section)?,
+      rotation: read_ltx_optional_field("rotation", section)?,
       editor_data: ParticleEffectEditorData::import_optional(
         &Self::get_editor_data_section(section_name),
         ltx,

crates/xray-db/src/file_import.rs

@@ -22,7 +22,7 @@ pub fn read_ltx_field<T: FromStr>(field_name: &str, section: &Section) -> XRayRe
 }
 
 /// Read optional value from ltx section and parse it as provided T type.
-pub fn read_ini_optional_field<T: FromStr>(
+pub fn read_ltx_optional_field<T: FromStr>(
   field_name: &str,
   section: &Section,
 ) -> XRayResult<Option<T>> {

crates/xray-db/src/ogf/ogf_file.rs

@@ -80,11 +80,11 @@ impl OgfFile {
   pub fn read_motion_refs_from_path<T: ByteOrder, P: AsRef<Path>>(
     path: &P,
   ) -> XRayResult<Vec<String>> {
-    Self::read_motions_refs_from_file::<T>(File::open(path)?)
+    Self::read_motion_refs_from_file::<T>(File::open(path)?)
   }
 
   /// Read only list of motion refs specifically and skip other data parts.
-  pub fn read_motions_refs_from_file<T: ByteOrder>(file: File) -> XRayResult<Vec<String>> {
+  pub fn read_motion_refs_from_file<T: ByteOrder>(file: File) -> XRayResult<Vec<String>> {
     let mut reader: ChunkReader = ChunkReader::from_file(file)?;
     let chunks: Vec<ChunkReader> = reader.read_children();
 

crates/xray-db/src/spawn/spawn_file.rs

@@ -11,7 +11,7 @@ use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 use xray_chunk::{find_required_chunk_by_id, ChunkReader, ChunkWriter};
-use xray_error::XRayResult;
+use xray_error::{XRayError, XRayResult};
 use xray_utils::{assert_equal, assert_length, open_export_file};
 
 /// Descriptor of generic spawn file used by xray game engine.
@@ -80,8 +80,17 @@ impl SpawnFile {
 
   /// Write spawn file data to the file by provided path.
   pub fn write_to_path<T: ByteOrder, P: AsRef<Path>>(&self, path: &P) -> XRayResult {
-    fs::create_dir_all(path.as_ref().parent().expect("Spawn file parent directory"))?;
-    self.write_to::<T>(&mut open_export_file(path)?)
+    let path_ref: &Path = path.as_ref();
+
+    if let Some(parent) = path_ref.parent() {
+      fs::create_dir_all(parent)?;
+      self.write_to::<T>(&mut open_export_file(path)?)
+    } else {
+      Err(XRayError::new_not_found_error(format!(
+        "Spawn file parent directory was not found for {:?}",
+        path_ref.to_str()
+      )))
+    }
   }
 
   /// Write spawn file data to the writer.