{main,mavlink,settings}: Move mavlink endpoint from option to string

Signed-off-by: Patrick José Pereira <[email protected]>
patrickelectric · Mar 26, 2024 · d89f68f · d89f68f
1 parent 73b8680
commit d89f68f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -30,9 +30,7 @@ async fn main() -> Result<(), std::io::Error> {
     mavlink::manager::Manager::init();
 
     stream::manager::init();
-    if let Some(endpoint) = cli::manager::mavlink_connection_string() {
-        settings::manager::set_mavlink_endpoint(&endpoint);
-    }
+    settings::manager::set_mavlink_endpoint(&cli::manager::mavlink_connection_string());
 
     if cli::manager::enable_thread_counter() {
         helper::threads::start_thread_counter_thread();

diff --git a/src/mavlink/manager.rs b/src/mavlink/manager.rs
@@ -33,8 +33,7 @@ pub enum Message {
 impl Default for Manager {
     #[instrument(level = "debug")]
     fn default() -> Self {
-        let address =
-            settings::manager::mavlink_endpoint().expect("No configured mavlink endpoint");
+        let address = settings::manager::mavlink_endpoint();
 
         let (sender, _receiver) = broadcast::channel(100);
 

diff --git a/src/settings/manager.rs b/src/settings/manager.rs
@@ -19,7 +19,7 @@ pub struct HeaderSettingsFile {
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct SettingsStruct {
     pub header: HeaderSettingsFile,
-    pub mavlink_endpoint: Option<String>, //TODO: Move to URL
+    pub mavlink_endpoint: String, //TODO: Move to URL
     pub streams: Vec<VideoAndStreamInformation>,
 }
 
@@ -44,7 +44,7 @@ impl Default for SettingsStruct {
                 name: "Camera Manager".to_string(),
                 version: 0,
             },
-            mavlink_endpoint: cli::manager::mavlink_connection_string().map(String::from),
+            mavlink_endpoint: cli::manager::mavlink_connection_string(),
             streams: custom::create_default_streams(),
         }
     }
@@ -175,7 +175,7 @@ pub fn header() -> HeaderSettingsFile {
     manager.content.as_ref().unwrap().config.header.clone()
 }
 
-pub fn mavlink_endpoint() -> Option<String> {
+pub fn mavlink_endpoint() -> String {
     let manager = MANAGER.read().unwrap();
     return manager
         .content
@@ -191,7 +191,7 @@ pub fn set_mavlink_endpoint(endpoint: &str) {
     {
         let mut manager = MANAGER.write().unwrap();
         let mut content = manager.content.as_mut();
-        content.as_mut().unwrap().config.mavlink_endpoint = Some(endpoint.into());
+        content.as_mut().unwrap().config.mavlink_endpoint = endpoint.into();
     }
     save();
 }