From 55640490d523e581672cffcf3080c9783e1256aa Mon Sep 17 00:00:00 2001 From: rster2002 Date: Wed, 7 Aug 2024 21:20:25 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20small=20module=20to=20p?= =?UTF-8?q?artials?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib.rs | 2 +- src/modules.rs | 4 ++-- src/modules/logs/content/log_event_content.rs | 18 +++++++++--------- src/modules/partials/mod.rs | 3 +++ src/modules/{small => partials}/models.rs | 0 .../models/small_system_info.rs | 2 +- src/modules/small/mod.rs | 3 --- src/modules/state/models/carrier_state.rs | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/modules/partials/mod.rs rename src/modules/{small => partials}/models.rs (100%) rename src/modules/{small => partials}/models/small_system_info.rs (77%) delete mode 100644 src/modules/small/mod.rs diff --git a/src/lib.rs b/src/lib.rs index cca5852e..9fc7970f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -36,7 +36,7 @@ pub use modules::outfitting; pub use modules::ship; pub use modules::ship_locker; pub use modules::shipyard; -pub use modules::small; +pub use modules::partials; pub use modules::state; pub use modules::station; pub use modules::status; diff --git a/src/modules.rs b/src/modules.rs index a5289a13..d7ddc8c2 100644 --- a/src/modules.rs +++ b/src/modules.rs @@ -101,10 +101,10 @@ pub mod station; /// player can encounter. pub mod thargoid; -/// This module contains 'small' models that are used to create representations for certain things +/// This module contains partial models that are used to create representations for certain things /// without needing to include all the information as it can differ quite a bit between the /// different events of the game. -pub mod small; +pub mod partials; /// Sometimes the game reuses certain events and instead of 'ship' data it sets Odyssey related /// data. These mixed data types handle these differences. diff --git a/src/modules/logs/content/log_event_content.rs b/src/modules/logs/content/log_event_content.rs index e7e00465..c8e31724 100644 --- a/src/modules/logs/content/log_event_content.rs +++ b/src/modules/logs/content/log_event_content.rs @@ -247,7 +247,7 @@ use crate::logs::content::log_event_content::community_goal_event::CommunityGoal use crate::logs::content::log_event_content::ship_redeemed::ShipRedeemed; use crate::logs::content::log_event_content::shipyard_redeem::ShipyardRedeem; use crate::logs::content::log_event_content::start_jump_event::StartJumpType; -use crate::modules::small::SmallSystemInfo; +use crate::modules::partials::PartialSystemInfo; pub mod afmu_repairs_event; pub mod applied_to_squadron_event; @@ -860,14 +860,14 @@ impl LogEventContent { }) } - pub fn small_system_info(&self) -> Option { - match (self.system_address(), self.star_name()) { - (Some(system_address), Some(star_name)) => Some(SmallSystemInfo { - system_address, - star_name: star_name.to_string(), - }), - (_, _) => None, - } + pub fn small_system_info(&self) -> Option { + let system_address = self.system_address()?; + let star_name = self.star_name()?; + + Some(PartialSystemInfo { + system_address, + star_name: star_name.to_string(), + }) } pub fn body_id(&self) -> Option { diff --git a/src/modules/partials/mod.rs b/src/modules/partials/mod.rs new file mode 100644 index 00000000..e5c54c18 --- /dev/null +++ b/src/modules/partials/mod.rs @@ -0,0 +1,3 @@ +pub use models::small_system_info::PartialSystemInfo; + +mod models; diff --git a/src/modules/small/models.rs b/src/modules/partials/models.rs similarity index 100% rename from src/modules/small/models.rs rename to src/modules/partials/models.rs diff --git a/src/modules/small/models/small_system_info.rs b/src/modules/partials/models/small_system_info.rs similarity index 77% rename from src/modules/small/models/small_system_info.rs rename to src/modules/partials/models/small_system_info.rs index 9e96a1ae..2af9ef7d 100644 --- a/src/modules/small/models/small_system_info.rs +++ b/src/modules/partials/models/small_system_info.rs @@ -1,7 +1,7 @@ use serde::Serialize; #[derive(Debug, Serialize)] -pub struct SmallSystemInfo { +pub struct PartialSystemInfo { pub system_address: u64, pub star_name: String, } diff --git a/src/modules/small/mod.rs b/src/modules/small/mod.rs deleted file mode 100644 index 569ba0ce..00000000 --- a/src/modules/small/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub use models::small_system_info::SmallSystemInfo; - -mod models; diff --git a/src/modules/state/models/carrier_state.rs b/src/modules/state/models/carrier_state.rs index 97e7e83e..ef0e1ac8 100644 --- a/src/modules/state/models/carrier_state.rs +++ b/src/modules/state/models/carrier_state.rs @@ -3,13 +3,13 @@ use serde::Serialize; use crate::logs::carrier_stats_event::CarrierStatsEvent; use crate::logs::{LogEvent, LogEventContent}; use crate::logs::carrier_jump_request_event::CarrierJumpRequestEvent; -use crate::small::SmallSystemInfo; +use crate::partials::PartialSystemInfo; use crate::state::models::feed_result::FeedResult; #[derive(Serialize)] pub struct CarrierState { pub stats: CarrierStatsEvent, - pub flight_history: Vec, + pub flight_history: Vec, pub last_location_update: DateTime, pub scheduled_jump: Option, pub scrap_time: Option>,