differentiate None and Some([]) for nvidia_gpus

Author: Plopmenz

rust-app/src/config/handlers.rs

@@ -52,7 +52,7 @@ async fn get(path: web::Path<String>) -> impl Responder {
     let flake: String;
     let mut flake_lock: Option<String> = None;
     let mut network: Option<String> = None;
-    let mut nvidia_gpus: Vec<u64> = vec![];
+    let mut nvidia_gpus: Option<Vec<u64>> = None;
 
     {
         let path = path.join("flake.nix");
@@ -89,10 +89,15 @@ async fn get(path: web::Path<String>) -> impl Responder {
         match read_to_string(&path) {
             Ok(file) => {
                 if let Some(nspawn_flags) = between(&file, "\"", "\"") {
+                    if nspawn_flags.contains("nvidia") {
+                        nvidia_gpus = Some(vec![]);
+                    }
+
                     nspawn_flags.split(" ").for_each(|flag| {
                         if flag.starts_with("--network-zone=") {
                             network = Some(flag.replace("--network-zone=", ""));
                         }
+
                         if flag.starts_with("--bind-ro=") {
                             let path = flag.replace("--bind-ro=", "");
                             if path.starts_with("/dev/nvidia") {
@@ -102,7 +107,7 @@ async fn get(path: web::Path<String>) -> impl Responder {
                                 {
                                     match device.parse::<u64>() {
                                         Ok(device_id) => {
-                                            nvidia_gpus.push(device_id);
+                                            nvidia_gpus.get_or_insert(vec![]).push(device_id);
                                         }
                                         Err(e) => {
                                             log::warn!(
@@ -132,11 +137,7 @@ async fn get(path: web::Path<String>) -> impl Responder {
         flake,
         flake_lock,
         network,
-        nvidia_gpus: if nvidia_gpus.is_empty() {
-            None
-        } else {
-            Some(nvidia_gpus)
-        },
+        nvidia_gpus,
     })
 }