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

update a few deps

Browse Source
This commit is contained in:
Scott Lamb
2022-05-02 11:22:14 -07:00
parent 909a174957
commit 841e06e354
12 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/db/Cargo.toml
View File

@@ -33,7 +33,7 @@ num-rational = { version = "0.4.0", default-features = false, features = ["std"]
odds = { version = "0.4.0", features = ["std-vec"] }
parking_lot = "0.12.0"
pretty-hex = "0.2.1"
protobuf = "3.0.0-alpha.1"
protobuf = "3.0"
ring = "0.16.2"
rusqlite = "0.27.0"
scrypt = "0.9.0"
@@ -49,4 +49,4 @@ uuid = { version = "0.8", features = ["serde", "std", "v4"] }
itertools = "0.10.0"
[build-dependencies]
protobuf-codegen = "3.0.0-alpha.1"
protobuf-codegen = "3.0"

2
server/db/check.rs
View File

@@ -97,7 +97,7 @@ pub fn run(conn: &mut rusqlite::Connection, opts: &Options) -> Result<i32, Error
meta.db_uuid.extend_from_slice(&db_uuid.as_bytes()[..]);
meta.dir_uuid.extend_from_slice(&dir_uuid.0.as_bytes()[..]);
{
let o = meta.last_complete_open.set_default();
let o = meta.last_complete_open.mut_or_insert_default();
o.id = open_id;
o.uuid.extend_from_slice(&open_uuid.0.as_bytes()[..]);
}

6
server/db/db.rs
View File

@@ -352,7 +352,7 @@ impl SampleFileDir {
meta.db_uuid.extend_from_slice(&db_uuid.as_bytes()[..]);
meta.dir_uuid.extend_from_slice(&self.uuid.as_bytes()[..]);
if let Some(o) = self.last_complete_open {
let open = meta.last_complete_open.set_default();
let open = meta.last_complete_open.mut_or_insert_default();
open.id = o.id;
open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
}
@@ -1182,7 +1182,7 @@ impl LockedDatabase {
}
let mut expected_meta = dir.expected_meta(&self.uuid);
if let Some(o) = self.open.as_ref() {
let open = expected_meta.in_progress_open.set_default();
let open = expected_meta.in_progress_open.mut_or_insert_default();
open.id = o.id;
open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
}
@@ -1753,7 +1753,7 @@ impl LockedDatabase {
{
meta.db_uuid.extend_from_slice(&self.uuid.as_bytes()[..]);
meta.dir_uuid.extend_from_slice(uuid_bytes);
let open = meta.in_progress_open.set_default();
let open = meta.in_progress_open.mut_or_insert_default();
open.id = o.id;
open.uuid.extend_from_slice(&o.uuid.as_bytes()[..]);
}

4
server/db/dir/mod.rs
View File

@@ -403,12 +403,12 @@ mod tests {
meta.db_uuid.extend_from_slice(fake_uuid);
meta.dir_uuid.extend_from_slice(fake_uuid);
{
let o = meta.last_complete_open.set_default();
let o = meta.last_complete_open.mut_or_insert_default();
o.id = u32::max_value();
o.uuid.extend_from_slice(fake_uuid);
}
{
let o = meta.in_progress_open.set_default();
let o = meta.in_progress_open.mut_or_insert_default();
o.id = u32::max_value();
o.uuid.extend_from_slice(fake_uuid);
}

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

@@ -95,7 +95,7 @@ pub fn run(args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
{
meta.db_uuid.extend_from_slice(db_uuid_bytes);
meta.dir_uuid.extend_from_slice(dir_uuid_bytes);
let open = meta.last_complete_open.set_default();
let open = meta.last_complete_open.mut_or_insert_default();
open.id = open_id;
open.uuid.extend_from_slice(&open_uuid_bytes);
}

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

@@ -46,7 +46,7 @@ fn open_sample_file_dir(tx: &rusqlite::Transaction) -> Result<Arc<dir::SampleFil
meta.db_uuid.extend_from_slice(&db_uuid.0.as_bytes()[..]);
meta.dir_uuid.extend_from_slice(&s_uuid.0.as_bytes()[..]);
{
let open = meta.last_complete_open.set_default();
let open = meta.last_complete_open.mut_or_insert_default();
open.id = o_id as u32;
open.uuid.extend_from_slice(&o_uuid.0.as_bytes()[..]);
}

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

@@ -139,7 +139,7 @@ pub fn run(_args: &super::Args, tx: &rusqlite::Transaction) -> Result<(), Error>
.extend_from_slice(&dir_uuid.0.as_bytes()[..]);
match (open_id, open_uuid) {
(Some(id), Some(uuid)) => {
let mut o = db_meta.last_complete_open.set_default();
let mut o = db_meta.last_complete_open.mut_or_insert_default();
o.id = id;
o.uuid.extend_from_slice(&uuid.0.as_bytes()[..]);
}