clean

ludwigdn · Dec 29, 2023 · a016905 · a016905
1 parent e8056c7
commit a016905
Show file tree

Hide file tree

Showing 30 changed files with 53 additions and 398 deletions.
diff --git a/SecretSanta/Interfaces/IMailSender.cs b/SecretSanta/Interfaces/IMailSender.cs
@@ -1,7 +1,4 @@
 using SecretSanta.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace SecretSanta.Interfaces

diff --git a/SecretSanta/Interfaces/IRandomizer.cs b/SecretSanta/Interfaces/IRandomizer.cs
@@ -1,7 +1,5 @@
 using SecretSanta.Models;
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace SecretSanta.Interfaces
 {

diff --git a/SecretSanta/Models/Config.cs b/SecretSanta/Models/Config.cs
@@ -1,11 +1,8 @@
 using Newtonsoft.Json;
 using SecretSanta.Models;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 
 namespace SecretSanta
 {

diff --git a/SecretSanta/Models/Participant.cs b/SecretSanta/Models/Participant.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
 
 namespace SecretSanta.Models
 {

diff --git a/SecretSanta/Program.cs b/SecretSanta/Program.cs
@@ -1,14 +1,6 @@
 using CommandLine;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Schema;
-using Newtonsoft.Json.Serialization;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Bson;
-using System;
-using System.IO;
 using System.Linq;
 using SecretSanta.Services;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace SecretSanta

diff --git a/SecretSanta/Services/MailService.cs b/SecretSanta/Services/MailService.cs
@@ -6,9 +6,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace SecretSanta.Services

diff --git a/SecretSanta/Services/ManualConfigService.cs b/SecretSanta/Services/ManualConfigService.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.IO;
-using Newtonsoft.Json.Linq;
 using SecretSanta.Models;
 using SecretSanta.Utils;
 
@@ -36,9 +34,9 @@ public Config GetConfig(LocaleService localeService)
 
             DisplaySeparator(_step++);
             config.Participants.AddRange(GetParticipants());
-            
+
             DisplaySeparator(_step++);
-            var mailProviderSettings = GetMailProviderSettings();            
+            var mailProviderSettings = GetMailProviderSettings();
             config.SmtpHost = mailProviderSettings.SMTP_HOST;
             config.SmtpPort = mailProviderSettings.SMTP_PORT;
 
@@ -54,43 +52,43 @@ public Config GetConfig(LocaleService localeService)
 
         private string GetLanguage()
         {
-            Console.WriteLine(); 
+            Console.WriteLine();
             WriteSlow("Langue du programme / Software language");
-            Console.WriteLine(); 
+            Console.WriteLine();
 
             Console.WriteLine($"   1. Français");
             Console.WriteLine($"   2. English");
 
-            Console.WriteLine(); 
+            Console.WriteLine();
             WriteSlow("Entrez le n° correspondant / Enter the corresponding number:");
             Console.Write(" > ");
 
             var lang = GetInteger(ReadLine(), max: 2, errorMessage: "Saisie invalide, veuillez réessayer. Invalid input, please try again.");
-            return lang == 1 
-                ? "fr" 
+            return lang == 1
+                ? "fr"
                 : "en";
         }
 
         private List<Participant> GetParticipants()
         {
-            Console.WriteLine(); 
-            WriteSlow(_localeService.Get(LocaleService.QUESTION_PARTICIPANTS)); 
-            Console.WriteLine(); 
+            Console.WriteLine();
+            WriteSlow(_localeService.Get(LocaleService.QUESTION_PARTICIPANTS));
+            Console.WriteLine();
             int participantsCount = GetInteger(GetAnswerFrom(_localeService.Get(LocaleService.QUESTION_PARTICIPANTS_COUNT)));
 
             var list = new List<Participant>();
             for (int i = 1 ; i <= participantsCount ; i++)
-            {   
+            {
                 var participant = new Participant();
 
                 participant.Name = CheckDistinctString(
-                    GetAnswerFrom(string.Format(_localeService.Get(LocaleService.QUESTION_PARTICPANT_NAME), i)), 
-                    list.Select(o => o.Name), 
+                    GetAnswerFrom(string.Format(_localeService.Get(LocaleService.QUESTION_PARTICPANT_NAME), i)),
+                    list.Select(o => o.Name),
                     _localeService.Get(LocaleService.WARNING_NAME_EXISTS));
 
                 participant.Email = CheckDistinctString(
-                    GetAnswerFrom(string.Format(_localeService.Get(LocaleService.QUESTION_PARTICPANT_EMAIL), i)), 
-                    list.Select(o => o.Email), 
+                    GetAnswerFrom(string.Format(_localeService.Get(LocaleService.QUESTION_PARTICPANT_EMAIL), i)),
+                    list.Select(o => o.Email),
                     _localeService.Get(LocaleService.WARNING_EMAIL_EXISTS));
 
                 list.Add(participant);
@@ -108,15 +106,15 @@ private MailProviderSettings GetMailProviderSettings()
             var settings = MailProviderSettings.Get(AskMailProviderQuestion());
             if (settings == null)
                 settings = AskCustomMailProviderSettings();
-            
+
             return settings;
         }
 
         private MailProvider AskMailProviderQuestion()
         {
-            Console.WriteLine(); 
+            Console.WriteLine();
             WriteSlow(_localeService.Get(LocaleService.QUESTION_USER_PROVIDER));
-            Console.WriteLine(); 
+            Console.WriteLine();
 
             System.Threading.Thread.Sleep(500);
 
@@ -125,23 +123,23 @@ private MailProvider AskMailProviderQuestion()
             foreach (var value in Enum.GetValues(typeof(MailProvider)))
             {
                 dic.Add(idx, (MailProvider)value);
-                
+
                 var displayedValue = (MailProvider)value == MailProvider.UNKOWN
                     ? _localeService.Get(LocaleService.QUESTION_USER_PROVIDER_UNKNOWN)
                     : $"{value}";
 
                 Console.WriteLine($"   {idx ++}. {displayedValue}");
             }
-            
+
             System.Threading.Thread.Sleep(500);
 
             var selectedProvider = GetAnswerFrom(_localeService.Get(LocaleService.QUESTION_USER_PROVIDER_INDEX));
             return dic[GetInteger(selectedProvider, max: idx)];
         }
-        
+
         private MailProviderSettings AskCustomMailProviderSettings()
         {
-            Console.WriteLine(); 
+            Console.WriteLine();
             WriteSlow(_localeService.Get(LocaleService.QUESTION_USER_PROVIDER_MANUAL));
 
             var host = GetAnswerFrom(_localeService.Get(LocaleService.QUESTION_USER_PROVIDER_HOST));
@@ -152,11 +150,11 @@ private MailProviderSettings AskCustomMailProviderSettings()
 
         private (string email, string password) GetUserCredentials()
         {
-            Console.WriteLine(); 
-            WriteSlow(_localeService.Get(LocaleService.QUESTION_USER_EMAIL_SETUP));            
-            var email = GetAnswerFrom(_localeService.Get(LocaleService.QUESTION_USER_EMAIL)); 
+            Console.WriteLine();
+            WriteSlow(_localeService.Get(LocaleService.QUESTION_USER_EMAIL_SETUP));
+            var email = GetAnswerFrom(_localeService.Get(LocaleService.QUESTION_USER_EMAIL));
             var password = GetAnswerFrom(_localeService.Get(LocaleService.QUESTION_USER_PASSWORD));
-            Console.WriteLine();  
+            Console.WriteLine();
             return (email, password);
         }
 
@@ -169,39 +167,39 @@ public void DisplayEndProcess()
             WriteSlow(_localeService.Get(LocaleService.AUTO_THANKS_2), false);
             ReadLine();
         }
-        
+
         #endregion Questions
 
         #region Utils
 
         private int GetInteger(string answer, int min = 1, int max = Int16.MaxValue, string errorMessage = null)
         {
-            int count;            
+            int count;
             while (!int.TryParse(answer, System.Globalization.NumberStyles.Integer, null, out count) || count < min || count > max)
             {
-                Console.WriteLine();  
-                WriteSlow(errorMessage ?? _localeService.Get(LocaleService.WARNING_INTEGER));  
-                Console.Write(" > ");         
+                Console.WriteLine();
+                WriteSlow(errorMessage ?? _localeService.Get(LocaleService.WARNING_INTEGER));
+                Console.Write(" > ");
                 answer = ReadLine();
             }
             return count;
         }
-        
+
         private string CheckDistinctString(string answer, IEnumerable<string> existing, string errorMessage)
         {
             while (existing.Any(o => o.ToLowerInvariant() == answer.ToLowerInvariant()))
             {
-                Console.WriteLine();  
-                WriteSlow(errorMessage);  
-                Console.Write(" > ");         
+                Console.WriteLine();
+                WriteSlow(errorMessage);
+                Console.Write(" > ");
                 answer = ReadLine();
             }
             return answer;
         }
-       
+
         private string GetAnswerFrom(string question)
         {
-            Console.WriteLine();  
+            Console.WriteLine();
             WriteSlow(question);
             Console.Write(" > ");
             return ReadLine();
@@ -234,4 +232,4 @@ private string ReadLine()
         #endregion Utils
 
     }
-}
+}
diff --git a/SecretSanta/Services/RandomizeService.cs b/SecretSanta/Services/RandomizeService.cs
@@ -2,9 +2,7 @@
 using SecretSanta.Models;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 
 namespace SecretSanta.Services
 {

diff --git a/SecretSanta/Utils/MailMessageFormatter.cs b/SecretSanta/Utils/MailMessageFormatter.cs
@@ -1,15 +1,8 @@
-using MailKit.Net.Smtp;
-using MimeKit;
-using MimeKit.Text;
-using SecretSanta.Interfaces;
 using SecretSanta.Models;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace SecretSanta.Services
 {

diff --git a/SecretSanta/Utils/MailProviderSettings.cs b/SecretSanta/Utils/MailProviderSettings.cs
@@ -1,14 +1,3 @@
-using MailKit.Net.Smtp;
-using MimeKit;
-using MimeKit.Text;
-using SecretSanta.Interfaces;
-using SecretSanta.Models;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace SecretSanta.Utils
 {
     public class MailProviderSettings
@@ -19,13 +8,13 @@ public class MailProviderSettings
         public MailProviderSettings(string host, string port)
         {
             SMTP_HOST = host;
-            SMTP_PORT = port;            
+            SMTP_PORT = port;
         }
-        
+
         private MailProviderSettings() { }
 
         public static MailProviderSettings Get(MailProvider provider)
-        {       
+        {
             string host;
             string port;
 
@@ -40,23 +29,23 @@ public static MailProviderSettings Get(MailProvider provider)
                     host = "smtp.aol.com";
                     port = "465";
                     break;
-                    
+
                 case MailProvider.BOUYGUES:
                 case MailProvider.BBOX:
                     host = "smtp.bbox.fr";
                     port = "587";
                     break;
-                    
+
                 case MailProvider.FREE:
                     host = "smtp.free.fr";
                     port = "465";
                     break;
-                    
+
                 case MailProvider.GMAIL:
                     host = "smtp.gmail.com";
                     port = "465";
-                    break;                    
-                    
+                    break;
+
                 case MailProvider.HOTMAIL:
                     host = "smtp.live.com";
                     port = "587";
@@ -71,28 +60,28 @@ public static MailProviderSettings Get(MailProvider provider)
                     host = "smtps.numericable.fr";
                     port = "587";
                     break;
-                    
+
                 case MailProvider.ORANGE:
                     host = "smtp.orange.fr";
                     port = "465";
                     break;
-                    
+
                 case MailProvider.OUTLOOK:
                     host = "SMTP.office365.com";
                     port = "587";
                     break;
-                    
+
                 case MailProvider.SFR:
                 case MailProvider.NEUF:
                     host = "smtp.sfr.fr";
                     port = "465";
                     break;
-                    
+
                 case MailProvider.YAHOO:
                     host = "smtp.mail.yahoo.com";
                     port = "465";
                     break;
-                    
+
                 case MailProvider.ZOHO:
                     host = "smtp.zoho.com";
                     port = "465";
@@ -130,4 +119,4 @@ public enum MailProvider
         ZOHO,
         UNKOWN
     }
-}
+}
diff --git a/secret-santa-configs/comtat.json/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/secret-santa-configs/comtat.json/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
diff --git a/secret-santa-configs/comtat.json/net6.0/BouncyCastle.Crypto.dll b/secret-santa-configs/comtat.json/net6.0/BouncyCastle.Crypto.dll
diff --git a/secret-santa-configs/comtat.json/net6.0/CommandLine.dll b/secret-santa-configs/comtat.json/net6.0/CommandLine.dll
diff --git a/secret-santa-configs/comtat.json/net6.0/MailKit.dll b/secret-santa-configs/comtat.json/net6.0/MailKit.dll
diff --git a/secret-santa-configs/comtat.json/net6.0/MimeKit.dll b/secret-santa-configs/comtat.json/net6.0/MimeKit.dll
diff --git a/secret-santa-configs/comtat.json/net6.0/Newtonsoft.Json.dll b/secret-santa-configs/comtat.json/net6.0/Newtonsoft.Json.dll
diff --git a/secret-santa-configs/comtat.json/net6.0/SecretSanta b/secret-santa-configs/comtat.json/net6.0/SecretSanta