extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2024-12-26 17:09:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix env config parsing (#295)

Browse Source 
* fix env config parsing

* fmt
This commit is contained in:
Conrad Ludgate 2022-04-12 21:47:07 +01:00 committed by GitHub
parent ac0d29f6dc
commit 3b7ed7caff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Cargo.lock generated
View File

@ -2,12 +2,6 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 3
[[package]]
name = "ahash"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
[[package]] [[package]]
name = "ahash" name = "ahash"
version = "0.7.6" version = "0.7.6"
@ -371,9 +365,9 @@ dependencies = [
[[package]] [[package]]
name = "config" name = "config"
version = "0.12.0" version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86" checksum = "a623a46970097d353e2c8154fa527d8ce45cd0e02cc1812969b889c49b3728e8"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"json5", "json5",
@ -577,12 +571,9 @@ dependencies = [
[[package]] [[package]]
name = "dlv-list" name = "dlv-list"
version = "0.2.3" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
dependencies = [
"rand 0.8.5",
]
[[package]] [[package]]
name = "dotenv" name = "dotenv"
@ -819,22 +810,22 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "hashbrown"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
dependencies = [
"ahash 0.4.7",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.11.2" version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
dependencies = [ dependencies = [
"ahash 0.7.6", "ahash",
]
[[package]]
name = "hashbrown"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
dependencies = [
"ahash",
] ]
[[package]] [[package]]
@ -1388,12 +1379,12 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]] [[package]]
name = "ordered-multimap" name = "ordered-multimap"
version = "0.3.1" version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
dependencies = [ dependencies = [
"dlv-list", "dlv-list",
"hashbrown 0.9.1", "hashbrown 0.12.0",
] ]
[[package]] [[package]]
@ -1865,9 +1856,9 @@ dependencies = [
[[package]] [[package]]
name = "rust-ini" name = "rust-ini"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"ordered-multimap", "ordered-multimap",
@ -2164,7 +2155,7 @@ version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "195183bf6ff8328bb82c0511a83faf60aacf75840103388851db61d7a9854ae3" checksum = "195183bf6ff8328bb82c0511a83faf60aacf75840103388851db61d7a9854ae3"
dependencies = [ dependencies = [
"ahash 0.7.6", "ahash",
"atoi", "atoi",
"base64", "base64",
"bitflags", "bitflags",

2
atuin-client/Cargo.toml
View File

@ -20,7 +20,7 @@ directories = "3"
uuid = { version = "0.8", features = ["v4"] } uuid = { version = "0.8", features = ["v4"] }
whoami = "1.1.2" whoami = "1.1.2"
chrono-english = "0.1.4" chrono-english = "0.1.4"
config = "0.12" config = "0.13"
serde_derive = "1.0.125" serde_derive = "1.0.125"
serde = "1.0.126" serde = "1.0.126"
serde_json = "1.0.75" serde_json = "1.0.75"

6
atuin-client/src/settings.rs
View File

@ -148,7 +148,11 @@ impl Settings {
.set_default("search_mode", "prefix")? .set_default("search_mode", "prefix")?
.set_default("session_token", "")? .set_default("session_token", "")?
.set_default("style", "auto")? .set_default("style", "auto")?
.add_source(Environment::with_prefix("atuin").separator("_")); .add_source(
Environment::with_prefix("atuin")
.prefix_separator("_")
.separator("__"),
);
config_builder = if config_file.exists() { config_builder = if config_file.exists() {
config_builder.add_source(ConfigFile::new( config_builder.add_source(ConfigFile::new(

2
atuin-server/Cargo.toml
View File

@ -16,7 +16,7 @@ chrono = { version = "0.4", features = ["serde"] }
eyre = "0.6" eyre = "0.6"
uuid = { version = "0.8", features = ["v4"] } uuid = { version = "0.8", features = ["v4"] }
whoami = "1.1.2" whoami = "1.1.2"
config = "0.12" config = "0.13"
serde_derive = "1.0.125" serde_derive = "1.0.125"
serde = "1.0.126" serde = "1.0.126"
serde_json = "1.0.75" serde_json = "1.0.75"

6
atuin-server/src/settings.rs
View File

@ -38,7 +38,11 @@ impl Settings {
.set_default("port", 8888)? .set_default("port", 8888)?
.set_default("open_registration", false)? .set_default("open_registration", false)?
.set_default("db_uri", "default_uri")? .set_default("db_uri", "default_uri")?
.add_source(Environment::with_prefix("atuin").separator("_")); .add_source(
Environment::with_prefix("atuin")
.prefix_separator("_")
.separator("__"),
);
config_builder = if config_file.exists() { config_builder = if config_file.exists() {
config_builder.add_source(ConfigFile::new( config_builder.add_source(ConfigFile::new(