MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2024-12-26 23:25:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into new-schema

Browse Source
This commit is contained in:
Scott Lamb 2020-04-19 22:53:42 -07:00
commit 474d96803c
6 changed files with 390 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

770
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
Cargo.toml
View File

@ -43,19 +43,19 @@ memchr = "2.0.2"
memmap = "0.7" memmap = "0.7"
moonfire-tflite = { git = "https://github.com/scottlamb/moonfire-tflite", features = ["edgetpu"], optional = true } moonfire-tflite = { git = "https://github.com/scottlamb/moonfire-tflite", features = ["edgetpu"], optional = true }
mylog = { git = "https://github.com/scottlamb/mylog" } mylog = { git = "https://github.com/scottlamb/mylog" }
nix = "0.16.1" nix = "0.17.0"
nom = "5.1.1" nom = "5.1.1"
parking_lot = { version = "0.9", features = [] } parking_lot = { version = "0.10", features = [] }
protobuf = { git = "https://github.com/stepancheg/rust-protobuf" } protobuf = { git = "https://github.com/stepancheg/rust-protobuf" }
reffers = "0.6.0" reffers = "0.6.0"
ring = "0.14.6" ring = "0.14.6"
rusqlite = "0.21.0" rusqlite = "0.22.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
smallvec = "1.0" smallvec = "1.0"
structopt = { version = "0.3.13", features = ["default", "wrap_help"] } structopt = { version = "0.3.13", features = ["default", "wrap_help"] }
time = "0.1" time = "0.1"
tokio = { version = "0.2.0", features = ["blocking", "macros", "rt-threaded", "signal"] } tokio = { version = "0.2.0", features = ["blocking", "macros", "parking_lot", "rt-threaded", "signal"] }
tokio-tungstenite = "0.10.1" tokio-tungstenite = "0.10.1"
url = "2.1.1" url = "2.1.1"
uuid = { version = "0.8", features = ["serde", "std", "v4"] } uuid = { version = "0.8", features = ["serde", "std", "v4"] }

2
base/Cargo.toml
View File

@ -16,6 +16,6 @@ failure = "0.1.1"
lazy_static = "1.0" lazy_static = "1.0"
libc = "0.2" libc = "0.2"
log = "0.4" log = "0.4"
parking_lot = { version = "0.9", features = [] } parking_lot = { version = "0.10", features = [] }
nom = "5.1.1" nom = "5.1.1"
time = "0.1" time = "0.1"

10
db/Cargo.toml
View File

@ -26,18 +26,18 @@ libpasta = "0.1.0-rc2"
log = "0.4" log = "0.4"
lru-cache = "0.1" lru-cache = "0.1"
mylog = { git = "https://github.com/scottlamb/mylog" } mylog = { git = "https://github.com/scottlamb/mylog" }
nix = "0.16.1" nix = "0.17.0"
odds = { version = "0.3.1", features = ["std-vec"] } odds = { version = "0.4.0", features = ["std-vec"] }
parking_lot = { version = "0.9", features = [] } parking_lot = { version = "0.10", features = [] }
prettydiff = "0.3.1" prettydiff = "0.3.1"
protobuf = { git = "https://github.com/stepancheg/rust-protobuf" } protobuf = { git = "https://github.com/stepancheg/rust-protobuf" }
ring = "0.14.6" ring = "0.14.6"
rusqlite = "0.21.0" rusqlite = "0.22.0"
smallvec = "1.0" smallvec = "1.0"
tempdir = "0.3" tempdir = "0.3"
time = "0.1" time = "0.1"
uuid = { version = "0.8", features = ["std", "v4"] } uuid = { version = "0.8", features = ["std", "v4"] }
itertools = "0.8.0" itertools = "0.9.0"
[build-dependencies] [build-dependencies]
protobuf-codegen-pure = { git = "https://github.com/stepancheg/rust-protobuf" } protobuf-codegen-pure = { git = "https://github.com/stepancheg/rust-protobuf" }

5
db/build.rs
View File

@ -1,5 +1,5 @@
// This file is part of Moonfire NVR, a security camera network video recorder. // This file is part of Moonfire NVR, a security camera network video recorder.
// Copyright (C) 2019 The Moonfire NVR Authors // Copyright (C) 2019-2020 The Moonfire NVR Authors
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -29,8 +29,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
fn main() { fn main() {
//let out_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").expect("OUT_DIR")); protobuf_codegen_pure::Codegen::new()
protobuf_codegen_pure::Args::new()
.out_dir(".") .out_dir(".")
.inputs(&["proto/schema.proto"]) .inputs(&["proto/schema.proto"])
.include("proto") .include("proto")

2
src/main.rs
View File

@ -143,7 +143,7 @@ fn main() {
.build(); .build();
h.clone().install().unwrap(); h.clone().install().unwrap();
if let Err(e) = { let _a = h.r#async(); args.run() } { if let Err(e) = { let _a = h.async_scope(); args.run() } {
error!("{:?}", e); error!("{:?}", e);
::std::process::exit(1); ::std::process::exit(1);
} }