-.-

Author: Kitt3120

src/config/dns.rs

@@ -33,7 +33,8 @@ pub enum ResolveType {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
 pub struct Config {
-    #[serde(flatten)]
+    // https://github.com/acatton/serde-yaml-ng/issues/14
+    //#[serde(flatten)]
     pub dns: Type,
 }
 

src/config/provider.rs

@@ -5,20 +5,21 @@ use crate::provider::nitrado;
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
 pub enum Provider {
-    Nitrado(nitrado::ProviderConfig),
+    Nitrado(nitrado::Config),
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
 pub struct Config {
-    #[serde(flatten)]
+    // https://github.com/acatton/serde-yaml-ng/issues/14
+    //#[serde(flatten)]
     pub provider: Provider,
 }
 
 impl Default for Config {
     fn default() -> Self {
         Config {
-            provider: Provider::Nitrado(nitrado::ProviderConfig::default()),
+            provider: Provider::Nitrado(nitrado::Config::default()),
         }
     }
 }

src/main.rs

@@ -88,10 +88,10 @@ async fn main() -> Result<(), Error> {
     }
     let config_existed = loaded_config.is_some();
 
-    let config = Config::default();
+    let default_config = Config::default();
     let config = match loaded_config {
-        Some(loaded_config) => merge(config, loaded_config),
-        None => config,
+        Some(loaded_config) => merge(default_config, loaded_config),
+        None => default_config,
     };
 
     if let Some(parent) = config_path.parent() {

src/provider/nitrado.rs

@@ -20,15 +20,15 @@ use crate::{
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "lum_libs::serde")]
-pub struct ProviderConfig {
+pub struct Config {
     pub name: String,
     pub api_key: String,
     pub api_base_url: String,
 }
 
-impl Default for ProviderConfig {
+impl Default for Config {
     fn default() -> Self {
-        ProviderConfig {
+        Config {
             name: "Nitrado1".to_string(),
             api_key: "your_api_key".to_string(),
             api_base_url: "https://api.nitrado.net".to_string(),
@@ -107,13 +107,11 @@ impl Default for DnsConfig {
 }
 
 pub struct NitradoProvider<'provider_config> {
-    pub provider_config: &'provider_config ProviderConfig,
+    pub provider_config: &'provider_config Config,
 }
 
 impl<'provider_config> NitradoProvider<'provider_config> {
-    pub fn new(
-        provider_config: &'provider_config ProviderConfig,
-    ) -> NitradoProvider<'provider_config> {
+    pub fn new(provider_config: &'provider_config Config) -> NitradoProvider<'provider_config> {
         NitradoProvider { provider_config }
     }
 }