Address Comments

Author: Peyton-McKee

scylla-server/src/controllers/file_insertion_controller.rs

@@ -13,7 +13,7 @@ use crate::{
     error::ScyllaError, proto::playback_data, services::run_service, ClientData, PoolHandle,
 };
 
-use super::video_streamer_controller::OutputDirectory;
+use super::OutputDirectory;
 
 /// Inserts a logger file using http multipart
 /// This file is parsed and clientdata values are extracted, the run ID of each variable is inferred, and then data is batch uploaded
@@ -118,7 +118,7 @@ pub async fn insert_file(
             continue;
         };
 
-        println!("Inserting file: {}", name);
+        info!("Inserting file: {}", name);
 
         fs::write(format!("{}/{}", output_directory.0, name), data)
             .await

scylla-server/src/controllers/mod.rs

@@ -7,3 +7,9 @@ pub mod run_controller;
 
 pub mod file_insertion_controller;
 pub mod video_streamer_controller;
+
+#[derive(Clone)]
+pub struct VideoSuffix(pub String);
+
+#[derive(Clone)]
+pub struct OutputDirectory(pub String);

scylla-server/src/controllers/video_streamer_controller.rs

@@ -19,14 +19,11 @@ use crate::{
     proto::serverdata::{self},
 };
 
-#[derive(Clone)]
-pub struct VideoSuffix(pub String);
-
-#[derive(Clone)]
-pub struct OutputDirectory(pub String);
+use super::{OutputDirectory, VideoSuffix};
 
 const INITIAL_CHUNK_SIZE: u64 = 1_048_576; // 1 MB for faster initial load
 
+// Inspired by https://github.com/henningcullin/rustflix/blob/90cbcf2f33a2c26792a21fcbe295db146d2333a5/src-tauri/src/server/stream_film.rs#L35
 pub async fn stream_video(
     Path(file_path): Path<String>,
     Extension(output_directory): Extension<OutputDirectory>,
@@ -125,17 +122,6 @@ pub async fn request_updated_videos(
         )
         .await
         .map_err(|err| ScyllaError::MqttError(format!("Failed to send mqtt message: {}", err)))?;
-
-    payload.values = vec![0.0];
-    mqtt_client
-        .publish(
-            "Scylla/Video/Send",
-            rumqttc::v5::mqttbytes::QoS::ExactlyOnce,
-            false,
-            protobuf::Message::write_to_bytes(&payload)
-                .unwrap_or_else(|e| format!("failed to serialize {}", e).as_bytes().to_vec()),
-        )
-        .await
-        .map_err(|err| ScyllaError::MqttError(format!("Failed to send mqtt message: {}", err)))?;
+    
     Ok(Json::from("Sent Request to update videos".to_string()))
 }

scylla-server/src/main.rs

@@ -25,7 +25,8 @@ use scylla_server::{
         self,
         car_command_controller::{self},
         data_type_controller, file_insertion_controller, run_controller, scylla_config_controller,
-        video_streamer_controller::{self, OutputDirectory, VideoSuffix},
+        video_streamer_controller::{self},
+        OutputDirectory, VideoSuffix,
     },
     services::run_service::{self},
     socket_handler::{socket_handler, socket_handler_with_metadata},
@@ -74,7 +75,7 @@ struct ScyllaArgs {
         short = 'u',
         long,
         env = "SCYLLA_SIREN_HOST_URL",
-        default_value = "192.168.100.11:1883"
+        default_value = "localhost:1883"
     )]
     siren_host_url: String,
 
@@ -355,14 +356,17 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             "/videos/{file_name}",
             get(video_streamer_controller::stream_video),
         )
-        .route("/videos", get(video_streamer_controller::get_videos))
+        .route(
+            "/videos",
+            get(video_streamer_controller::get_videos)
+                .layer(Extension(VideoSuffix(cli.video_suffix))),
+        )
         .route(
             "/videos/update",
             post(video_streamer_controller::request_updated_videos),
         )
         .layer(Extension(db_send))
         .layer(Extension(OutputDirectory(cli.output_directory)))
-        .layer(Extension(VideoSuffix(cli.video_suffix)))
         .layer(Extension(client_sharable))
         .layer(DefaultBodyLimit::disable())
         // for CORS handling

scylla-server/src/mod.rs

@@ -3,3 +3,4 @@
 pub mod command_data;
 pub mod playback_data;
 pub mod serverdata;
+