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 rusqlite

Browse Source 
The big difference here is query_named and execute_named have gone
away. Fair number of lines changes but straightforward.
This commit is contained in:
Scott Lamb
2021-05-17 10:50:12 -07:00
parent dc1c9afa73
commit f922afaa26
11 changed files with 144 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ use crate::db;
use crate::recording;
use failure::Error;
use log::warn;
use rusqlite::params;
use rusqlite::{named_params, params};
use std::collections::HashMap;
pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error> {
@@ -179,32 +179,30 @@ fn fill_recording(tx: &rusqlite::Transaction) -> Result<HashMap<i32, CameraState
Some((run_id, expected_start)) if expected_start == start_time_90k => run_id,
_ => composite_id,
};
insert1.execute_named(&[
(":composite_id", &composite_id),
(":camera_id", &camera_id),
(":run_offset", &(composite_id - run_id)),
(
":flags",
&(if trailing_zero {
insert1.execute(named_params! {
":composite_id": &composite_id,
":camera_id": &camera_id,
":run_offset": &(composite_id - run_id),
":flags": &(
if trailing_zero {
db::RecordingFlags::TrailingZero as i32
} else {
0
}),
),
(":sample_file_bytes", &sample_file_bytes),
(":start_time_90k", &start_time_90k),
(":duration_90k", &duration_90k),
(":local_time_delta_90k", &local_time_delta_90k),
(":video_samples", &video_samples),
(":video_sync_samples", &video_sync_samples),
(":video_sample_entry_id", &video_sample_entry_id),
])?;
insert2.execute_named(&[
(":composite_id", &composite_id),
(":sample_file_uuid", &&sample_file_uuid.0.as_bytes()[..]),
(":sample_file_sha1", &sample_file_sha1),
(":video_index", &video_index),
])?;
":sample_file_bytes": &sample_file_bytes,
":start_time_90k": &start_time_90k,
":duration_90k": &duration_90k,
":local_time_delta_90k": &local_time_delta_90k,
":video_samples": &video_samples,
":video_sync_samples": &video_sync_samples,
":video_sample_entry_id": &video_sample_entry_id,
})?;
insert2.execute(named_params! {
":composite_id": &composite_id,
":sample_file_uuid": &sample_file_uuid.0.as_bytes()[..],
":sample_file_sha1": &sample_file_sha1,
":video_index": &video_index,
})?;
camera_state.current_run = if trailing_zero {
None
} else {
@@ -224,10 +222,10 @@ fn update_camera(
"#,
)?;
for (ref id, ref state) in &camera_state {
stmt.execute_named(&[
(":id", &id),
(":next_recording_id", &state.next_recording_id),
])?;
stmt.execute(named_params! {
":id": &id,
":next_recording_id": &state.next_recording_id,
})?;
}
Ok(())
}