Fix config example

diptools · Dec 19, 2022 · aed9bd7 · aed9bd7 · vercel · Dec 19, 2022
1 parent 0d17600
commit aed9bd7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/examples/cli/config/main.rs b/examples/cli/config/main.rs
@@ -7,7 +7,9 @@ use serde::Deserialize;
 
 fn main() {
     App::new()
-        .add_plugin(ConfigPlugin::new())
+        .add_plugin(ConfigPlugin::<Config>::with_default_str(include_str!(
+            "config/default.toml"
+        )))
         .add_startup_system_to_stage(ConfigStartupStage::Setup, add_custom_sources)
         .add_system(log_config)
         .run();
@@ -23,7 +25,7 @@ fn log_config(config: Res<Config>) {
     println!("{:#?}", *config);
 }
 
-#[derive(ConfigPlugin, Debug, Deserialize)]
+#[derive(Debug, Deserialize)]
 #[allow(dead_code)]
 pub struct Config {
     base_url: String,

diff --git a/plugins/bundle/src/config.rs b/plugins/bundle/src/config.rs
@@ -8,7 +8,7 @@ use config::{
     builder::{ConfigBuilder, DefaultState},
     File,
 };
-use dip_core::{config::ConfigPlugin as ConfigPluginRaw, prelude::ConfigStartupStage};
+use dip_core::{config::ConfigPlugin, prelude::ConfigStartupStage};
 use reqwest::Url;
 use serde::{de, Deserialize, Deserializer};
 use std::{fs, path::PathBuf};
@@ -17,14 +17,14 @@ pub struct BundleConfigPlugin;
 
 impl Plugin for BundleConfigPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugin(ConfigPluginRaw::<BundleConfig>::with_default_str(
+        app.add_plugin(ConfigPlugin::<BundleConfig>::with_default_str(
             include_str!("config/default.toml"),
         ))
-        .add_startup_system_to_stage(ConfigStartupStage::Setup, add_sources);
+        .add_startup_system_to_stage(ConfigStartupStage::Setup, add_user_config);
     }
 }
 
-fn add_sources(mut builder: ResMut<ConfigBuilder<DefaultState>>) {
+fn add_user_config(mut builder: ResMut<ConfigBuilder<DefaultState>>) {
     let config_file_path = BundleConfig::config_file_path();
 
     if config_file_path.is_file() {
@@ -75,8 +75,7 @@ pub struct BundleConfig {
 
 impl BundleConfig {
     pub fn config_file_path() -> PathBuf {
-        let p = Config::config_dir().join("bundle");
-        Config::ensure_dir(&p);
+        let p = Config::config_dir().join("bundle.toml");
 
         p
     }