From 7f720a175347fc01636625ae46190cd7acbd92d7 Mon Sep 17 00:00:00 2001
From: Brant Martin <rexxar-tc@users.noreply.github.com>
Date: Mon, 6 May 2019 19:34:12 -0400
Subject: [PATCH] Implement user nlog configs, update updater to ignore user
 config. Resolves #309

Also changes FilesystemManager to use system temp directory when appropriate. (reduces clutter on disk)
---
 NLog-user.config                    | 21 +++++++++++++++++++++
 NLog.config                         |  3 +++
 Torch/Managers/FilesystemManager.cs | 17 ++++++++++++++---
 Torch/Managers/UpdateManager.cs     |  5 +++--
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 NLog-user.config

diff --git a/NLog-user.config b/NLog-user.config
new file mode 100644
index 0000000..9b10655
--- /dev/null
+++ b/NLog-user.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <variable name="logStamp" value="${time} ${pad:padding=-8:inner=[${level:uppercase=true}]}" />
+  <variable name="logContent" value="${message:withException=true}"/>
+
+  <targets async="true">
+    <target xsi:type="Null" name="null" formatMessage="false"  />
+    <target xsi:type="File" name="keen" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Keen-${shortdate}.log" />
+    <target xsi:type="File" name="main" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Torch-${shortdate}.log" />
+    <target xsi:type="File" name="chat" layout="${longdate} ${message}" fileName="Logs\Chat.log" />
+    <target xsi:type="ColoredConsole" name="console" layout="${var:logStamp} ${logger:shortName=true}: ${var:logContent}" />
+    <target xsi:type="File" name="patch" layout="${var:logContent}" fileName="Logs\patch.log"/>
+    <target xsi:type="FlowDocument" name="wpf" layout="${var:logStamp} ${logger:shortName=true}: ${var:logContent}" />
+  </targets>
+
+  <rules>
+    <!-- Define custom rules below. The example line will pipe all debug output to log file, in-UI console, and independent console. -->
+    <!--<logger name="*" minlevel="Debug" writeTo="main, console, wpf" />-->
+  </rules>
+</nlog>
\ No newline at end of file
diff --git a/NLog.config b/NLog.config
index 2559bd8..350ac1f 100644
--- a/NLog.config
+++ b/NLog.config
@@ -4,6 +4,8 @@
   <variable name="logStamp" value="${time} ${pad:padding=-8:inner=[${level:uppercase=true}]}" />
   <variable name="logContent" value="${message:withException=true}"/>
 
+  <include file="NLog-user.config"/>
+  
   <targets async="true">
     <target xsi:type="Null" name="null" formatMessage="false"  />
     <target xsi:type="File" name="keen" layout="${var:logStamp} ${logger}: ${var:logContent}" fileName="Logs\Keen-${shortdate}.log" />
@@ -15,6 +17,7 @@
   </targets>
 
   <rules>
+    <!-- Do not define custom rules here. Use NLog-user.config -->
     <logger name="Keen" minlevel="Warn" writeTo="main"/>
     <logger name="Keen" minlevel="Info" writeTo="console, wpf"/>
     <logger name="Keen" minlevel="Debug" writeTo="keen" final="true" />
diff --git a/Torch/Managers/FilesystemManager.cs b/Torch/Managers/FilesystemManager.cs
index 254c9a0..b51992e 100644
--- a/Torch/Managers/FilesystemManager.cs
+++ b/Torch/Managers/FilesystemManager.cs
@@ -4,12 +4,14 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NLog;
 using Torch.API;
 
 namespace Torch.Managers
 {
     public class FilesystemManager : Manager
     {
+        private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         /// <summary>
         /// Temporary directory for Torch that is cleared every time the program is started.
         /// </summary>
@@ -22,11 +24,20 @@ namespace Torch.Managers
 
         public FilesystemManager(ITorchBase torchInstance) : base(torchInstance)
         {
+            var tmp = Path.Combine(Path.GetTempPath(), "Torch");
             var torch = new FileInfo(typeof(FilesystemManager).Assembly.Location).Directory.FullName;
-            TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
-            TorchDirectory = torch;
+            if (Path.GetPathRoot(tmp) == Path.GetPathRoot(torch))
+            {
+                TempDirectory = tmp;
+            }
+            else
+            {
+                TempDirectory = Directory.CreateDirectory(Path.Combine(torch, "tmp")).FullName;
+                TorchDirectory = torch;
 
-            ClearTemp();
+                _log.Info($"Clearing tmp directory at {TempDirectory}");
+                ClearTemp();
+            }
         }
 
         private void ClearTemp()
diff --git a/Torch/Managers/UpdateManager.cs b/Torch/Managers/UpdateManager.cs
index de2e73c..700de86 100644
--- a/Torch/Managers/UpdateManager.cs
+++ b/Torch/Managers/UpdateManager.cs
@@ -55,8 +55,6 @@ namespace Torch.Managers
                     _log.Info("Failed to fetch latest version.");
                     return;
                 }
-
-                _log.Info($"Clearing tmp directory at {_fsManager.TempDirectory}");
                 
                 if (job.Version > Torch.TorchVersion)
                 {
@@ -90,6 +88,9 @@ namespace Torch.Managers
             {
                 foreach (var file in zip.Entries)
                 {
+                    if(file.Name == "NLog-user.config" && File.Exists(Path.Combine(extractPath, file.FullName)))
+                        continue;
+
                     _log.Debug($"Unzipping {file.FullName}");
                     var targetFile = Path.Combine(extractPath, file.FullName);
                     _fsManager.SoftDelete(extractPath, file.FullName);