Merge pull request #142 from SnaffCon/fixes

Fixes for a couple of long-outstanding issues
SnaffCon · Apr 15, 2024 · ae01ab9 · ae01ab9
2 parents 97e0513 + 3cd1011
commit ae01ab9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/SnaffCore/Classifiers/FileResult.cs b/SnaffCore/Classifiers/FileResult.cs
@@ -46,9 +46,12 @@ public void SnaffleFile(FileInfo fileInfo, string snafflePath)
             string sourcePath = fileInfo.FullName;
             // clean it up and normalise it a bit
             string cleanedPath = sourcePath.Replace(':', '.').Replace('$', '.').Replace("\\\\", "\\");
+            cleanedPath = cleanedPath.TrimStart('\\');
             //string cleanedPath = Path.GetFullPath(sourcePath.Replace(':', '.').Replace('$', '.'));
+
             // make the dir exist
             string snaffleFilePath = Path.Combine(snafflePath, cleanedPath);
+
             string snaffleDirPath = Path.GetDirectoryName(snaffleFilePath);
             Directory.CreateDirectory(snaffleDirPath);
             File.Copy(sourcePath, (Path.Combine(snafflePath, cleanedPath)), true);

diff --git a/Snaffler/SnaffleRunner.cs b/Snaffler/SnaffleRunner.cs
@@ -140,14 +140,28 @@ public void Run(string[] args)
                             }
                         }
                     };
-                    nlogConfig.AddRule(LogLevel, LogLevel.Fatal, logconsole);
+                    if (LogLevel == LogLevel.Warn)
+                    {
+                        nlogConfig.AddRule(LogLevel.Warn, LogLevel.Warn, logconsole);
+                    }
+                    else
+                    {
+                        nlogConfig.AddRule(LogLevel, LogLevel.Fatal, logconsole);
+                    }
                     logconsole.Layout = "${message}";
                 }
 
                 if (Options.LogToFile)
                 {
                     logfile = new FileTarget("logfile") { FileName = Options.LogFilePath };
-                    nlogConfig.AddRule(LogLevel, LogLevel.Fatal, logfile);
+                    if (LogLevel == LogLevel.Warn)
+                    {
+                        nlogConfig.AddRule(LogLevel.Warn, LogLevel.Warn, logfile);
+                    }
+                    else
+                    {
+                        nlogConfig.AddRule(LogLevel, LogLevel.Fatal, logfile);
+                    }
                     if (Options.LogType == LogType.Plain)
                     {
                         logfile.Layout = "${message}";

diff --git a/Snaffler/Snaffler.csproj b/Snaffler/Snaffler.csproj
@@ -110,8 +110,6 @@
       <Version>4.7.15</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="SnaffRules\DefaultRules\PostMatchRules\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>