MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-07 16:22:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies

Browse Source 
* The mylog update fixes a couple bad bugs.
* Otherwise, just keep up with the Rust ecosystem.
This commit is contained in:
Scott Lamb
2017-06-11 12:57:55 -07:00
parent 30cda85a2e
commit bebd6ee79a
16 changed files with 474 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cmds/config/cameras.rs
View File

@@ -211,9 +211,8 @@ fn edit_camera_dialog(db: &Arc<db::Database>, dir: &Arc<dir::SampleFileDir>, siv
let dialog = if let Some(id) = *item {
let l = db.lock();
let camera = l.cameras_by_id().get(&id).expect("missing camera");
dialog.find_id::<views::TextView>("uuid")
.expect("missing TextView")
.set_content(camera.uuid.to_string());
dialog.find_id("uuid", |v: &mut views::TextView| v.set_content(camera.uuid.to_string()))
.expect("missing TextView");
let bytes = camera.sample_file_bytes;
let name = camera.short_name.clone();
for &(view_id, content) in &[("short_name", &camera.short_name),
@@ -222,13 +221,12 @@ fn edit_camera_dialog(db: &Arc<db::Database>, dir: &Arc<dir::SampleFileDir>, siv
("password", &camera.password),
("main_rtsp_path", &camera.main_rtsp_path),
("sub_rtsp_path", &camera.sub_rtsp_path)] {
dialog.find_id::<views::EditView>(view_id)
.expect("missing EditView")
.set_content(content.to_string());
dialog.find_id(view_id, |v: &mut views::EditView| v.set_content(content.to_string()))
.expect("missing EditView");
}
dialog.find_id::<views::TextArea>("description")
.expect("missing TextArea")
.set_content(camera.description.to_string());
dialog.find_id("description",
|v: &mut views::TextArea| v.set_content(camera.description.to_string()))
.expect("missing TextArea");
dialog.title("Edit camera")
.button("Edit", {
let db = db.clone();

2
src/cmds/config/mod.rs
View File

@@ -120,7 +120,7 @@ fn decode_size(encoded: &str) -> Result<i64, ()> {
Ok(decoded)
}
#[derive(Debug, RustcDecodable)]
#[derive(Debug, Deserialize)]
struct Args {
flag_db_dir: String,
flag_sample_file_dir: String,

2
src/cmds/config/retention.rs
View File

@@ -229,7 +229,7 @@ pub fn add_dialog(db: &Arc<db::Database>, dir: &Arc<dir::SampleFileDir>, siv: &m
move |siv, _| press_change(&model, siv)
})
.fixed_width(25))
.child(views::TextView::new("").with_id(&format!("{}_ok", id)).fixed_width(1)));
.child(views::TextView::new("").with_id(format!("{}_ok", id)).fixed_width(1)));
}
let over = model.borrow().total_retain > model.borrow().fs_capacity;
list.add_child(