- Default filenames are now millisecond time stamps

- API endpoint and path now picked from .env

Author: nsrCodes

.gitignore

@@ -1,2 +1,3 @@
 /target
 Cargo.lock
+.env

Cargo.toml

@@ -13,4 +13,7 @@ gstreamer-video = "0.17.2"
 num-rational = "0.4.0"
 
 home = "0.5.3"
-chrono = "0.4"
+
+
+[build-dependencies]
+dotenv-build = "0.1"

build.rs

@@ -0,0 +1,4 @@
+fn main() {
+    // getting environment variables from .env
+    dotenv_build::output(dotenv_build::Config::default()).unwrap();
+}

src/constants.rs

@@ -6,5 +6,3 @@ pub const VERSION: &str = "0.1.1";
 /* App constants */
 pub const CONFIG_FILE_NAME: &str = "spur_config.txt";
 pub const VIDEOS_FOLDER_FROM_HOME: &str = "Videos/spur";
-pub const STREAM_API: &str = "rtmp://someendpoint:1935"; // todo : get from env
-pub const STREAM_API_PATH: &str = "live"; // todo : get from env

src/parser.rs

@@ -6,11 +6,15 @@ use crate::{
     Config,
 };
 use clap::{Arg, ArgMatches, Command};
-use std::{fs, io::Write, process, str::FromStr};
+use std::{
+    fs,
+    io::Write,
+    process,
+    str::FromStr,
+    time::{SystemTime, UNIX_EPOCH},
+};
 
 /* Utils */
-// use chrono;
-
 fn create_sub_command(st: SType) -> Command<'static> {
     Command::new(st.get_name()).args([
         overlay::create_arg(),
@@ -26,13 +30,24 @@ fn create_sub_command(st: SType) -> Command<'static> {
 
 pub fn get_filename_from_arg(st: SType, arg_filename: Option<&str>) -> String {
     let name = match arg_filename {
-        Some(fname) => fname,
-        // None => format!("{:?}", chrono::offset::Utc::now()).as_str(), // todo : generate from datetime
-        None => "123", // todo : generate from datetime
+        Some(fname) => String::from(fname),
+        None => {
+            // Getting millisecond timestamp
+            // https://stackoverflow.com/a/44378174/11565176
+            let start = SystemTime::now();
+            let since_the_epoch = start
+                .duration_since(UNIX_EPOCH)
+                .expect("Time went backwards");
+            format!(
+                "{:?}",
+                since_the_epoch.as_secs() * 1000
+                    + since_the_epoch.subsec_nanos() as u64 / 1_000_000
+            )
+        }
     };
     match st {
         SType::Record => format!("{}.mkv", name),
-        SType::Stream => format!("/{}/{}", constants::STREAM_API_PATH, name),
+        SType::Stream => format!("/{}/{}", env!("STREAM_API_PATH"), name),
     }
 }
 

src/paths.rs

@@ -23,8 +23,5 @@ pub fn get_video_path(filename: &String) -> PathBuf {
 }
 
 pub fn get_stream_path(filename: &String) -> String {
-    // todo: gets api from environment variables
-    let mut path = String::from(constants::STREAM_API);
-    path.push_str(filename);
-    path
+    format!("{}{}", env!("STREAM_API"), filename)
 }

src/session.rs

@@ -43,7 +43,7 @@ impl Session {
             task_obj.start_pipeline();
             return Task::Record(task_obj);
         } else {
-            // self.s_type == SType::Stream {
+            println!("Stream does not currently work");
             let mut task_obj = Streamer::new(conf.clone());
             task_obj.create_pipeline();
             task_obj.start_pipeline();
@@ -58,6 +58,7 @@ impl Session {
         return Task::Overlay(task_obj);
     }
     pub fn start(&mut self) {
+        // println!("{:?}", self); // DEBUG
         self.tasks.push(self.start_media_pipeline());
         if self.overlay {
             self.tasks.push(self.start_overlay_pipeline());

src/streamer.rs

@@ -197,15 +197,16 @@ impl Media for Streamer {
                 &muxer,
                 Some(muxer_video_sink_pad.name().as_str()),
             )
-            .unwrap(); // Video to muxer // TODO (probably overcomlicating): use `link_pad` with sync handler
-                       // encoder_audio.link_pads(Some(audio_pipeline_source_pad.name().as_str()), &muxer, Some(muxer_audio_sink_pad.name().as_str())).unwrap(); // Audio to muxer // TODO (probably overcomlicating): use `link_pad` with sync handler
+            .unwrap(); // Video to muxer // TODO (probably overcomplicating): use `link_pad` with sync handler
+
+        // encoder_audio.link_pads(Some(audio_pipeline_source_pad.name().as_str()), &muxer, Some(muxer_audio_sink_pad.name().as_str())).unwrap(); // Audio to muxer // TODO (probably overcomplicating): use `link_pad` with sync handler
         queue_audio
             .link_pads(
                 Some(audio_pipeline_source_pad.name().as_str()),
                 &muxer,
                 Some(muxer_audio_sink_pad.name().as_str()),
             )
-            .unwrap(); // Audio to muxer // TODO (probably overcomlicating): use `link_pad` with sync handler
+            .unwrap(); // Audio to muxer // TODO (probably overcomplicating): use `link_pad` with sync handler
 
         self.pipeline = Some(main_pipeline)
     }