VRH / VRH.Log4Pro.MaintenanceConsole

Commit 64bd9abd988b4716cce2a2b87a557f7760b449ab

Authored by Schwirg László
1 parent ab4d66d6

v1.19.4.0 

- exclude maszkot nem jol kezelte a csomagoláskor
Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
Inline Side-by-side
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
  Show/Hide comments   View file @64bd9ab
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; @@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
32 // You can specify all the values or you can default the Build and Revision Numbers 32 // You can specify all the values or you can default the Build and Revision Numbers
33 // by using the '*' as shown below: 33 // by using the '*' as shown below:
34 // [assembly: AssemblyVersion("1.0.*")] 34 // [assembly: AssemblyVersion("1.0.*")]
35 -[assembly: AssemblyVersion("1.19.3.0")]  
36 -[assembly: AssemblyFileVersion("1.19.3.0")] 35 +[assembly: AssemblyVersion("1.19.4.0")]
  36 +[assembly: AssemblyFileVersion("1.19.4.0")]
Vrh.Log4Pro.MaintenanceConsole/Tools.cs
  Show/Hide comments   View file @64bd9ab
@@ -115,7 +115,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS @@ -115,7 +115,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
115 if (File.Exists(ZIPfilefullpath)) { File.Delete(ZIPfilefullpath); } 115 if (File.Exists(ZIPfilefullpath)) { File.Delete(ZIPfilefullpath); }
116 DirectoryInfo di = new DirectoryInfo(sourcefolderpath); 116 DirectoryInfo di = new DirectoryInfo(sourcefolderpath);
117 var inclrgx = new Regex(includefullpathregex??""); 117 var inclrgx = new Regex(includefullpathregex??"");
118 - var exclrgx = new Regex(FileNameMaskListToRegex(excludefilenamemasklist) ?? ""); 118 + var exclrgx = string.IsNullOrWhiteSpace(excludefilenamemasklist) ?null:new Regex(FileNameMaskListToRegex(excludefilenamemasklist));
119 var archivedfiles = new List<string>(); 119 var archivedfiles = new List<string>();
120 using (ZipArchive archive = ZipFile.Open(ZIPfilefullpath, ZipArchiveMode.Create)) 120 using (ZipArchive archive = ZipFile.Open(ZIPfilefullpath, ZipArchiveMode.Create))
121 { 121 {
@@ -127,7 +127,9 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS @@ -127,7 +127,9 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
127 foreach (var fi in fis) 127 foreach (var fi in fis)
128 { 128 {
129 var entryname = storepathinzip ? fi.FullName.Substring((Path.GetPathRoot(fi.FullName)?.Length) ?? 0) : fi.Name; 129 var entryname = storepathinzip ? fi.FullName.Substring((Path.GetPathRoot(fi.FullName)?.Length) ?? 0) : fi.Name;
130 - if (inclrgx.Match(fi.FullName).Success && !exclrgx.Match(fi.Name).Success) 130 + bool matchesinclude = (inclrgx?.Match(fi.FullName).Success)??true;
  131 + bool matchesexclude = (exclrgx?.Match(fi.Name).Success)??false;
  132 + if (matchesinclude && !matchesexclude)
131 { 133 {
132 try 134 try
133 { 135 {