Merge pull request #149 from Genometric/export_dir

Report the export path on console
Genometric · Mar 15, 2021 · db3f1a8 · db3f1a8
2 parents b43a5d1 + 017c693
commit db3f1a8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 9 deletions.
diff --git a/CLI.Tests/Main.cs b/CLI.Tests/Main.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Security;
 using System.Text.RegularExpressions;
 using Xunit;
 
@@ -169,7 +170,7 @@ public void CorrectAndSuccessfulAnalysis()
             // Arrange
             string outputPath = "session_" + DateTime.Now.ToString("yyyyMMdd_HHmmssfff_", CultureInfo.InvariantCulture) + new Random().Next(100000, 999999).ToString();
             WriteSampleFiles(out string rep1Filename, out string rep2Filename, out string culture);
-            
+
             ParserConfig cols = new ParserConfig() { Culture = culture };
             var configFilename = Path.GetTempPath() + Guid.NewGuid().ToString() + ".json";
             using (StreamWriter w = new StreamWriter(configFilename))
@@ -679,7 +680,7 @@ public void WriteTablesHeaderInLogFile()
         }
 
         [Theory]
-        [InlineData("300%",  "2")]
+        [InlineData("300%", "2")]
         [InlineData("-300%", "1")]
         public void WarningDisplayedForInvalidC(string c, string expected)
         {
@@ -723,5 +724,43 @@ public void ExportPathIsReportedInLogs()
             var loggedOutputPath = rx.Match(outputPathLogMessage[0]).Groups[1].Value;
             Assert.True(Path.IsPathRooted(loggedOutputPath));
         }
+
+        [Fact]
+        public void ExportPathIsReportedInConsole()
+        {
+            // Arrange
+            string msg;
+
+            // Act
+            using (var tmpMspc = new TmpMspc())
+                msg = tmpMspc.Run();
+
+            // Assert
+            var rx = new Regex(".*Export Directory: (.*)\r\n.*");
+            var loggedOutputPath = rx.Match(msg).Groups[1].Value.Trim();
+
+            var isAValidPath = TryGetFullPath(loggedOutputPath, out _);
+            Assert.True(isAValidPath);
+        }
+
+        private static bool TryGetFullPath(string path, out string result)
+        {
+            result = string.Empty;
+            if (string.IsNullOrWhiteSpace(path))
+                return false;
+
+            try
+            {
+                result = Path.GetFullPath(path);
+                return true;
+            }
+            catch (Exception e) when (e is ArgumentException or
+                                           SecurityException or 
+                                           NotSupportedException or 
+                                           PathTooLongException)
+            {
+                return false;
+            }
+        }
     }
 }
diff --git a/CLI/Logging/Logger.cs b/CLI/Logging/Logger.cs
@@ -85,16 +85,13 @@ private void Setup(string logFilePath, string repository, string name, string ex
             log = LogManager.GetLogger(_repository, _name);
 
             log.Info("NOTE THAT THE LOG PATTERN IS: <Date> <#Thread> <Level> <Message>");
-            log.Info($"Export Directory: {exportPath}");
+            Log($"Export Directory: {exportPath}", ConsoleColor.DarkGray);
         }
 
         public void LogStartOfASection(string header)
         {
             string msg = ".::." + header.PadLeft(((_sectionHeaderLenght - header.Length) / 2) + header.Length, '.').PadRight(_sectionHeaderLenght, '.') + ".::.";
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine(Environment.NewLine + msg);
-            Console.ResetColor();
-            log.Info(msg);
+            Log(Environment.NewLine + msg, ConsoleColor.Yellow);
         }
 
         public void LogException(Exception e)
@@ -170,9 +167,12 @@ public void LogMSPCStatus(object sender, ValueEventArgs e)
             }
         }
 
-        public void Log(string message)
+        public void Log(string message, ConsoleColor color = ConsoleColor.Black)
         {
+            if (color != ConsoleColor.Black)
+                Console.ForegroundColor = color;
             Console.WriteLine(message);
+            Console.ResetColor();
             log.Info(message);
         }
 

diff --git a/CLI/Orchestrator.cs b/CLI/Orchestrator.cs
@@ -203,7 +203,7 @@ private void AssertDegreeOfParallelism(int dp)
             if (dp > 0)
                 _degreeOfParallelism = dp;
 
-            _logger.Log(string.Format("Degree of parallelism is set to {0}.", _degreeOfParallelism));
+            _logger.Log(string.Format("Degree of parallelism is set to {0}.", _degreeOfParallelism), ConsoleColor.DarkGray);
         }
 
         private bool LoadParserConfig(CommandLineOptions options, out ParserConfig config)