MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-02-09 20:58:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

upgrade bpaf to nearly-0.9.1

Browse Source 
* take advantage of new features to default to `--help` and to print
  the defaults
* remove blank lines from argument help docstrings to avoid truncating
  the output on single `--help` arg (as opposed to `--help --help`)

I'd use the actual released 0.9.1 but it looks like it's not quite out
yet. Will switch over when it is.
This commit is contained in:
Scott Lamb 2023-07-04 10:18:29 -07:00
parent e4ecd0d853
commit 05562dae5b
12 changed files with 245 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

246
server/Cargo.lock generated
View File

@ -65,17 +65,6 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
[[package]]
name = "atty"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi 0.1.19",
"libc",
"winapi",
]
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.1.0" version = "1.1.0"
@ -115,6 +104,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
[[package]] [[package]]
name = "bitstream-io" name = "bitstream-io"
version = "1.6.0" version = "1.6.0"
@ -146,23 +141,22 @@ dependencies = [
[[package]] [[package]]
name = "bpaf" name = "bpaf"
version = "0.7.9" version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/pacak/bpaf.git?rev=905ab7166dd59e89bebbd3364e14b203ee57dba4#905ab7166dd59e89bebbd3364e14b203ee57dba4"
checksum = "31f4c9de9c67618395106c81fb9461290a8910af29aa0188daec29001a1181ae"
dependencies = [ dependencies = [
"bpaf_derive", "bpaf_derive",
"owo-colors", "owo-colors",
"supports-color",
] ]
[[package]] [[package]]
name = "bpaf_derive" name = "bpaf_derive"
version = "0.3.4" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/pacak/bpaf.git?rev=905ab7166dd59e89bebbd3364e14b203ee57dba4#905ab7166dd59e89bebbd3364e14b203ee57dba4"
checksum = "223f3c9e7034f98c9f315d9945fcc22831b3f03d9f4c42c96a7ab6abd209a195"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 2.0.23",
] ]
[[package]] [[package]]
@ -382,7 +376,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"scratch", "scratch",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -399,7 +393,7 @@ checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -422,7 +416,7 @@ dependencies = [
"ident_case", "ident_case",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -433,7 +427,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -485,7 +479,7 @@ checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -506,7 +500,28 @@ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
]
[[package]]
name = "errno"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "errno-dragonfly"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
"cc",
"libc",
] ]
[[package]] [[package]]
@ -527,7 +542,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
"synstructure", "synstructure",
] ]
@ -639,7 +654,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -754,15 +769,6 @@ dependencies = [
"hashbrown 0.13.1", "hashbrown 0.13.1",
] ]
[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.2.6" version = "0.2.6"
@ -772,6 +778,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "hermit-abi"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
[[package]] [[package]]
name = "hex" name = "hex"
version = "0.4.3" version = "0.4.3"
@ -963,6 +975,17 @@ version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
[[package]]
name = "is-terminal"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
dependencies = [
"hermit-abi 0.3.1",
"rustix",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "is_ci" name = "is_ci"
version = "1.1.1" version = "1.1.1"
@ -1001,9 +1024,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.139" version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]] [[package]]
name = "libsqlite3-sys" name = "libsqlite3-sys"
@ -1025,6 +1048,12 @@ dependencies = [
"cc", "cc",
] ]
[[package]]
name = "linux-raw-sys"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.17" version = "0.4.17"
@ -1094,7 +1123,7 @@ dependencies = [
"libc", "libc",
"log", "log",
"wasi 0.11.0+wasi-snapshot-preview1", "wasi 0.11.0+wasi-snapshot-preview1",
"windows-sys", "windows-sys 0.42.0",
] ]
[[package]] [[package]]
@ -1257,7 +1286,7 @@ version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"cfg-if", "cfg-if",
"libc", "libc",
"memoffset", "memoffset",
@ -1410,9 +1439,6 @@ name = "owo-colors"
version = "3.5.0" version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
dependencies = [
"supports-color",
]
[[package]] [[package]]
name = "password-hash" name = "password-hash"
@ -1457,7 +1483,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -1552,9 +1578,9 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.23" version = "1.0.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -1610,7 +1636,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
] ]
[[package]] [[package]]
@ -1760,7 +1786,7 @@ version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a" checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a"
dependencies = [ dependencies = [
"bitflags", "bitflags 1.3.2",
"fallible-iterator", "fallible-iterator",
"fallible-streaming-iterator", "fallible-streaming-iterator",
"hashlink", "hashlink",
@ -1774,6 +1800,19 @@ version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
[[package]]
name = "rustix"
version = "0.38.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
dependencies = [
"bitflags 2.3.3",
"errno",
"libc",
"linux-raw-sys",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.12" version = "1.0.12"
@ -1835,7 +1874,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -1953,11 +1992,11 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]] [[package]]
name = "supports-color" name = "supports-color"
version = "1.3.1" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354"
dependencies = [ dependencies = [
"atty", "is-terminal",
"is_ci", "is_ci",
] ]
@ -1972,6 +2011,17 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "syn"
version = "2.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]] [[package]]
name = "sync_wrapper" name = "sync_wrapper"
version = "0.1.1" version = "0.1.1"
@ -1986,7 +2036,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
"unicode-xid", "unicode-xid",
] ]
@ -2040,7 +2090,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -2114,7 +2164,7 @@ dependencies = [
"signal-hook-registry", "signal-hook-registry",
"socket2", "socket2",
"tokio-macros", "tokio-macros",
"windows-sys", "windows-sys 0.42.0",
] ]
[[package]] [[package]]
@ -2125,7 +2175,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -2201,7 +2251,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
] ]
[[package]] [[package]]
@ -2378,7 +2428,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2412,7 +2462,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn", "syn 1.0.107",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2481,13 +2531,37 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [ dependencies = [
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm 0.42.0",
"windows_aarch64_msvc", "windows_aarch64_msvc 0.42.0",
"windows_i686_gnu", "windows_i686_gnu 0.42.0",
"windows_i686_msvc", "windows_i686_msvc 0.42.0",
"windows_x86_64_gnu", "windows_x86_64_gnu 0.42.0",
"windows_x86_64_gnullvm", "windows_x86_64_gnullvm 0.42.0",
"windows_x86_64_msvc", "windows_x86_64_msvc 0.42.0",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.48.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
"windows_i686_gnu 0.48.0",
"windows_i686_msvc 0.48.0",
"windows_x86_64_gnu 0.48.0",
"windows_x86_64_gnullvm 0.48.0",
"windows_x86_64_msvc 0.48.0",
] ]
[[package]] [[package]]
@ -2496,42 +2570,84 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]] [[package]]
name = "windows_aarch64_msvc" name = "windows_aarch64_msvc"
version = "0.42.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]] [[package]]
name = "windows_i686_gnu" name = "windows_i686_gnu"
version = "0.42.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]] [[package]]
name = "windows_i686_msvc" name = "windows_i686_msvc"
version = "0.42.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]] [[package]]
name = "windows_x86_64_gnu" name = "windows_x86_64_gnu"
version = "0.42.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]] [[package]]
name = "windows_x86_64_gnullvm" name = "windows_x86_64_gnullvm"
version = "0.42.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]] [[package]]
name = "windows_x86_64_msvc" name = "windows_x86_64_msvc"
version = "0.42.0" version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]] [[package]]
name = "winreg" name = "winreg"
version = "0.10.1" version = "0.10.1"

