MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-04 23:02:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

config: validate more in cameras dialog box

Browse Source 
Fixes #152

This won't win any awards for best UI or cleanest UI code, but it's an
improvement. Long-term I want the web config UI instead.
This commit is contained in:
Scott Lamb
2021-08-23 15:55:47 -07:00
parent 30cea5cfcb
commit 95dec9791c
5 changed files with 85 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/db/Cargo.toml
View File

@@ -41,6 +41,7 @@ smallvec = "1.0"
tempfile = "3.2.0"
time = "0.1"
tokio = { version = "1.0", features = ["macros", "parking_lot", "rt-multi-thread", "sync"] }
url = "2.1.1"
uuid = { version = "0.8", features = ["std", "v4"] }
itertools = "0.10.0"

17
server/db/db.rs
View File

@@ -54,6 +54,7 @@ use std::str;
use std::string::String;
use std::sync::Arc;
use std::vec::Vec;
use url::Url;
use uuid::Uuid;
/// Expected schema version. See `guide/schema.md` for more information.
@@ -499,7 +500,7 @@ pub struct LiveSegment {
#[derive(Clone, Debug, Default)]
pub struct StreamChange {
pub sample_file_dir_id: Option<i32>,
pub rtsp_url: String,
pub rtsp_url: Option<Url>,
pub record: bool,
pub flush_if_sec: i64,
}
@@ -681,7 +682,7 @@ impl StreamStateChanger {
}
}
if !have_data
&& sc.rtsp_url.is_empty()
&& sc.rtsp_url.is_none()
&& sc.sample_file_dir_id.is_none()
&& !sc.record
{
@@ -709,7 +710,7 @@ impl StreamStateChanger {
"#,
)?;
let rows = stmt.execute(named_params! {
":rtsp_url": &sc.rtsp_url,
":rtsp_url": &sc.rtsp_url.as_ref().map(Url::as_str),
":record": sc.record,
":flush_if_sec": sc.flush_if_sec,
":sample_file_dir_id": sc.sample_file_dir_id,
@@ -723,7 +724,7 @@ impl StreamStateChanger {
streams.push((sid, Some((camera_id, type_, sc))));
}
} else {
if sc.rtsp_url.is_empty() && sc.sample_file_dir_id.is_none() && !sc.record {
if sc.rtsp_url.is_none() && sc.sample_file_dir_id.is_none() && !sc.record {
// Do nothing; there is no record and we want to keep it that way.
continue;
}
@@ -742,7 +743,7 @@ impl StreamStateChanger {
":camera_id": camera_id,
":sample_file_dir_id": sc.sample_file_dir_id,
":type": type_.as_str(),
":rtsp_url": &sc.rtsp_url,
":rtsp_url": &sc.rtsp_url.as_ref().map(Url::as_str),
":record": sc.record,
":flush_if_sec": sc.flush_if_sec,
})?;
@@ -767,7 +768,7 @@ impl StreamStateChanger {
type_,
camera_id,
sample_file_dir_id: sc.sample_file_dir_id,
rtsp_url: mem::replace(&mut sc.rtsp_url, String::new()),
rtsp_url: sc.rtsp_url.take().map(String::from).unwrap_or_default(),
retain_bytes: 0,
flush_if_sec: sc.flush_if_sec,
range: None,
@@ -790,10 +791,10 @@ impl StreamStateChanger {
});
}
(Entry::Vacant(_), None) => {}
(Entry::Occupied(e), Some((_, _, sc))) => {
(Entry::Occupied(e), Some((_, _, mut sc))) => {
let e = e.into_mut();
e.sample_file_dir_id = sc.sample_file_dir_id;
e.rtsp_url = sc.rtsp_url;
e.rtsp_url = sc.rtsp_url.take().map(String::from).unwrap_or_default();
e.record = sc.record;
e.flush_if_sec = sc.flush_if_sec;
}

2
server/db/testutil.rs
View File

@@ -89,7 +89,7 @@ impl<C: Clocks + Clone> TestDb<C> {
streams: [
db::StreamChange {
sample_file_dir_id: Some(sample_file_dir_id),
rtsp_url: "rtsp://test-camera/main".to_owned(),
rtsp_url: Some(url::Url::parse("rtsp://test-camera/main").unwrap()),
record: true,
flush_if_sec,
},