Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add JSON APIs for Camera and Sample File Dirs #66

Closed
wants to merge 12 commits into from
Closed

Add JSON APIs for Camera and Sample File Dirs #66

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
815f2ca
wip on api for adding camera
jgautier Mar 8, 2019
fcffc9c
fix error handling for invalid json
jgautier Mar 8, 2019
4eace79
adding sample file directories is working
jgautier Mar 12, 2019
5ec6a3a
new camera w/ stream change
jgautier Mar 19, 2019
d2ac303
simplify add camera logic
jgautier Mar 20, 2019
05fde0a
handle bad utf8 without crashing
jgautier Mar 20, 2019
3652477
remove useless code
jgautier Mar 20, 2019
0e8a096
add new paths test
jgautier Mar 20, 2019
afa816b
clean up
jgautier Mar 20, 2019
e59d79e
fix is_string stuff by creating a new struct in json.rs
jgautier Mar 20, 2019
f80864c
change json handler to return a String and use from_str
jgautier Mar 20, 2019
186c79e
nits
jgautier Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions db/Cargo.toml
View file
Open in desktop
Expand Up @@ -34,3 +34,5 @@ tempdir = "0.3"
time = "0.1"
uuid = { version = "0.7", features = ["std", "v4"] }
itertools = "0.8.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
5 changes: 3 additions & 2 deletions db/db.rs
View file
Open in desktop
Expand Up @@ -58,6 +58,7 @@ use crate::dir;
use crate::raw;
use crate::recording::{self, TIME_UNITS_PER_SEC};
use crate::schema;
use serde::{Serialize, Deserialize};
use failure::{Error, bail, format_err};
use fnv::{FnvHashMap, FnvHashSet};
use itertools::Itertools;
Expand Down Expand Up @@ -460,7 +461,7 @@ pub struct LiveSegment {
pub off_90k: Range<i32>,
}

#[derive(Clone, Debug, Default)]
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct StreamChange {
pub sample_file_dir_id: Option<i32>,
pub rtsp_path: String,
Expand All @@ -469,7 +470,7 @@ pub struct StreamChange {
}

/// Information about a camera, used by `add_camera` and `update_camera`.
#[derive(Clone, Debug)]
#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct CameraChange {
pub short_name: String,
pub description: String,
Expand Down