2
server/Cargo.toml
View File

@ -24,7 +24,7 @@ members = ["base", "db"]
base = { package = "moonfire-base", path = "base" } base = { package = "moonfire-base", path = "base" }
base64 = "0.13.0" base64 = "0.13.0"
blake3 = "1.0.0" blake3 = "1.0.0"
bpaf = { version = "0.7.9", features = ["autocomplete", "bright-color", "derive"]} bpaf = { git = "https://github.com/pacak/bpaf.git", rev = "905ab7166dd59e89bebbd3364e14b203ee57dba4", features = ["autocomplete", "bright-color", "derive"]}
bytes = "1" bytes = "1"
byteorder = "1.0" byteorder = "1.0"
cursive = "0.20.0" cursive = "0.20.0"

21
server/src/cmds/check.rs
View File

@ -11,7 +11,7 @@ use std::path::PathBuf;
/// Checks database integrity (like fsck). /// Checks database integrity (like fsck).
#[derive(Bpaf, Debug)] #[derive(Bpaf, Debug)]
#[bpaf(options)] #[bpaf(command("check"))]
pub struct Args { pub struct Args {
#[bpaf(external(crate::parse_db_dir))] #[bpaf(external(crate::parse_db_dir))]
db_dir: PathBuf, db_dir: PathBuf,
@ -20,29 +20,22 @@ pub struct Args {
compare_lens: bool, compare_lens: bool,
/// Trashes sample files without matching recording rows in the database. /// Trashes sample files without matching recording rows in the database.
/// This addresses `Missing ... row` errors. /// This addresses `Missing ... row` errors. The ids are added to the
/// /// `garbage` table to indicate the files need to be deleted. Garbage is
/// The ids are added to the `garbage` table to indicate the files need to /// collected on normal startup.
/// be deleted. Garbage is collected on normal startup.
trash_orphan_sample_files: bool, trash_orphan_sample_files: bool,
/// Deletes recording rows in the database without matching sample files. /// Deletes recording rows in the database without matching sample files.
///
/// This addresses `Recording ... missing file` errors. /// This addresses `Recording ... missing file` errors.
delete_orphan_rows: bool, delete_orphan_rows: bool,
/// Trashes recordings when their database rows appear corrupt. /// Trashes recordings when their database rows appear corrupt.
/// This addresses "bad video_index" errors. /// This addresses "bad video_index" errors. The ids are added to the
/// /// `garbage` table to indicate their files need to be deleted. Garbage is
/// The ids are added to the `garbage` table to indicate their files need to /// collected on normal startup.
/// be deleted. Garbage is collected on normal startup.
trash_corrupt_rows: bool, trash_corrupt_rows: bool,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "check")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?; let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;
check::run( check::run(

6
server/src/cmds/config/mod.rs
View File

@ -21,16 +21,12 @@ mod users;
/// Interactively edits configuration. /// Interactively edits configuration.
#[derive(Bpaf, Debug)] #[derive(Bpaf, Debug)]
#[bpaf(options)] #[bpaf(command("config"))]
pub struct Args { pub struct Args {
#[bpaf(external(crate::parse_db_dir))] #[bpaf(external(crate::parse_db_dir))]
db_dir: PathBuf, db_dir: PathBuf,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "config")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
let (_db_dir, conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?; let (_db_dir, conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;
let clocks = clock::RealClocks {}; let clocks = clock::RealClocks {};

6
server/src/cmds/init.rs
View File

@ -9,16 +9,12 @@ use std::path::PathBuf;
/// Initializes a database. /// Initializes a database.
#[derive(Bpaf, Debug)] #[derive(Bpaf, Debug)]
#[bpaf(options)] #[bpaf(command("init"))]
pub struct Args { pub struct Args {
#[bpaf(external(crate::parse_db_dir))] #[bpaf(external(crate::parse_db_dir))]
db_dir: PathBuf, db_dir: PathBuf,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "init")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::Create)?; let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::Create)?;

25
server/src/cmds/login.rs
View File

@ -25,19 +25,16 @@ fn parse_flags(flags: String) -> Result<Vec<SessionFlag>, Error> {
} }
/// Logs in a user, returning the session cookie. /// Logs in a user, returning the session cookie.
///
///
/// This is a privileged command that directly accesses the database. It doesn't check the /// This is a privileged command that directly accesses the database. It doesn't check the
/// user's password and even can be used to create sessions with permissions the user doesn't /// user's password and even can be used to create sessions with permissions the user doesn't
/// have. /// have.
#[derive(Bpaf, Debug, PartialEq, Eq)] #[derive(Bpaf, Debug, PartialEq, Eq)]
#[bpaf(options)] #[bpaf(command("login"))]
pub struct Args { pub struct Args {
#[bpaf(external(crate::parse_db_dir))] #[bpaf(external(crate::parse_db_dir))]
db_dir: PathBuf, db_dir: PathBuf,
/// Creates a session with the given permissions, as a JSON object. /// Creates a session with the given permissions, as a JSON object.
///
/// E.g. `{"viewVideo": true}`. See `ref/api.md` for a description of `Permissions`. /// E.g. `{"viewVideo": true}`. See `ref/api.md` for a description of `Permissions`.
/// If unspecified, uses user's default permissions. /// If unspecified, uses user's default permissions.
#[bpaf(argument::<String>("PERMS"), parse(parse_perms), optional)] #[bpaf(argument::<String>("PERMS"), parse(parse_perms), optional)]
@ -47,19 +44,18 @@ pub struct Args {
#[bpaf(argument("DOMAIN"))] #[bpaf(argument("DOMAIN"))]
domain: Option<String>, domain: Option<String>,
/// Writes the cookie to a new curl-compatible cookie-jar file. /// Writes the cookie to a new curl-compatible cookie-jar file. `--domain`
/// /// must be specified. This file can be used later with curl's `--cookie`
/// `--domain` must be specified. This file can be used later with curl's `--cookie` flag. /// flag.
#[bpaf(argument("PATH"))] #[bpaf(argument("PATH"))]
curl_cookie_jar: Option<PathBuf>, curl_cookie_jar: Option<PathBuf>,
/// Sets the given db::auth::SessionFlags. /// Sets the given db::auth::SessionFlags.
///
/// default: `http-only,secure,same-site,same-site-strict`.
#[bpaf( #[bpaf(
argument::<String>("FLAGS"), argument::<String>("FLAGS"),
fallback_with(|| Ok::<_, std::convert::Infallible>("http-only,secure,same-site,same-site-strict".to_owned())), fallback("http-only,secure,same-site,same-site-strict".to_string()),
parse(parse_flags), debug_fallback,
parse(parse_flags)
)] )]
session_flags: Vec<SessionFlag>, session_flags: Vec<SessionFlag>,
@ -68,10 +64,6 @@ pub struct Args {
username: String, username: String,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "login")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
let clocks = clock::RealClocks {}; let clocks = clock::RealClocks {};
let (_db_dir, conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?; let (_db_dir, conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;
@ -155,11 +147,14 @@ fn curl_cookie(cookie: &str, flags: i32, domain: &str) -> String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use bpaf::Parser;
#[test] #[test]
fn parse_args() { fn parse_args() {
let args = args() let args = args()
.to_options()
.run_inner(bpaf::Args::from(&[ .run_inner(bpaf::Args::from(&[
"login",
"--permissions", "--permissions",
"{\"viewVideo\": true}", "{\"viewVideo\": true}",
"--session-flags", "--session-flags",

2
server/src/cmds/run/config.rs
View File

@ -14,7 +14,6 @@ use crate::json::Permissions;
fn default_db_dir() -> PathBuf { fn default_db_dir() -> PathBuf {
crate::DEFAULT_DB_DIR.into() crate::DEFAULT_DB_DIR.into()
} }
fn default_ui_dir() -> PathBuf { fn default_ui_dir() -> PathBuf {
"/usr/local/lib/moonfire-nvr/ui".into() "/usr/local/lib/moonfire-nvr/ui".into()
} }
@ -28,7 +27,6 @@ pub struct ConfigFile {
/// Directory holding the SQLite3 index database. /// Directory holding the SQLite3 index database.
/// ///
///
/// default: `/var/lib/moonfire-nvr/db`. /// default: `/var/lib/moonfire-nvr/db`.
#[serde(default = "default_db_dir")] #[serde(default = "default_db_dir")]
pub db_dir: PathBuf, pub db_dir: PathBuf,

13
server/src/cmds/run/mod.rs
View File

@ -27,25 +27,18 @@ mod config;
/// Runs the server, saving recordings and allowing web access. /// Runs the server, saving recordings and allowing web access.
#[derive(Bpaf, Debug)] #[derive(Bpaf, Debug)]
#[bpaf(options)] #[bpaf(command("run"))]
pub struct Args { pub struct Args {
/// Path to configuration file. /// Path to configuration file. See `ref/config.md` for config file documentation.
/// #[bpaf(short, long, argument("PATH"), fallback("/etc/moonfire-nvr.toml".into()), debug_fallback)]
/// default: `/etc/moonfire-nvr.toml`. See `ref/config.md` for config file documentation.
#[bpaf(short, long, argument("PATH"), fallback_with(|| Ok::<_, Error>("/etc/moonfire-nvr.toml".into())))]
config: PathBuf, config: PathBuf,
/// Opens the database in read-only mode and disables recording. /// Opens the database in read-only mode and disables recording.
///
/// Note this is incompatible with session authentication; consider adding /// Note this is incompatible with session authentication; consider adding
/// a bind with `allowUnauthenticatedPermissions` to your config. /// a bind with `allowUnauthenticatedPermissions` to your config.
read_only: bool, read_only: bool,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "run")
}
// These are used in a hack to get the name of the current time zone (e.g. America/Los_Angeles). // These are used in a hack to get the name of the current time zone (e.g. America/Los_Angeles).
// They seem to be correct for Linux and macOS at least. // They seem to be correct for Linux and macOS at least.
const LOCALTIME_PATH: &str = "/etc/localtime"; const LOCALTIME_PATH: &str = "/etc/localtime";

11
server/src/cmds/sql.rs
View File

@ -18,28 +18,22 @@ use std::process::Command;
/// Note this locks the database to prevent simultaneous access with a running server. The /// Note this locks the database to prevent simultaneous access with a running server. The
/// server maintains cached state which could be invalidated otherwise. /// server maintains cached state which could be invalidated otherwise.
#[derive(Bpaf, Debug, PartialEq, Eq)] #[derive(Bpaf, Debug, PartialEq, Eq)]
#[bpaf(options)] #[bpaf(command("sql"))]
pub struct Args { pub struct Args {
#[bpaf(external(crate::parse_db_dir))] #[bpaf(external(crate::parse_db_dir))]
db_dir: PathBuf, db_dir: PathBuf,
/// Opens the database in read-only mode and locks it only for shared access. /// Opens the database in read-only mode and locks it only for shared access.
///
/// This can be run simultaneously with `moonfire-nvr run --read-only`. /// This can be run simultaneously with `moonfire-nvr run --read-only`.
read_only: bool, read_only: bool,
/// Arguments to pass to sqlite3. /// Arguments to pass to sqlite3.
///
/// Use the `--` separator to pass sqlite3 options, as in /// Use the `--` separator to pass sqlite3 options, as in
/// `moonfire-nvr sql -- -line 'select username from user'`. /// `moonfire-nvr sql -- -line 'select username from user'`.
#[bpaf(positional)] #[bpaf(positional)]
arg: Vec<OsString>, arg: Vec<OsString>,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "sql")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
let mode = if args.read_only { let mode = if args.read_only {
OpenMode::ReadOnly OpenMode::ReadOnly
@ -65,11 +59,14 @@ pub fn run(args: Args) -> Result<i32, Error> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use bpaf::Parser;
#[test] #[test]
fn parse_args() { fn parse_args() {
let args = args() let args = args()
.to_options()
.run_inner(bpaf::Args::from(&[ .run_inner(bpaf::Args::from(&[
"sql",
"--db-dir", "--db-dir",
"/foo/bar", "/foo/bar",
"--", "--",

6
server/src/cmds/ts.rs
View File

@ -7,7 +7,7 @@ use failure::Error;
/// Translates between integer and human-readable timestamps. /// Translates between integer and human-readable timestamps.
#[derive(Bpaf, Debug)] #[derive(Bpaf, Debug)]
#[bpaf(options)] #[bpaf(command("config"))]
pub struct Args { pub struct Args {
/// Timestamp(s) to translate. /// Timestamp(s) to translate.
/// ///
@ -19,10 +19,6 @@ pub struct Args {
timestamps: Vec<String>, timestamps: Vec<String>,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "ts")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
for timestamp in &args.timestamps { for timestamp in &args.timestamps {
let t = db::recording::Time::parse(timestamp)?; let t = db::recording::Time::parse(timestamp)?;

17
server/src/cmds/upgrade/mod.rs
View File

@ -10,7 +10,7 @@ use failure::Error;
/// Upgrades to the latest database schema. /// Upgrades to the latest database schema.
#[derive(Bpaf, Debug)] #[derive(Bpaf, Debug)]
#[bpaf(options)] #[bpaf(command("upgrade"))]
pub struct Args { pub struct Args {
#[bpaf(external(crate::parse_db_dir))] #[bpaf(external(crate::parse_db_dir))]
db_dir: std::path::PathBuf, db_dir: std::path::PathBuf,
@ -20,23 +20,16 @@ pub struct Args {
sample_file_dir: Option<std::path::PathBuf>, sample_file_dir: Option<std::path::PathBuf>,
/// Resets the SQLite journal_mode to the specified mode prior to /// Resets the SQLite journal_mode to the specified mode prior to
/// the upgrade. /// the upgrade. `off` is very dangerous but may be desirable in some
/// /// circumstances. See `guide/schema.md` for more information. The journal
/// /// mode will be reset to `wal` after the upgrade.
/// default: `delete` (recommended). `off` is very dangerous but may be #[bpaf(argument("MODE"), fallback("delete".to_owned()), debug_fallback)]
/// desirable in some circumstances. See `guide/schema.md` for more
/// information. The journal mode will be reset to `wal` after the upgrade.
#[bpaf(argument("MODE"), fallback_with(|| Ok::<_, std::convert::Infallible>("delete".into())))]
preset_journal: String, preset_journal: String,
/// Skips the normal post-upgrade vacuum operation. /// Skips the normal post-upgrade vacuum operation.
no_vacuum: bool, no_vacuum: bool,
} }
pub fn subcommand() -> impl bpaf::Parser<Args> {
crate::subcommand(args(), "upgrade")
}
pub fn run(args: Args) -> Result<i32, Error> { pub fn run(args: Args) -> Result<i32, Error> {
let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?; let (_db_dir, mut conn) = super::open_conn(&args.db_dir, super::OpenMode::ReadWrite)?;

84
server/src/main.rs
View File

@ -6,7 +6,9 @@
use bpaf::{Bpaf, Parser}; use bpaf::{Bpaf, Parser};
use log::{debug, error}; use log::{debug, error};
use std::ffi::OsStr;
use std::fmt::Write; use std::fmt::Write;
use std::path::{Path, PathBuf};
use std::str::FromStr; use std::str::FromStr;
mod body; mod body;
@ -19,30 +21,6 @@ mod stream;
mod streamer; mod streamer;
mod web; mod web;
/// The program name, taken from the OS-provided arguments if available.
///
/// E.g. if invoked as `target/debug/nvr`, should return `nvr`.
static PROGNAME: once_cell::sync::Lazy<&'static str> = once_cell::sync::Lazy::new(|| {
std::env::args_os()
.next()
.and_then(|p| {
let p = std::path::PathBuf::from(p);
p.file_name().and_then(|f| {
f.to_str()
.map(|s| &*Box::leak(s.to_owned().into_boxed_str()))
})
})
.unwrap_or(env!("CARGO_PKG_NAME"))
});
fn subcommand<T: 'static>(
parser: bpaf::OptionParser<T>,
cmd: &'static str,
) -> impl bpaf::Parser<T> {
let usage = format!("Usage: {progname} {cmd} {{usage}}", progname = *PROGNAME);
parser.usage(Box::leak(usage.into_boxed_str())).command(cmd)
}
const DEFAULT_DB_DIR: &str = "/var/lib/moonfire-nvr/db"; const DEFAULT_DB_DIR: &str = "/var/lib/moonfire-nvr/db";
/// Moonfire NVR: security camera network video recorder. /// Moonfire NVR: security camera network video recorder.
@ -50,14 +28,14 @@ const DEFAULT_DB_DIR: &str = "/var/lib/moonfire-nvr/db";
#[bpaf(options, version)] #[bpaf(options, version)]
enum Args { enum Args {
// See docstrings of `cmds::*::Args` structs for a description of the respective subcommands. // See docstrings of `cmds::*::Args` structs for a description of the respective subcommands.
Check(#[bpaf(external(cmds::check::subcommand))] cmds::check::Args), Check(#[bpaf(external(cmds::check::args))] cmds::check::Args),
Config(#[bpaf(external(cmds::config::subcommand))] cmds::config::Args), Config(#[bpaf(external(cmds::config::args))] cmds::config::Args),
Init(#[bpaf(external(cmds::init::subcommand))] cmds::init::Args), Init(#[bpaf(external(cmds::init::args))] cmds::init::Args),
Login(#[bpaf(external(cmds::login::subcommand))] cmds::login::Args), Login(#[bpaf(external(cmds::login::args))] cmds::login::Args),
Run(#[bpaf(external(cmds::run::subcommand))] cmds::run::Args), Run(#[bpaf(external(cmds::run::args))] cmds::run::Args),
Sql(#[bpaf(external(cmds::sql::subcommand))] cmds::sql::Args), Sql(#[bpaf(external(cmds::sql::args))] cmds::sql::Args),
Ts(#[bpaf(external(cmds::ts::subcommand))] cmds::ts::Args), Ts(#[bpaf(external(cmds::ts::args))] cmds::ts::Args),
Upgrade(#[bpaf(external(cmds::upgrade::subcommand))] cmds::upgrade::Args), Upgrade(#[bpaf(external(cmds::upgrade::args))] cmds::upgrade::Args),
} }
impl Args { impl Args {
@ -75,14 +53,12 @@ impl Args {
} }
} }
fn parse_db_dir() -> impl Parser<std::path::PathBuf> { fn parse_db_dir() -> impl Parser<PathBuf> {
bpaf::long("db-dir") bpaf::long("db-dir")
.help(format!( .help("Directory holding the SQLite3 index database.")
"Directory holding the SQLite3 index database.\nDefault: `{}`", .argument::<PathBuf>("PATH")
DEFAULT_DB_DIR .fallback(DEFAULT_DB_DIR.into())
)) .debug_fallback()
.argument::<std::path::PathBuf>("PATH")
.fallback_with(|| Ok::<_, std::convert::Infallible>(DEFAULT_DB_DIR.into()))
} }
/// Custom panic hook that logs instead of directly writing to stderr. /// Custom panic hook that logs instead of directly writing to stderr.
@ -141,19 +117,15 @@ fn main() {
.build(); .build();
h.clone().install().unwrap(); h.clone().install().unwrap();
let args = args().usage(Box::leak( // Get the program name from the OS (e.g. if invoked as `target/debug/nvr`: `nvr`),
format!("Usage: {progname} {{usage}}", progname = *PROGNAME).into_boxed_str(), // falling back to the crate name if conversion to a path/UTF-8 string fails.
)); // `bpaf`'s default logic is similar but doesn't have the fallback.
let progname = std::env::args_os().next().map(PathBuf::from);
// TODO: remove this when bpaf adds more direct support for defaulting to `--help`. let progname = progname
// See discussion: <https://github.com/pacak/bpaf/discussions/165>. .as_deref()
if std::env::args_os().len() < 2 { .and_then(Path::file_name)
std::process::exit( .and_then(OsStr::to_str)
args.run_inner(bpaf::Args::from(&["--help"])) .unwrap_or(env!("CARGO_PKG_NAME"));
.unwrap_err()
.exit_code(),
);
}
let use_panic_hook = ::std::env::var("MOONFIRE_PANIC_HOOK") let use_panic_hook = ::std::env::var("MOONFIRE_PANIC_HOOK")
.map(|s| s != "false" && s != "0") .map(|s| s != "false" && s != "0")
@ -162,7 +134,13 @@ fn main() {
std::panic::set_hook(Box::new(&panic_hook)); std::panic::set_hook(Box::new(&panic_hook));
} }
let args = args.run(); let args = match args()
.fallback_to_usage()
.run_inner(bpaf::Args::current_args().set_name(progname))
{
Ok(a) => a,
Err(e) => std::process::exit(e.exit_code()),
};
log::trace!("Parsed command-line arguments: {args:#?}"); log::trace!("Parsed command-line arguments: {args:#?}");
let r = { let r = {