From 1c33d16ab27b0c6ec816bd7ebb8c8af193db50ba Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sun, 2 Mar 2025 11:58:24 +1030 Subject: [PATCH 1/4] make shot names case sensitive --- src/core/element/resolved_element_data.rs | 2 +- src/core/shot/shot_resolver.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/element/resolved_element_data.rs b/src/core/element/resolved_element_data.rs index 6e1dce3..4bca2da 100644 --- a/src/core/element/resolved_element_data.rs +++ b/src/core/element/resolved_element_data.rs @@ -27,7 +27,7 @@ impl ResolvedElementData { } pub fn set_shot(&mut self, value: &String) { - self.shot = Some(value.to_lowercase()); + self.shot = Some(value); } pub fn get_shot(&self) -> Option { diff --git a/src/core/shot/shot_resolver.rs b/src/core/shot/shot_resolver.rs index cb6b25f..5a13d01 100644 --- a/src/core/shot/shot_resolver.rs +++ b/src/core/shot/shot_resolver.rs @@ -22,15 +22,15 @@ impl ShotResolver for Project { } fn shot_exists(&self, shot: &String) -> bool { - let shots: Vec = self.get_shots().iter().map(|s| s.to_lowercase()).collect(); - return shots.contains(&shot.to_lowercase()); + let shots: Vec = self.get_shots().iter().map(|s| s).collect(); + return shots.contains(&shot); } fn get_shot_formatted(&self, shot: &String) -> Option { let shots = self.get_shots(); let index = shots .iter() - .position(|s| s.to_lowercase() == shot.to_lowercase()); + .position(|s| s == shot); let formatted: Option = match index { Some(i) => Some(shots.index(i).clone()), From e68a35c4d3e69aa16d27c1ff344cd45b0f257406 Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sun, 2 Mar 2025 12:01:51 +1030 Subject: [PATCH 2/4] Update shot_resolver.rs --- src/core/shot/shot_resolver.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/core/shot/shot_resolver.rs b/src/core/shot/shot_resolver.rs index 5a13d01..b59a305 100644 --- a/src/core/shot/shot_resolver.rs +++ b/src/core/shot/shot_resolver.rs @@ -28,9 +28,7 @@ impl ShotResolver for Project { fn get_shot_formatted(&self, shot: &String) -> Option { let shots = self.get_shots(); - let index = shots - .iter() - .position(|s| s == shot); + let index = shots.iter().position(|s| s == shot); let formatted: Option = match index { Some(i) => Some(shots.index(i).clone()), From ae69ffbc7d48f07812f9a2e406bf992f5475a076 Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sun, 2 Mar 2025 12:07:38 +1030 Subject: [PATCH 3/4] Update resolved_element_data.rs --- src/core/element/resolved_element_data.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/element/resolved_element_data.rs b/src/core/element/resolved_element_data.rs index 4bca2da..8e73c67 100644 --- a/src/core/element/resolved_element_data.rs +++ b/src/core/element/resolved_element_data.rs @@ -27,7 +27,7 @@ impl ResolvedElementData { } pub fn set_shot(&mut self, value: &String) { - self.shot = Some(value); + self.shot = Some(value.clone()); } pub fn get_shot(&self) -> Option { From ebe4b7e8cff2293e20dbbd672a5e0fb65ad0810b Mon Sep 17 00:00:00 2001 From: Airyzz <36567925+Airyzz@users.noreply.github.com> Date: Sun, 2 Mar 2025 12:07:41 +1030 Subject: [PATCH 4/4] Update shot_resolver.rs --- src/core/shot/shot_resolver.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/shot/shot_resolver.rs b/src/core/shot/shot_resolver.rs index b59a305..a3bb3f8 100644 --- a/src/core/shot/shot_resolver.rs +++ b/src/core/shot/shot_resolver.rs @@ -22,8 +22,7 @@ impl ShotResolver for Project { } fn shot_exists(&self, shot: &String) -> bool { - let shots: Vec = self.get_shots().iter().map(|s| s).collect(); - return shots.contains(&shot); + return self.get_shots().contains(shot); } fn get_shot_formatted(&self, shot: &String) -> Option {