MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-11-28 21:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

update some deps, including cursive

Browse Source 
cursive renamed a few methods, so keep up with that. No functional
changes.
This commit is contained in:
Scott Lamb
2020-01-20 08:56:57 -08:00
parent 038fc574e9
commit dd3c3f2f84
5 changed files with 275 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,13 +42,13 @@ use url::Url;
/// Builds a `CameraChange` from an active `edit_camera_dialog`.
fn get_change(siv: &mut Cursive) -> db::CameraChange {
// Note: these find_id calls are separate statements, which seems to be important:
// Note: these find_name calls are separate statements, which seems to be important:
// https://github.com/gyscos/Cursive/issues/144
let sn = siv.find_id::<views::EditView>("short_name").unwrap().get_content().as_str().into();
let d = siv.find_id::<views::TextArea>("description").unwrap().get_content().into();
let h = siv.find_id::<views::EditView>("onvif_host").unwrap().get_content().as_str().into();
let u = siv.find_id::<views::EditView>("username").unwrap().get_content().as_str().into();
let p = siv.find_id::<views::EditView>("password").unwrap().get_content().as_str().into();
let sn = siv.find_name::<views::EditView>("short_name").unwrap().get_content().as_str().into();
let d = siv.find_name::<views::TextArea>("description").unwrap().get_content().into();
let h = siv.find_name::<views::EditView>("onvif_host").unwrap().get_content().as_str().into();
let u = siv.find_name::<views::EditView>("username").unwrap().get_content().as_str().into();
let p = siv.find_name::<views::EditView>("password").unwrap().get_content().as_str().into();
let mut c = db::CameraChange {
short_name: sn,
description: d,
@@ -58,14 +58,14 @@ fn get_change(siv: &mut Cursive) -> db::CameraChange {
streams: Default::default(),
};
for &t in &db::ALL_STREAM_TYPES {
let u = siv.find_id::<views::EditView>(&format!("{}_rtsp_url", t.as_str()))
let u = siv.find_name::<views::EditView>(&format!("{}_rtsp_url", t.as_str()))
.unwrap().get_content().as_str().into();
let r = siv.find_id::<views::Checkbox>(&format!("{}_record", t.as_str()))
let r = siv.find_name::<views::Checkbox>(&format!("{}_record", t.as_str()))
.unwrap().is_checked();
let f = i64::from_str(siv.find_id::<views::EditView>(
let f = i64::from_str(siv.find_name::<views::EditView>(
&format!("{}_flush_if_sec", t.as_str())).unwrap().get_content().as_str())
.unwrap_or(0);
let d = *siv.find_id::<views::SelectView<Option<i32>>>(
let d = *siv.find_name::<views::SelectView<Option<i32>>>(
&format!("{}_sample_file_dir", t.as_str()))
.unwrap().selection().unwrap();
c.streams[t.index()] = db::StreamChange {
@@ -173,7 +173,7 @@ fn press_delete(siv: &mut Cursive, db: &Arc<db::Database>, id: i32, name: String
.child(views::EditView::new().on_submit({
let db = db.clone();
move |siv, _| confirm_deletion(siv, &db, id, to_delete)
}).with_id("confirm")))
}).with_name("confirm")))
.button("Delete", {
let db = db.clone();
move |siv| confirm_deletion(siv, &db, id, to_delete)
@@ -189,7 +189,7 @@ fn press_delete(siv: &mut Cursive, db: &Arc<db::Database>, id: i32, name: String
}
fn confirm_deletion(siv: &mut Cursive, db: &Arc<db::Database>, id: i32, to_delete: i64) {
let typed = siv.find_id::<views::EditView>("confirm").unwrap().get_content();
let typed = siv.find_name::<views::EditView>("confirm").unwrap().get_content();
if decode_size(typed.as_str()).ok() == Some(to_delete) {
siv.pop_layer(); // deletion confirmation dialog
@@ -259,16 +259,16 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
None => "<new>".to_string(),
Some(id) => id.to_string(),
}))
.child("uuid", views::TextView::new("<new>").with_id("uuid"))
.child("short name", views::EditView::new().with_id("short_name"))
.child("onvif_host", views::EditView::new().with_id("onvif_host"))
.child("username", views::EditView::new().with_id("username"))
.child("password", views::EditView::new().with_id("password"))
.child("uuid", views::TextView::new("<new>").with_name("uuid"))
.child("short name", views::EditView::new().with_name("short_name"))
.child("onvif_host", views::EditView::new().with_name("onvif_host"))
.child("username", views::EditView::new().with_name("username"))
.child("password", views::EditView::new().with_name("password"))
.min_height(6);
let mut layout = views::LinearLayout::vertical()
.child(camera_list)
.child(views::TextView::new("description"))
.child(views::TextArea::new().with_id("description").min_height(3));
.child(views::TextArea::new().with_name("description").min_height(3));
let dirs: Vec<_> = ::std::iter::once(("<none>".to_owned(), None))
.chain(db.lock()
@@ -280,7 +280,7 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
let list = views::ListView::new()
.child("rtsp url", views::LinearLayout::horizontal()
.child(views::EditView::new()
.with_id(format!("{}_rtsp_url", type_.as_str()))
.with_name(format!("{}_rtsp_url", type_.as_str()))
.full_width())
.child(views::DummyView)
.child(views::Button::new("Test", move |siv| press_test(siv, type_))))
@@ -288,12 +288,12 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
views::SelectView::<Option<i32>>::new()
.with_all(dirs.iter().map(|d| d.clone()))
.popup()
.with_id(format!("{}_sample_file_dir", type_.as_str())))
.child("record", views::Checkbox::new().with_id(format!("{}_record", type_.as_str())))
.with_name(format!("{}_sample_file_dir", type_.as_str())))
.child("record", views::Checkbox::new().with_name(format!("{}_record", type_.as_str())))
.child("flush_if_sec", views::EditView::new()
.with_id(format!("{}_flush_if_sec", type_.as_str())))
.with_name(format!("{}_flush_if_sec", type_.as_str())))
.child("usage/capacity",
views::TextView::new("").with_id(format!("{}_usage_cap", type_.as_str())))
views::TextView::new("").with_name(format!("{}_usage_cap", type_.as_str())))
.min_height(5);
layout.add_child(views::DummyView);
layout.add_child(views::TextView::new(format!("{} stream", type_.as_str())));
@@ -304,7 +304,7 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
let dialog = if let Some(camera_id) = *item {
let l = db.lock();
let camera = l.cameras_by_id().get(&camera_id).expect("missing camera");
dialog.call_on_id("uuid", |v: &mut views::TextView| v.set_content(camera.uuid.to_string()))
dialog.call_on_name("uuid", |v: &mut views::TextView| v.set_content(camera.uuid.to_string()))
.expect("missing TextView");
let mut bytes = 0;
@@ -329,17 +329,17 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
format!("{} / {} ({:.1}%)", s.sample_file_bytes, s.retain_bytes,
100. * s.sample_file_bytes as f32 / s.retain_bytes as f32)
};
dialog.call_on_id(&format!("{}_rtsp_url", t.as_str()),
dialog.call_on_name(&format!("{}_rtsp_url", t.as_str()),
|v: &mut views::EditView| v.set_content(s.rtsp_url.to_owned()));
dialog.call_on_id(&format!("{}_usage_cap", t.as_str()),
dialog.call_on_name(&format!("{}_usage_cap", t.as_str()),
|v: &mut views::TextView| v.set_content(u));
dialog.call_on_id(&format!("{}_record", t.as_str()),
dialog.call_on_name(&format!("{}_record", t.as_str()),
|v: &mut views::Checkbox| v.set_checked(s.record));
dialog.call_on_id(
dialog.call_on_name(
&format!("{}_flush_if_sec", t.as_str()),
|v: &mut views::EditView| v.set_content(s.flush_if_sec.to_string()));
}
dialog.call_on_id(
dialog.call_on_name(
&format!("{}_sample_file_dir", t.as_str()),
|v: &mut views::SelectView<Option<i32>>| v.set_selection(selected_dir));
}
@@ -348,10 +348,10 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
("onvif_host", &*camera.onvif_host),
("username", &*camera.username),
("password", &*camera.password)] {
dialog.call_on_id(view_id, |v: &mut views::EditView| v.set_content(content.to_string()))
dialog.call_on_name(view_id, |v: &mut views::EditView| v.set_content(content.to_string()))
.expect("missing EditView");
}
dialog.call_on_id("description",
dialog.call_on_name("description",
|v: &mut views::TextArea| v.set_content(camera.description.to_string()))
.expect("missing TextArea");
dialog.title("Edit camera")
@@ -365,7 +365,7 @@ fn edit_camera_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: &Option<i
})
} else {
for t in &db::ALL_STREAM_TYPES {
dialog.call_on_id(&format!("{}_usage_cap", t.as_str()),
dialog.call_on_name(&format!("{}_usage_cap", t.as_str()),
|v: &mut views::TextView| v.set_content("<new>"));
}
dialog.title("Add camera")

24
src/cmds/config/dirs.rs
View File

@@ -89,20 +89,20 @@ fn edit_limit(model: &RefCell<Model>, siv: &mut Cursive, id: i32, content: &str)
if delta != 0 {
let prev_over = model.total_retain > model.fs_capacity;
model.total_retain += delta;
siv.find_id::<views::TextView>("total_retain")
siv.find_name::<views::TextView>("total_retain")
.unwrap()
.set_content(encode_size(model.total_retain));
let now_over = model.total_retain > model.fs_capacity;
if now_over != prev_over {
model.errors += if now_over { 1 } else { -1 };
siv.find_id::<views::TextView>("total_ok")
siv.find_name::<views::TextView>("total_ok")
.unwrap()
.set_content(if now_over { "*" } else { " " });
}
}
if new_value.is_none() != stream.retain.is_none() {
model.errors += if new_value.is_none() { 1 } else { -1 };
siv.find_id::<views::TextView>(&format!("{}_ok", id))
siv.find_name::<views::TextView>(&format!("{}_ok", id))
.unwrap()
.set_content(if new_value.is_none() { "*" } else { " " });
}
@@ -110,7 +110,7 @@ fn edit_limit(model: &RefCell<Model>, siv: &mut Cursive, id: i32, content: &str)
debug!("model.errors = {}", model.errors);
if (model.errors == 0) != (old_errors == 0) {
trace!("toggling change state: errors={}", model.errors);
siv.find_id::<views::Button>("change")
siv.find_name::<views::Button>("change")
.unwrap()
.set_enabled(model.errors == 0);
}
@@ -124,7 +124,7 @@ fn edit_record(model: &RefCell<Model>, id: i32, record: bool) {
}
fn confirm_deletion(model: &RefCell<Model>, siv: &mut Cursive, to_delete: i64) {
let typed = siv.find_id::<views::EditView>("confirm")
let typed = siv.find_name::<views::EditView>("confirm")
.unwrap()
.get_content();
debug!("confirm, typed: {} vs expected: {}", typed.as_str(), to_delete);
@@ -175,7 +175,7 @@ fn press_change(model: &Rc<RefCell<Model>>, siv: &mut Cursive) {
.child(views::EditView::new().on_submit({
let model = model.clone();
move |siv, _| confirm_deletion(&model, siv, to_delete)
}).with_id("confirm")))
}).with_name("confirm")))
.button("Confirm", {
let model = model.clone();
move |siv| confirm_deletion(&model, siv, to_delete)
@@ -219,12 +219,12 @@ fn add_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive) {
let db = db.clone();
move |siv, path| add_dir(&db, siv, path)
})
.with_id("path")
.with_name("path")
.fixed_width(60)))
.button("Add", {
let db = db.clone();
move |siv| {
let path = siv.find_id::<views::EditView>("path").unwrap().get_content();
let path = siv.find_name::<views::EditView>("path").unwrap().get_content();
add_dir(&db, siv, &path)
}
})
@@ -350,7 +350,7 @@ fn edit_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive, dir_id: i32) {
move |siv, _| press_change(&model, siv)
})
.fixed_width(20))
.child(views::TextView::new("").with_id(format!("{}_ok", id)).fixed_width(1)));
.child(views::TextView::new("").with_name(format!("{}_ok", id)).fixed_width(1)));
}
let over = model.borrow().total_retain > model.borrow().fs_capacity;
list.add_child(
@@ -360,8 +360,8 @@ fn edit_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive, dir_id: i32) {
.child(views::TextView::new(encode_size(model.borrow().total_used))
.fixed_width(BYTES_WIDTH))
.child(views::TextView::new(encode_size(model.borrow().total_retain))
.with_id("total_retain").fixed_width(BYTES_WIDTH))
.child(views::TextView::new(if over { "*" } else { " " }).with_id("total_ok")));
.with_name("total_retain").fixed_width(BYTES_WIDTH))
.child(views::TextView::new(if over { "*" } else { " " }).with_name("total_ok")));
list.add_child(
"filesystem",
views::LinearLayout::horizontal()
@@ -375,7 +375,7 @@ fn edit_dir_dialog(db: &Arc<db::Database>, siv: &mut Cursive, dir_id: i32) {
change_button.set_enabled(!over);
let mut buttons = views::LinearLayout::horizontal()
.child(views::DummyView.full_width());
buttons.add_child(change_button.with_id("change"));
buttons.add_child(change_button.with_name("change"));
buttons.add_child(views::DummyView);
buttons.add_child(views::Button::new("Cancel", |siv| { siv.pop_layer(); }));
siv.add_layer(

20
src/cmds/config/users.rs
View File

@@ -42,11 +42,11 @@ fn get_change(siv: &mut Cursive, db: &db::LockedDatabase, id: Option<i32>,
None => db::UserChange::add_user(String::new()),
};
change.username.clear();
change.username += siv.find_id::<views::EditView>("username").unwrap().get_content().as_str();
change.username += siv.find_name::<views::EditView>("username").unwrap().get_content().as_str();
match pw {
PasswordChange::Leave => {},
PasswordChange::Set => {
let pwd = siv.find_id::<views::EditView>("new_pw").unwrap().get_content();
let pwd = siv.find_name::<views::EditView>("new_pw").unwrap().get_content();
change.set_password(pwd.as_str().into());
},
PasswordChange::Clear => change.clear_password(),
@@ -55,7 +55,7 @@ fn get_change(siv: &mut Cursive, db: &db::LockedDatabase, id: Option<i32>,
("perm_view_video", &mut change.permissions.view_video),
("perm_read_camera_configs", &mut change.permissions.read_camera_configs),
("perm_update_signals", &mut change.permissions.update_signals)] {
**b = siv.find_id::<views::Checkbox>(id).unwrap().is_checked();
**b = siv.find_name::<views::Checkbox>(id).unwrap().is_checked();
info!("{}: {}", id, **b);
}
change
@@ -114,7 +114,7 @@ enum PasswordChange {
}
fn select_set(siv: &mut Cursive) {
siv.find_id::<views::RadioButton<PasswordChange>>("pw_set").unwrap().select();
siv.find_name::<views::RadioButton<PasswordChange>>("pw_set").unwrap().select();
}
/// Adds or updates a user.
@@ -134,7 +134,7 @@ fn edit_user_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: Option<i32>
.child("id", views::TextView::new(id_str))
.child("username", views::EditView::new()
.content(username.clone())
.with_id("username"));
.with_name("username"));
let mut layout = views::LinearLayout::vertical()
.child(top_list)
.child(views::DummyView)
@@ -145,21 +145,21 @@ fn edit_user_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: Option<i32>
layout.add_child(pw_group.button(PasswordChange::Clear, "Clear"));
layout.add_child(views::LinearLayout::horizontal()
.child(pw_group.button(PasswordChange::Set, "Set to:")
.with_id("pw_set"))
.with_name("pw_set"))
.child(views::DummyView)
.child(views::EditView::new()
.on_edit(|siv, _, _| select_set(siv))
.with_id("new_pw")
.with_name("new_pw")
.full_width()));
} else {
layout.add_child(pw_group.button(PasswordChange::Leave, "Leave unset"));
layout.add_child(views::LinearLayout::horizontal()
.child(pw_group.button(PasswordChange::Set, "Reset to:")
.with_id("pw_set"))
.with_name("pw_set"))
.child(views::DummyView)
.child(views::EditView::new()
.on_edit(|siv, _, _| select_set(siv))
.with_id("new_pw")
.with_name("new_pw")
.full_width()));
}
@@ -171,7 +171,7 @@ fn edit_user_dialog(db: &Arc<db::Database>, siv: &mut Cursive, item: Option<i32>
("update_signals", permissions.update_signals)] {
let mut checkbox = views::Checkbox::new();
checkbox.set_checked(*b);
perms.add_child(name, checkbox.with_id(format!("perm_{}", name)));
perms.add_child(name, checkbox.with_name(format!("perm_{}", name)));
}
layout.add_child(perms);