Merge branch 'dev'

Author: un-lock-able

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cloudflare-ddns-rust"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

settings.example.json

@@ -8,18 +8,18 @@
     "domain_settings": [
         {
             "enabled": false,
-            "domainName": "example.com",
+            "domain_name": "example.com",
             "service_provider": {
                 "provider_name": "cloudflare",
                 "zone_id": "your_zone_ID",
                 "api_token": "your_api_token"
             },
-            "recordType": "AAAA",
-            "createNewRecord": true,
+            "record_type": "AAAA",
+            "create_new_record": true,
             "subdomains": [
                 {
                     "name": "test",
-                    "interfaceID": "::2903"
+                    "interface_id": "::2903"
                 }
             ]
         },
@@ -31,8 +31,8 @@
                 "zone_id": "your_zone_ID",
                 "api_token": "your_api_token"
             },
-            "recordType": "A",
-            "createNewRecord": false,
+            "record_type": "A",
+            "create_new_record": false,
             "subdomains": [
                 {
                     "name": "test",

src/api/cloudflare/mod.rs

@@ -25,7 +25,7 @@ pub struct CloudflareInterface {
 
 impl CloudflareInterface {
     fn get_full_domain(subdomain: &str, base_domain: &str) -> String {
-        if subdomain == "@" || subdomain == "" {
+        if subdomain == "@" || subdomain.is_empty() {
             base_domain.to_string()
         } else {
             format!("{}.{}", subdomain, base_domain)

src/config/cmd.rs

@@ -22,14 +22,14 @@ impl std::fmt::Display for LogLevel {
     }
 }
 
-impl std::convert::Into<LevelFilter> for LogLevel {
-    fn into(self) -> LevelFilter {
-        match self {
-            Self::Trace => LevelFilter::Trace,
-            Self::Debug => LevelFilter::Debug,
-            Self::Info => LevelFilter::Info,
-            Self::Warn => LevelFilter::Warn,
-            Self::Error => LevelFilter::Error,
+impl std::convert::From<LogLevel> for LevelFilter {
+    fn from(val: LogLevel) -> Self {
+        match val {
+            LogLevel::Trace => LevelFilter::Trace,
+            LogLevel::Debug => LevelFilter::Debug,
+            LogLevel::Info => LevelFilter::Info,
+            LogLevel::Warn => LevelFilter::Warn,
+            LogLevel::Error => LevelFilter::Error,
         }
     }
 }

src/config/mod.rs

@@ -8,14 +8,15 @@ use serde::{Deserialize, Serialize};
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 pub enum RecordType {
     A,
-    AAAA,
+    #[serde(rename = "AAAA")]
+    Aaaa,
 }
 
 impl std::fmt::Display for RecordType {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         match self {
             RecordType::A => write!(f, "A"),
-            RecordType::AAAA => write!(f, "AAAA"),
+            RecordType::Aaaa => write!(f, "AAAA"),
         }
     }
 }
@@ -24,7 +25,7 @@ impl From<IpAddr> for RecordType {
     fn from(value: IpAddr) -> Self {
         match value {
             IpAddr::V4(_) => Self::A,
-            IpAddr::V6(_) => Self::AAAA,
+            IpAddr::V6(_) => Self::Aaaa,
         }
     }
 }

src/domain_record_changer.rs

@@ -59,17 +59,16 @@ where
             Err(message) => {
                 log::error!("Authorize api failed: {}", message);
                 return;
-            },
+            }
         }
 
         'subdomain_iter: for subdomain_settings in &self.subdomains {
-            let full_domain_name: String;
-
-            if subdomain_settings.name == "@" || subdomain_settings.name == "" {
-                full_domain_name = self.domain_name.clone();
-            } else {
-                full_domain_name = format!("{}.{}", subdomain_settings.name, &self.domain_name);
-            }
+            let full_domain_name =
+                if subdomain_settings.name == "@" || subdomain_settings.name.is_empty() {
+                    self.domain_name.clone()
+                } else {
+                    format!("{}.{}", subdomain_settings.name, &self.domain_name)
+                };
             log::debug!("Start DDNS for {}", full_domain_name);
 
             // Convert the ip address to ip to be sent by api request.
@@ -97,8 +96,7 @@ where
                         if interface_addr_arr
                             .iter()
                             .take(4)
-                            .fold(0, |accu, cur| accu + cur)
-                            != 0
+                            .sum::<u16>() != 0
                         {
                             log::warn!(
                                 "The first 64 bits of the interface id are not 0. They are ignored."

src/main.rs

@@ -117,7 +117,7 @@ fn main() {
                 return Err(());
             }
         };
-        return Ok(result);
+        Ok(result)
     });
 
     let ipv6_address = thread::spawn(|| {
@@ -141,17 +141,17 @@ fn main() {
                 return Err(());
             }
         };
-        return Ok(result);
+        Ok(result)
     });
 
     let ipv4_address = ipv4_address.join().unwrap_or_else(|_| {
         log::error!("Get ipv4 address failed: thread exited abnormally.");
-        return Err(());
+        Err(())
     });
 
     let ipv6_address = ipv6_address.join().unwrap_or_else(|_| {
         log::error!("Get ipv6 address failed: thread exited abnormally.");
-        return Err(());
+        Err(())
     });
 
     let ipv4_address = match ipv4_address {
@@ -210,7 +210,7 @@ fn main() {
                         continue;
                     }
                 },
-                RecordType::AAAA => match &ipv6_address {
+                RecordType::Aaaa => match &ipv6_address {
                     Ok(address) => IpAddr::V6(*address),
                     Err(_) => {
                         log::error!("Skipping AAAA record update for {} as a result of previously failed ip address aquisition.", single_domain_settings.domain_name);
@@ -219,7 +219,7 @@ fn main() {
                 },
             };
             let mut changer = match single_domain_settings.service_provider.clone() {
-                ServiceProvider::Cloudflare(build_config) => DomainRecordChanger::new(single_domain_settings, current_ip_address.clone(), CloudflareInterface::new(build_config))
+                ServiceProvider::Cloudflare(build_config) => DomainRecordChanger::new(single_domain_settings, current_ip_address, CloudflareInterface::new(build_config))
             };
             s.spawn(move |_| {changer.start_ddns();});
         }