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

clean up the easy clippy errors

Browse Source 
I'm still not running clippy on CI and probably should.
There are a few left that were a little more involved to address.
This commit is contained in:
Scott Lamb
2022-09-28 09:29:16 -07:00
parent b03eceb21a
commit 0866b23991
23 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/db/upgrade/mod.rs
View File

@@ -76,7 +76,7 @@ fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Res
for ver in old_ver..target_ver {
info!("...from version {} to version {}", ver, ver + 1);
let tx = conn.transaction()?;
upgraders[ver as usize](&args, &tx)?;
upgraders[ver as usize](args, &tx)?;
tx.execute(
r#"
insert into version (id, unix_time, notes)
@@ -94,7 +94,7 @@ fn upgrade(args: &Args, target_ver: i32, conn: &mut rusqlite::Connection) -> Res
pub fn run(args: &Args, conn: &mut rusqlite::Connection) -> Result<(), Error> {
db::check_sqlite_version()?;
db::set_integrity_pragmas(conn)?;
set_journal_mode(&conn, args.preset_journal)?;
set_journal_mode(conn, args.preset_journal)?;
upgrade(args, db::EXPECTED_VERSION, conn)?;
// As in "moonfire-nvr init": try for page_size=16384 and wal for the reasons explained there.
@@ -114,7 +114,7 @@ pub fn run(args: &Args, conn: &mut rusqlite::Connection) -> Result<(), Error> {
)?;
}
set_journal_mode(&conn, "wal")?;
set_journal_mode(conn, "wal")?;
info!("...done.");
Ok(())

2
server/db/upgrade/v0_to_v1.rs
View File

@@ -221,7 +221,7 @@ fn update_camera(
update camera set next_recording_id = :next_recording_id where id = :id
"#,
)?;
for (ref id, ref state) in &camera_state {
for (ref id, state) in &camera_state {
stmt.execute(named_params! {
":id": &id,
":next_recording_id": &state.next_recording_id,

2
server/db/upgrade/v1_to_v2.rs
View File

@@ -97,7 +97,7 @@ pub fn run(args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
meta.dir_uuid.extend_from_slice(dir_uuid_bytes);
let open = meta.last_complete_open.mut_or_insert_default();
open.id = open_id;
open.uuid.extend_from_slice(&open_uuid_bytes);
open.uuid.extend_from_slice(open_uuid_bytes);
}
dir::write_meta(d.as_raw_fd(), &meta)?;

2
server/db/upgrade/v2_to_v3.rs
View File

@@ -55,7 +55,7 @@ fn open_sample_file_dir(tx: &rusqlite::Transaction) -> Result<Arc<dir::SampleFil
}
pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error> {
let d = open_sample_file_dir(&tx)?;
let d = open_sample_file_dir(tx)?;
let mut stmt = tx.prepare(
r#"
select

2
server/db/upgrade/v4_to_v5.rs
View File

@@ -37,7 +37,7 @@ fn maybe_upgrade_meta(dir: &dir::Fd, db_meta: &schema::DirMeta) -> Result<bool,
dir_meta
.merge_from(&mut s)
.map_err(|e| e.context("Unable to parse metadata proto: {}"))?;
if let Err(e) = dir::SampleFileDir::check_consistent(&db_meta, &dir_meta) {
if let Err(e) = dir::SampleFileDir::check_consistent(db_meta, &dir_meta) {
bail!(
"Inconsistent db_meta={:?} dir_meta={:?}: {}",
&db_meta,