Use a few Rust idioms
This commit is contained in:
1 parent
fc86e04861
commit
8f82bb7fbc
2 files changed
+5
-11
No files matched your search
@@ -1,9 +1,11 @@
|
||||
use lazy_static::lazy_static;
|
||||
use regex::Regex;
|
||||
use serde::Deserialize;
|
||||
use std::clone::Clone;
|
||||
use std::net::SocketAddr;
|
||||
use std::time::Duration;
|
||||
use validator::Validate;
|
||||
use validator_derive::Validate;
|
||||
|
||||
lazy_static! {
|
||||
static ref RE_STREAM_FORM: Regex = Regex::new(r"^([hH]26[45]|[ \t]*[!].*)$").unwrap();
|
||||
|
||||
+3
-11
@@ -1,8 +1,3 @@
|
||||
#[macro_use]
|
||||
extern crate validator_derive;
|
||||
#[macro_use]
|
||||
extern crate lazy_static;
|
||||
|
||||
use env_logger::Env;
|
||||
use err_derive::Error;
|
||||
use log::*;
|
||||
@@ -46,10 +41,7 @@ fn main() -> Result<(), Error> {
|
||||
let opt = Opt::from_args();
|
||||
let config: Config = toml::from_str(&fs::read_to_string(opt.config)?)?;
|
||||
|
||||
match config.validate() {
|
||||
Ok(_) => (),
|
||||
Err(e) => return Err(Error::ValidationError(e)),
|
||||
};
|
||||
config.validate()?;
|
||||
|
||||
let rtsp = &RtspServer::new();
|
||||
|
||||
@@ -73,7 +65,7 @@ fn main() -> Result<(), Error> {
|
||||
let arc_cam = Arc::new(camera);
|
||||
|
||||
// Set up each main and substream according to all the RTSP mount paths we support
|
||||
if arc_cam.stream == "both" || arc_cam.stream == "mainStream" {
|
||||
if ["both", "mainStream"].iter().any(|&e| e == arc_cam.stream) {
|
||||
let paths = &[
|
||||
&*format!("/{}", arc_cam.name),
|
||||
&*format!("/{}/mainStream", arc_cam.name),
|
||||
@@ -82,7 +74,7 @@ fn main() -> Result<(), Error> {
|
||||
let main_camera = arc_cam.clone();
|
||||
s.spawn(move |_| camera_loop(&*main_camera, "mainStream", &mut output));
|
||||
}
|
||||
if arc_cam.stream == "both" || arc_cam.stream == "subStream" {
|
||||
if ["both", "subStream"].iter().any(|&e| e == arc_cam.stream) {
|
||||
let paths = &[&*format!("/{}/subStream", arc_cam.name)];
|
||||
let mut output = rtsp.add_stream(paths, &substream_format).unwrap();
|
||||
let sub_camera = arc_cam.clone();
|
||||
|
||||
Reference in new issue
Block a user