Separate IMAP and SMTP configuration

Co-Authored-By: link2xt <ilabdsf@gmail.com>
Co-Authored-By: bjoern <r10s@b44t.com>

src/provider/mod.rs

@@ -4,9 +4,12 @@ mod data;
 
 use crate::config::Config;
 use crate::dc_tools::EmailAddress;
-use crate::provider::data::PROVIDER_DATA;
+use crate::{
+    login_param::{ImapServers, ServerParams, SmtpServers},
+    provider::data::PROVIDER_DATA,
+};
 
-#[derive(Debug, Copy, Clone, PartialEq, ToPrimitive)]
+#[derive(Debug, Display, Copy, Clone, PartialEq, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Status {
     OK = 1,
@@ -14,21 +17,29 @@ pub enum Status {
     BROKEN = 3,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Protocol {
     SMTP = 1,
     IMAP = 2,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Display, PartialEq, Copy, Clone, FromPrimitive, ToPrimitive)]
 #[repr(u8)]
 pub enum Socket {
-    STARTTLS = 1,
-    SSL = 2,
+    Automatic = 0,
+    SSL = 1,
+    STARTTLS = 2,
+    Plain = 3,
 }
 
-#[derive(Debug, PartialEq)]
+impl Default for Socket {
+    fn default() -> Self {
+        Socket::Automatic
+    }
+}
+
+#[derive(Debug, PartialEq, Clone)]
 #[repr(u8)]
 pub enum UsernamePattern {
     EMAIL = 1,
@@ -42,7 +53,7 @@ pub enum Oauth2Authorizer {
     Gmail = 2,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Server {
     pub protocol: Protocol,
     pub socket: Socket,
@@ -51,20 +62,6 @@ pub struct Server {
     pub username_pattern: UsernamePattern,
 }
 
-impl Server {
-    pub fn apply_username_pattern(&self, addr: String) -> String {
-        match self.username_pattern {
-            UsernamePattern::EMAIL => addr,
-            UsernamePattern::EMAILLOCALPART => {
-                if let Some(at) = addr.find('@') {
-                    return addr.split_at(at).0.to_string();
-                }
-                addr
-            }
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ConfigDefault {
     pub key: Config,
@@ -84,20 +81,25 @@ pub struct Provider {
 }
 
 impl Provider {
-    pub fn get_server(&self, protocol: Protocol) -> Option<&Server> {
-        for record in self.server.iter() {
-            if record.protocol == protocol {
-                return Some(record);
-            }
-        }
-        None
+    pub fn get_server(&self, protocol: Protocol) -> Vec<ServerParams> {
+        self.server
+            .iter()
+            .filter(|s| s.protocol == protocol)
+            .map(|s| ServerParams {
+                protocol: s.protocol,
+                socket: s.socket,
+                hostname: s.hostname.to_string(),
+                port: s.port,
+                username_pattern: s.username_pattern.clone(),
+            })
+            .collect()
     }
 
-    pub fn get_imap_server(&self) -> Option<&Server> {
+    pub fn get_imap_server(&self) -> ImapServers {
         self.get_server(Protocol::IMAP)
     }
 
-    pub fn get_smtp_server(&self) -> Option<&Server> {
+    pub fn get_smtp_server(&self) -> SmtpServers {
         self.get_server(Protocol::SMTP)
     }
 }
@@ -139,13 +141,13 @@ mod tests {
 
         let provider = get_provider_info("user@nauta.cu").unwrap();
         assert!(provider.status == Status::OK);
-        let server = provider.get_imap_server().unwrap();
+        let server = &provider.get_imap_server()[0];
         assert_eq!(server.protocol, Protocol::IMAP);
         assert_eq!(server.socket, Socket::STARTTLS);
         assert_eq!(server.hostname, "imap.nauta.cu");
         assert_eq!(server.port, 143);
         assert_eq!(server.username_pattern, UsernamePattern::EMAIL);
-        let server = provider.get_smtp_server().unwrap();
+        let server = &provider.get_smtp_server()[0];
         assert_eq!(server.protocol, Protocol::SMTP);
         assert_eq!(server.socket, Socket::STARTTLS);
         assert_eq!(server.hostname, "smtp.nauta.cu");