robin/nextcloud-config-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/nextcloud-config-parser.git synced 2026-06-03 16:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.11.0

Browse source
This commit is contained in:
Robin Appelman 2024-07-26 18:05:19 +02:00
commit f61ab10717
5 changed files with 321 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

582
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

14
Cargo.toml
View file

@ -1,26 +1,26 @@
[package] [package]
name = "nextcloud-config-parser" name = "nextcloud-config-parser"
description = "Rust parser for nextcloud config files" description = "Rust parser for nextcloud config files"
version = "0.10.0" version = "0.11.0"
authors = ["Robin Appelman <robin@icewind.nl>"] authors = ["Robin Appelman <robin@icewind.nl>"]
edition = "2021" edition = "2021"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
repository = "https://github.com/icewind1991/nextcloud-config-parser" repository = "https://github.com/icewind1991/nextcloud-config-parser"
documentation = "https://docs.rs/nextcloud-config-parser" documentation = "https://docs.rs/nextcloud-config-parser"
rust-version = "1.70.0" rust-version = "1.74.1"
[dependencies] [dependencies]
redis = { version = "0.25.0", optional = true, default-features = false } redis = { version = "0.26.0", optional = true, default-features = false }
thiserror = "1.0.57" thiserror = "1.0.63"
php-literal-parser = "0.6.0" php-literal-parser = "0.6.1"
sqlx = { version = "0.7.3", default-features = false, features = ["any", "mysql", "sqlite", "postgres"], optional = true } sqlx = { version = "0.8.0", default-features = false, features = ["any", "mysql", "sqlite", "postgres"], optional = true }
miette = "7.2.0" miette = "7.2.0"
futures-core = "0.3.30" futures-core = "0.3.30"
urlencoding = "2.1.3" urlencoding = "2.1.3"
form_urlencoded = "1.2.1" form_urlencoded = "1.2.1"
[dev-dependencies] [dev-dependencies]
sqlx = { version = "0.7.3", default-features = false, features = ["runtime-tokio-rustls", "any", "mysql", "sqlite", "postgres"] } sqlx = { version = "0.8.0", default-features = false, features = ["runtime-tokio-rustls", "any", "mysql", "sqlite", "postgres"] }
miette = { version = "7.2.0", features = ["fancy"] } miette = { version = "7.2.0", features = ["fancy"] }
[features] [features]

29
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1698420672, "lastModified": 1721727458,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9", "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,16 +22,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701370627, "lastModified": 1721997856,
"narHash": "sha256-IwAmchiohb/0UkxAq5kSdOrDZZIZCs+hmSA1FFzWPFs=", "narHash": "sha256-lqdEpBildlMxigCG84TKLzFQWeHSsa1HFJ4ZKYBdsNQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d450276166762338e6da4a865356bd05c526d97", "rev": "236a12b90ad31b1c9da19d87a67cd6233d9aea71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "release-23.11", "ref": "release-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -45,19 +45,16 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": [
"utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1701310566, "lastModified": 1721960387,
"narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=", "narHash": "sha256-o21ax+745ETGXrcgc/yUuLw1SI77ymp3xEpJt+w/kks=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff", "rev": "9cbf831c5b20a53354fc12758abd05966f9f1699",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,11 +83,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1710146030,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
nixpkgs.url = "nixpkgs/release-23.11"; nixpkgs.url = "nixpkgs/release-24.05";
naersk.url = "github:nix-community/naersk"; naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";

4
src/nc.rs
View file

@ -307,6 +307,8 @@ enum RedisAddress {
#[cfg(feature = "redis-connect")] #[cfg(feature = "redis-connect")]
fn parse_redis_options(parsed: &Value) -> RedisConfig { fn parse_redis_options(parsed: &Value) -> RedisConfig {
use redis::ProtocolVersion;
let (redis_options, address) = if parsed["redis.cluster"].is_array() { let (redis_options, address) = if parsed["redis.cluster"].is_array() {
let redis_options = &parsed["redis.cluster"]; let redis_options = &parsed["redis.cluster"];
let seeds = redis_options["seeds"].values(); let seeds = redis_options["seeds"].values();
@ -352,6 +354,7 @@ fn parse_redis_options(parsed: &Value) -> RedisConfig {
db, db,
username, username,
password, password,
protocol: ProtocolVersion::default(),
}, },
}), }),
RedisAddress::Cluster(addresses) => RedisConfig::Cluster( RedisAddress::Cluster(addresses) => RedisConfig::Cluster(
@ -363,6 +366,7 @@ fn parse_redis_options(parsed: &Value) -> RedisConfig {
db, db,
username: username.clone(), username: username.clone(),
password: password.clone(), password: password.clone(),
protocol: ProtocolVersion::default(),
}, },
}) })
.collect(), .collect(),