0.4.1 add and run validation on application startup

penCsharpener · Mar 10, 2020 · b724c24 · b724c24
1 parent 113c0c9
commit b724c24
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 9 deletions.
diff --git a/tools/NetDeepL.TranslationWorker/Implementations/ConfigFileProvider.cs b/tools/NetDeepL.TranslationWorker/Implementations/ConfigFileProvider.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using NetDeepL.Models;
 using NetDeepL.TranslationWorker.Abstractions;
 using NetDeepL.TranslationWorker.Models.Config;
 
@@ -78,19 +79,49 @@ public async Task<ConfigFileRaw> GetConfig()
 
         public async Task ValidateConfigFile()
         {
-            var conf = await GetConfig();
+            var rawConf = await GetConfig();
+            var conf = new ConfigFile(rawConf);
             var configFileInvalid = false;
-            conf.SourceLanguage = conf.SourceLanguage.ToUpper();
-            conf.LanguagesToTranslate = string.Join(",", conf.LanguagesToTranslate.ToUpper().Split(",").Distinct());
 
-            if (conf.SourceLanguage.Length != 2)
+            if (conf.SourceLanguage == Languages.Undefined)
             {
-                Console.WriteLine("Check your source language. Only one source language is allowed and it must be two letter.");
+                Console.WriteLine("Check your source language. You selection is not supported.");
                 configFileInvalid = true;
             }
 
+            if (conf.LanguagesToTranslate.Any(x => x == Languages.Undefined))
+            {
+                Console.WriteLine("Check your target language. One or more are not supported.");
+                configFileInvalid = true;
+            }
+
+            if (conf.DeepLApiKey == Guid.Empty.ToString())
+            {
+                Console.WriteLine("It appears you have not set a valid api key. Please check your config file.");
+                configFileInvalid = true;
+            }
+
+            if (!conf.InputPath.Exists)
+            {
+                Console.WriteLine("Your specified input directory does not exist. Do you want to create it now? y/n");
+                if (Console.ReadKey().Key == ConsoleKey.Y)
+                {
+                    Directory.CreateDirectory(conf.InputPath.FullName);
+                }
+            }
+
+            if (!conf.OutputPath.Exists)
+            {
+                Console.WriteLine("Your specified output directory does not exist. Do you want to create it now? y/n");
+                if (Console.ReadKey().Key == ConsoleKey.Y)
+                {
+                    Directory.CreateDirectory(conf.OutputPath.FullName);
+                }
+            }
+
             if (configFileInvalid)
             {
+                Console.WriteLine("There were errors in your configuration. Please correct them and restart the tool.");
                 Console.ReadLine();
                 Environment.Exit(0);
             }

diff --git a/tools/NetDeepL.TranslationWorker/Models/Config/ConfigFile.cs b/tools/NetDeepL.TranslationWorker/Models/Config/ConfigFile.cs
@@ -16,8 +16,8 @@ public ConfigFile(ConfigFileRaw raw)
         {
             DeepLApiKey = raw.DeepLApiKey;
             LanguagesToTranslate = raw.LanguagesToTranslate.Split(',', System.StringSplitOptions.RemoveEmptyEntries)
-                                                            .Select(x => Enum.Parse<Languages>(x)).ToArray();
-            SourceLanguage = Enum.Parse<Languages>(raw.SourceLanguage);
+                                                            .Select(x => EnumParseWithDefault(x.ToUpper(), Languages.Undefined)).Distinct().ToArray();
+            SourceLanguage = EnumParseWithDefault(raw.SourceLanguage.ToUpper(), Languages.Undefined);
             DelayMilliseconds = int.Parse(raw.DelayMilliseconds);
             var currentDir = new DirectoryInfo(Directory.GetCurrentDirectory());
             InputPath = string.IsNullOrWhiteSpace(raw.InputPath) ? currentDir : new DirectoryInfo(raw.InputPath);
@@ -30,5 +30,17 @@ public ConfigFile(ConfigFileRaw raw)
         public int DelayMilliseconds { get; }
         public DirectoryInfo InputPath { get; }
         public DirectoryInfo OutputPath { get; }
+
+        private T EnumParseWithDefault<T>(string enumText, T defaultValue) where T : struct
+        {
+            try
+            {
+                return Enum.Parse<T>(enumText);
+            }
+            catch
+            {
+                return defaultValue;
+            }
+        }
     }
 }
diff --git a/tools/NetDeepL.TranslationWorker/NetDeepL.TranslationWorker.csproj b/tools/NetDeepL.TranslationWorker/NetDeepL.TranslationWorker.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AssemblyVersion>0.4.0.0</AssemblyVersion>
-    <FileVersion>0.4.0.0</FileVersion>
+    <AssemblyVersion>0.4.1.0</AssemblyVersion>
+    <FileVersion>0.4.1.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/tools/NetDeepL.TranslationWorker/Startup.cs b/tools/NetDeepL.TranslationWorker/Startup.cs
@@ -25,6 +25,7 @@ public void ConfigureServices(IServiceCollection services)
                     Environment.Exit(0);
                 }
                 var conf = configProvider.GetConfig().Result;
+                configProvider.ValidateConfigFile().GetAwaiter().GetResult();
                 return NetDeepL.Implementations.NetDeepL.CreateClient(conf.DeepLApiKey, new NetDeepLOptions());
             });
         }