From 9dae58f792b1683502cb186ed951523a9357ba10 Mon Sep 17 00:00:00 2001
From: Daniel Hultgren <daniel.cf.hultgren@gmail.com>
Date: Tue, 24 Dec 2019 23:32:53 +0100
Subject: [PATCH] Improved console feedback

---
 I3DShapesTool/Program.cs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/I3DShapesTool/Program.cs b/I3DShapesTool/Program.cs
index 2ca0d7b..77fbb75 100644
--- a/I3DShapesTool/Program.cs
+++ b/I3DShapesTool/Program.cs
@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using NDesk.Options;
 using ByteSizeLib;
 using NLog;
+using NLog.Layouts;
 
 namespace I3DShapesTool
 {
@@ -51,7 +53,21 @@ private static void ShowHelp(OptionSet p)
         {
             Logger.Info("Usage: I3DShapesTool [-dhv --out=outPath] [-b] inFile");
             Logger.Info("Extract model data from GIANTS engine's .i3d.shapes files.");
-            p.WriteOptionDescriptions(Console.Out);
+
+            string optionDescriptions;
+            using (var ms = new MemoryStream())
+            {
+                using (var tw = new StreamWriter(ms, Encoding.ASCII))
+                {
+                    p.WriteOptionDescriptions(tw);
+                }
+                optionDescriptions = Encoding.ASCII.GetString(ms.ToArray());
+            }
+
+            foreach (var s in optionDescriptions.Split('\n'))
+            {
+                Logger.Info(s);
+            }
         }
 
         public static int Verbosity;
@@ -66,6 +82,7 @@ private static void SetupLogging()
             var config = new NLog.Config.LoggingConfiguration();
 
             var logconsole = new NLog.Targets.ConsoleTarget("logConsole");
+            logconsole.Layout = new SimpleLayout("[${level:uppercase=true}] ${message}");
 
             LogLevel minLevel;
             if (Verbosity >= 2)
@@ -82,6 +99,8 @@ private static void SetupLogging()
 
         private static void Main(string[] args)
         {
+            SetupLogging();
+
             bool showHelp = false;
 
             OptionSet p = new OptionSet
@@ -140,16 +159,17 @@ private static void Main(string[] args)
             
             if (showHelp)
             {
+                Logger.Info("This program needs to be run from a batch file or Windows command line.");
                 ShowHelp(p);
+                Logger.Info("Press enter to exit...");
                 Console.Read();
                 return;
             }
 
-            SetupLogging();
-
             ExtractFile();
 
             Logger.Info("Done");
+            Logger.Info("Press enter to exit...");
             Console.Read();
 
             LogManager.Shutdown();