diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d498e7..2f002d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ changes, see Git history. Each release is tagged in Git and on the Docker repository [`scottlamb/moonfire-nvr`](https://hub.docker.com/r/scottlamb/moonfire-nvr). +## `v0.7.1` (2021-10-27) + +* bugfix: editing a camera from `nvr config` would erroneously clear the + sample file directory associated with its streams. + ## `v0.7.0` (2021-10-27) * [schema version 7](guide/schema.md#version-7) diff --git a/README.md b/README.md index 15c39fd..0c62195 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ There's no support yet for motion detection, no https/TLS support (you'll need a proxy server, as described [here](guide/secure.md)), and only a console-based (rather than web-based) configuration UI. -Moonfire NVR is currently at version 0.7.0. Until version 1.0, there will be no +Moonfire NVR is currently at version 0.7.1. Until version 1.0, there will be no compatibility guarantees: configuration and storage formats may change from version to version. There is an [upgrade procedure](guide/schema.md) but it is not for the faint of heart. diff --git a/guide/install.md b/guide/install.md index 2c4f885..d8a026e 100644 --- a/guide/install.md +++ b/guide/install.md @@ -66,7 +66,7 @@ $ sudo chmod a+rx /usr/local/bin/nvr # Set your timezone here. tz="America/Los_Angeles" -# or eg "scottlamb/moonfire-nvr:v0.7.0" to specify a particular version. +# or eg "scottlamb/moonfire-nvr:v0.7.1" to specify a particular version. image_name="scottlamb/moonfire-nvr:latest" container_name="moonfire-nvr" common_docker_run_args=( diff --git a/server/Cargo.lock b/server/Cargo.lock index e58e910..bd23e59 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -17,6 +17,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "ahash" version = "0.7.6" @@ -37,6 +48,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "array-macro" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06e97b4e522f9e55523001238ac59d13a8603af57f69980de5d8de4bbbe8ada6" + [[package]] name = "arrayref" version = "0.3.6" @@ -280,11 +297,11 @@ dependencies = [ [[package]] name = "cursive" -version = "0.17.0-alpha.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114844e97b4e07aaae55a252a692df0cf1392dd977aa1368209bd388b11d1a2" +checksum = "6593c3409eb794bf22090bec60dda1e19d1def284478bec7e5a92da3cf977c52" dependencies = [ - "ahash", + "ahash 0.6.3", "cfg-if", "crossbeam-channel", "cursive_core", @@ -297,33 +314,36 @@ dependencies = [ "term_size", "unicode-segmentation", "unicode-width", + "wasmer_enumset", ] [[package]] name = "cursive_core" -version = "0.3.0-alpha.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3dea03bedd9310bd302c0160059b09b718f0a4601924693dcc18564b0c6204" +checksum = "025ac0bcd21ced752d27b70e6aa2285a3513d07b5a0c7f89e71121d20ca1429d" dependencies = [ - "ahash", + "ahash 0.6.3", "chrono", "crossbeam-channel", "enum-map", - "enumset", "lazy_static", + "libc", "log", "num", "owning_ref", + "syn", "unicode-segmentation", "unicode-width", + "wasmer_enumset", "xi-unicode", ] [[package]] name = "darling" -version = "0.13.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" dependencies = [ "darling_core", "darling_macro", @@ -331,9 +351,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.13.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", @@ -345,9 +365,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.13.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", @@ -386,45 +406,25 @@ dependencies = [ [[package]] name = "enum-map" -version = "1.1.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e893a7ba6116821058dec84a6fb14fb2a97cd8ce5fd0f85d5a4e760ecd7329d9" +checksum = "4187999839f4ae8be35cf185d1381aa8dc32d2f5951349cc37ae49ebc4781855" dependencies = [ + "array-macro", "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.6.0" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84278eae0af6e34ff6c1db44c11634a694aafac559ff3080e4db4e4ac35907aa" +checksum = "e5c450cf304c9e18d45db562025a14fb1ca0f5c769b6f609309f81d4c31de455" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "enumset" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e76129da36102af021b8e5000dab2c1c30dbef85c1e482beeff8da5dde0e0b0" -dependencies = [ - "enumset_derive", -] - -[[package]] -name = "enumset_derive" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6451128aa6655d880755345d085494cf7561a6bee7c8dc821e5d77e6d267ecd4" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "failure" version = "0.1.8" @@ -651,7 +651,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.6", ] [[package]] @@ -1001,7 +1001,7 @@ dependencies = [ [[package]] name = "moonfire-db" -version = "0.7.0" +version = "0.7.1" dependencies = [ "base64", "blake3", @@ -1020,7 +1020,7 @@ dependencies = [ "moonfire-base", "mylog", "nix", - "num-rational", + "num-rational 0.4.0", "odds", "parking_lot", "pretty-hex", @@ -1054,7 +1054,7 @@ dependencies = [ [[package]] name = "moonfire-nvr" -version = "0.7.0" +version = "0.7.1" dependencies = [ "base64", "blake3", @@ -1080,7 +1080,7 @@ dependencies = [ "mylog", "nix", "nom", - "num-rational", + "num-rational 0.4.0", "parking_lot", "password-hash", "protobuf", @@ -1176,22 +1176,22 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.3.2", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" dependencies = [ "num-traits", ] @@ -1217,6 +1217,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-rational" version = "0.4.0" @@ -1850,9 +1861,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "strsim" -version = "0.10.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "structopt" @@ -2300,6 +2311,28 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +[[package]] +name = "wasmer_enumset" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8" +dependencies = [ + "num-traits", + "wasmer_enumset_derive", +] + +[[package]] +name = "wasmer_enumset_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "web-sys" version = "0.3.55" diff --git a/server/Cargo.toml b/server/Cargo.toml index d8ae631..08391c5 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moonfire-nvr" -version = "0.7.0" +version = "0.7.1" authors = ["Scott Lamb "] edition = "2018" resolver = "2" @@ -27,7 +27,7 @@ bytes = "1" byteorder = "1.0" clap = { version = "2.33.3", default-features = false, features = ["color", "wrap_help"] } cstr = "0.2.5" -cursive = "0.17.0-alpha.0" +cursive = "0.16.3" db = { package = "moonfire-db", path = "db" } failure = "0.1.1" ffmpeg = { package = "moonfire-ffmpeg", version = "0.0.1" } diff --git a/server/db/Cargo.toml b/server/db/Cargo.toml index 8abd07d..1c82785 100644 --- a/server/db/Cargo.toml +++ b/server/db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "moonfire-db" -version = "0.7.0" +version = "0.7.1" authors = ["Scott Lamb "] readme = "../README.md" edition = "2018"