allanger/helmule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Change include type to struct

Browse Source
This commit is contained in:
Nikolai Rodionov
2024-01-11 18:27:52 +01:00
parent 2ca5e7394b
commit 77f1d0dcb9
4 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/config/include.rs
View File

@ -8,11 +8,17 @@ pub(crate) enum IncludeTypes {
Repositories,
}
#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
pub(crate) struct Include {
kind: IncludeTypes,
path: String,
}
pub(crate) fn apply_includes(config: &mut super::Config) -> Result<(), Box<dyn std::error::Error>> {
for (kind, path) in config.include.clone().unwrap() {
match kind {
for include in config.include.clone().unwrap() {
match include.kind {
IncludeTypes::Charts => {
let mut charts = include_chart(path)?;
let mut charts = include_chart(include.path)?;
let extended_charts = match config.charts.clone() {
Some(mut existing_charts) => {
existing_charts.append(&mut charts);
@ -23,7 +29,7 @@ pub(crate) fn apply_includes(config: &mut super::Config) -> Result<(), Box<dyn s
config.charts = Some(extended_charts);
},
IncludeTypes::Mirrors => {
let mut mirrors = include_mirrors(path)?;
let mut mirrors = include_mirrors(include.path)?;
let extended_mirrors = match config.mirrors.clone() {
Some(mut existing_mirrors) => {
existing_mirrors.append(&mut mirrors);
@ -34,7 +40,7 @@ pub(crate) fn apply_includes(config: &mut super::Config) -> Result<(), Box<dyn s
config.mirrors = Some(extended_mirrors);
},
IncludeTypes::Repositories => {
let mut repositories = include_repositories(path)?;
let mut repositories = include_repositories(include.path)?;
let extended_repositories = match config.repositories.clone() {
Some(mut existing_repositories) => {
existing_repositories.append(&mut repositories);

2
src/config/mod.rs
View File

@ -8,7 +8,7 @@ pub(crate) mod include;
#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
pub(crate) struct Config {
pub(crate) include: Option<HashMap::<include::IncludeTypes, String>>,
pub(crate) include: Option<Vec<include::Include>>,
pub(crate) variables: Option<HashMap<String, String>>,
pub(crate) repositories: Option<Vec<Repository>>,
pub(crate) charts: Option<Vec<Chart>>,