From 419c9561d2030f1e62bf5c62026d5aa94da773c1 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Tue, 14 Jul 2020 09:57:55 +0700 Subject: [PATCH] Using hashmap for permitted users throughout --- Cargo.toml | 1 + src/gst.rs | 9 ++++++--- src/main.rs | 8 ++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 429a4bb..6610062 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,6 +21,7 @@ gstreamer-rtsp-server = { version = "0.15", features = ["v1_12", "v1_14"]} lazy_static = "1.4" log = { version = "0.4" } indoc = "0.3" +itertools = "0.9" md5 = "0.7" nom = "5.1" regex = "1" diff --git a/src/gst.rs b/src/gst.rs index 6e7a3e0..9e60e35 100644 --- a/src/gst.rs +++ b/src/gst.rs @@ -15,9 +15,11 @@ use gstreamer_rtsp_server::{ RTSP_TOKEN_MEDIA_FACTORY_ROLE, }; use log::debug; +use std::collections::HashSet; use std::fs; use std::io; use std::io::Write; +use itertools::Itertools; type Result = std::result::Result; @@ -43,7 +45,7 @@ impl RtspServer { &self, paths: &[&str], stream_format: &StreamFormat, - permitted_users: &[String], + permitted_users: &HashSet, ) -> Result { let mounts = self .server @@ -60,7 +62,8 @@ impl RtspServer { debug!( "Permitting {} to access {}", - permitted_users.join(", "), + // This is hashmap or (iter) equivalent of join, it requres itertools + permitted_users.iter().cloned().intersperse(", ".to_string()).collect::(), paths.join(", ") ); self.add_permitted_roles(&factory, permitted_users); @@ -104,7 +107,7 @@ impl RtspServer { Ok(maybe_app_src) } - pub fn add_permitted_roles(&self, factory: &RTSPMediaFactory, permitted_roles: &[String]) { + pub fn add_permitted_roles(&self, factory: &RTSPMediaFactory, permitted_roles: &HashSet) { for permitted_role in permitted_roles { factory.add_role_from_structure(&Structure::new( permitted_role.as_str(), diff --git a/src/main.rs b/src/main.rs index d2f6898..3ea49bf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -178,7 +178,7 @@ fn set_up_users(users: &Vec, rtsp: &RtspServer) { fn get_permitted_users( users: &Vec, permitted_users: &Option>, -) -> Vec { +) -> HashSet { let current_permitted_users = match permitted_users { Some(permitted_users) => permitted_users.clone().to_owned(), None => { @@ -209,11 +209,7 @@ fn get_permitted_users( new_permitted_users.insert(user.to_string()); } } - let mut result = vec![]; - for user in new_permitted_users { - result.push(user); - } - result + new_permitted_users } fn camera_main(