v1.18.0.0

- megadhatók a backupnál és a filecleaner-ben a kizárható filenevek mask listája

v1.18.0.0
- megadhatók a backupnál és a filecleaner-ben a kizárható filenevek mask listája
Schwirg László
1 parent 323b8dca
Showing 9 changed files with 76 additions and 29 deletions Show diff stats
Vrh.Log4Pro.MaintenanceConsole/Manager - BackupPackageManager.cs
Vrh.Log4Pro.MaintenanceConsole/Manager - FileCleanerManager.cs
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Tools - Http.cs -> Vrh.Log4Pro.MaintenanceConsole/Tools - Http.cs
Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Tools - Membership.cs -> Vrh.Log4Pro.MaintenanceConsole/Tools - Membership.cs
Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Tools - TcpIp.cs -> Vrh.Log4Pro.MaintenanceConsole/Tools - TcpIp.cs
Vrh.Log4Pro.MaintenanceConsole/ConsoleFunction - Tools.cs -> Vrh.Log4Pro.MaintenanceConsole/Tools.cs
Vrh.Log4Pro.MaintenanceConsole/Vrh.Log4Pro.MaintenanceConsole.csproj
@@ -90,7 +90,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 				foreach (var bf in bp.Xml_BackupFolderList)	{ BackupPackageManagerCore.FolderZipBackup(bf, tempfolderpath); }
 				foreach (var sqldb in bp.Xml_BackupSQLDataBaseList) { SQLDataBaseManagerNS.SQLDataBaseManager.Execute(sqldb.Xml_Key,sqldb.Xml_DBBackup,sqldb.Xml_ScriptBackup,sqldb.Xml_TableDataBackup, tempfolderpath, timestamp); }
-				BackupPackageManagerCore.CreatePackageFile(bp.Xml_PackageName, tempfolderpath, destinationfilename,destinationfolder, bp.Xml_CreateExe, bp.Xml_SourceIncludeFilenameMaskList);
+				BackupPackageManagerCore.CreatePackageFile(bp.Xml_PackageName, tempfolderpath, destinationfilename,destinationfolder, bp.Xml_CreateExe, bp.Xml_SourceIncludeFilenameMaskList, bp.Xml_ExcludeMaskList);
 				if (Directory.Exists(tempfolderpath)) { Directory.Delete(tempfolderpath,true); }
 			}
 			catch (Exception ex) { ColorConsole.WriteLine(ex.MessageNested(), ConsoleColor.Red); }
@@ -138,7 +138,8 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 			}
 			if (lineix == 2)
 			{
-				ColorConsole.Write($"{bp.Xml_SourceIncludeFilenameMaskList}", ConsoleColor.White, prefix: "Mask:");
+				ColorConsole.Write($"{bp.Xml_SourceIncludeFilenameMaskList}", ConsoleColor.White, prefix: "Incl.mask:");
+				ColorConsole.Write($"{bp.Xml_ExcludeMaskList}", ConsoleColor.White, prefix: " Excl.mask:");
 				ColorConsole.Write($"{bp.SizePackageTotal}", ConsoleColor.White, prefix: ", Bytes to include:");
 				ColorConsole.WriteLine("");
 				return " ";
@@ -157,7 +158,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 				if (bf.FolderExists)
 				{
 					var di = new DirectoryInfo(bf.Xml_Path);
-					bp.SizePackageTotal += Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS.FileCleanerManagerCore.DirSize(di, bf.Xml_IncludeFileNameMask, bf.Xml_IncludeFileFullPathRegex, recurse: true);
+					bp.SizePackageTotal += Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS.FileCleanerManagerCore.DirSize(di, bf.Xml_IncludeFileNameMask, bf.Xml_ExcludeFileNameMaskList, bf.Xml_IncludeFileFullPathRegex, recurse: true);
 				}
 			}
 			return bp;
@@ -183,6 +184,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 			string destinationbackupfile = bf.Xml_BackupToFile;
 			if (string.IsNullOrEmpty(destinationbackupfile)) { destinationbackupfile = (new DirectoryInfo(foldertobackuppath)).Name + ".zip"; }
 			string includefilenamemask = bf.Xml_IncludeFileNameMask;
+			string excludefilenamemask = bf.Xml_ExcludeFileNameMaskList;
 			string includefullpathregex = bf.Xml_IncludeFileFullPathRegex;
 			var destinationfile = Path.GetFileNameWithoutExtension(destinationbackupfile);
@@ -192,7 +194,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 			if (File.Exists(destinationbackupfile)) { File.Delete(destinationbackupfile); }
 			if (!Path.IsPathRooted(foldertobackuppath)) { foldertobackuppath = Path.Combine(Directory.GetCurrentDirectory(), foldertobackuppath); }
-			ZipTools.CreateEntriesFromDirectoryContent(foldertobackuppath, destinationbackupfile, includefilenamemask,includefullpathregex);
+			ZipTools.CreateEntriesFromDirectoryContent(foldertobackuppath, destinationbackupfile, includefilenamemask, excludefilenamemask,includefullpathregex);
 			ColorConsole.WriteLine($"Folder backup created. Name:{foldertobackuppath}", ConsoleColor.DarkGreen);
 		}
 		/// <summary>
@@ -205,7 +207,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 		/// <param name="vars">substitution vars</param>
 		/// <param name="createexe">if true, exe self extractor will be created, otherwise zip file; the extension of the package file is zip or exe</param>
 		/// <param name="sourceincludefilenamemaskList">comma separated list of masks for the files to include (NOT regex! "old fashioned" masking characters, like ?/* can be used)</param>
-		public static void CreatePackageFile(string packagename,string sourcedirectorypath, string destinationfilename =null,string destinationfolder=null,bool createexe=true,string sourceincludefilenamemaskList=null)
+		public static void CreatePackageFile(string packagename,string sourcedirectorypath, string destinationfilename =null,string destinationfolder=null,bool createexe=true,string sourceincludefilenamemaskList=null,string excludeliststring = null)
 		{
 			string[] sourceinclfnamemasklist = sourceincludefilenamemaskList.Split(',');
 			bool createselfextractor = createexe;
@@ -231,18 +233,23 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 			string addfilecommand = "a";
 			string response;
 			string packagefile;
+
+			string[] excludelist = excludeliststring.Split(new char[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries);
+			string excludeswitches = "";
+			foreach (var exstr in excludelist) excludeswitches += $" -x!{exstr}";
+
 			if (createselfextractor)
 			{
 				string archivetype_7z = "-t7z";
 				string createsfx = "-sfx";
 				packagefile = packageEXEfilepath;
-				response = Tools.ExecuteAndGetStdIo("7z.exe", $"{addfilecommand} {packagefile} {includeliststr} {recursesubdirs} {archivetype_7z} {createsfx}");
+				response = Tools.ExecuteAndGetStdIo("7z.exe", $"{addfilecommand} {packagefile} {includeliststr} {recursesubdirs} {excludeswitches} {archivetype_7z} {createsfx} ");
 			}
 			else
 			{
 				string archivetype_zip = "-tzip";
 				packagefile = packageZIPfilepath;
-				response = Tools.ExecuteAndGetStdIo("7z.exe", $"{addfilecommand} {packagefile} {includeliststr} {recursesubdirs} {archivetype_zip}");
+				response = Tools.ExecuteAndGetStdIo("7z.exe", $"{addfilecommand} {packagefile} {includeliststr} {recursesubdirs} {excludeswitches} {archivetype_zip}");
 			}
 			ColorConsole.WriteLine($"Backup package created. Package name:{packagename}, package file: {packagefile}", ConsoleColor.Green);
@@ -358,6 +365,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 		public string Xml_PackageFilePath;
 		public string Xml_TempDirectoryPath;
 		public string Xml_SourceIncludeFilenameMaskList;
+		public string Xml_ExcludeMaskList;
 		public bool Xml_CreateExe;
 		public List<BackupFolder> Xml_BackupFolderList;
 		public List<BackupSQLDataBase> Xml_BackupSQLDataBaseList;
@@ -394,6 +402,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 			Xml_Key = GetValue(nameof(XmlStructure.BackupPackage.Attributes.Key), backupackagexml, XmlStructure.BackupPackage.Attributes.Key.Values.DEFAULT);
 			Xml_Description = GetValue(nameof(XmlStructure.BackupPackage.Attributes.Description), backupackagexml, Xml_PackageName);
 			Xml_SourceIncludeFilenameMaskList = GetValue(nameof(XmlStructure.BackupPackage.Attributes.IncludeFilenameMaskList), backupackagexml, XmlStructure.BackupPackage.Attributes.IncludeFilenameMaskList.Values.DEFAULT);
+			Xml_ExcludeMaskList = GetValue(nameof(XmlStructure.BackupPackage.Attributes.ExcludeFilenameMaskList), backupackagexml, XmlStructure.BackupPackage.Attributes.ExcludeFilenameMaskList.Values.DEFAULT);
 			Xml_BackupFolderList = new List<BackupFolder>();
 			//var conditionxmlList = GetAllXElements(foldertocleanxml, nameof(XmlStructure.FolderToClean.Conditions), nameof(XmlStructure.FolderToClean.Conditions.Condition));
@@ -424,6 +433,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 			Xml_TempDirectoryPath = bp.Xml_TempDirectoryPath;
 			Xml_BackupSQLDataBaseList = bp.Xml_BackupSQLDataBaseList.Select(c => new BackupSQLDataBase(c)).ToList(); ;
 			Xml_SourceIncludeFilenameMaskList = bp.Xml_SourceIncludeFilenameMaskList;
+			Xml_ExcludeMaskList = bp.Xml_ExcludeMaskList;
 			Xml_CreateExe = bp.Xml_CreateExe;
 		}
 		#endregion cloner constructor
@@ -451,6 +461,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 					public static class Description { }
 					public static class CreateExe { public static class Values { public const bool DEFAULT = true; } }
 					public static class IncludeFilenameMaskList { public static class Values { public const string DEFAULT = "*"; } }
+					public static class ExcludeFilenameMaskList { public static class Values { public const string DEFAULT = ""; } }
 					public static class PackageFilePath{ public static class Values { public const string DEFAULT = "BackupPackage_{TIMESTAMP}_{PACKAGENAME}"; } }
 					public static class TempDirectoryPath { public static class Values { public const string DEFAULT = ""; } }
 				}
@@ -462,6 +473,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 						public static class Description { }
 						public static class BackupToFile { }
 						public static class IncludeNameMask { public class Values { public const string DEFAULT = "*"; } }
+						public static class ExcludeNameMaskList { public class Values { public const string DEFAULT = ""; } }
 						public static class IncludePathRegexp { public class Values { public const string DEFAULT = ".*"; } }
 					}
 				}
@@ -488,6 +500,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 				Xml_Description = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.Description), backupfolderxml, Xml_Path);
 				Xml_BackupToFile = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.BackupToFile), backupfolderxml, "");
 				Xml_IncludeFileNameMask = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.IncludeNameMask), backupfolderxml, XmlStructure.BackupPackage.BackupFolder.Attributes.IncludeNameMask.Values.DEFAULT);
+				Xml_ExcludeFileNameMaskList = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.ExcludeNameMaskList), backupfolderxml, XmlStructure.BackupPackage.BackupFolder.Attributes.ExcludeNameMaskList.Values.DEFAULT);
 				Xml_IncludeFileFullPathRegex = GetValue(nameof(XmlStructure.BackupPackage.BackupFolder.Attributes.IncludePathRegexp), backupfolderxml, XmlStructure.BackupPackage.BackupFolder.Attributes.IncludePathRegexp.Values.DEFAULT);
 			}
 			public BackupFolder(BackupFolder bf)
@@ -497,12 +510,14 @@ namespace Vrh.Log4Pro.MaintenanceConsole.BackupPackageManagerNS
 				Xml_BackupToFile = bf.Xml_BackupToFile;
 				FolderExists = bf.FolderExists;
 				Xml_IncludeFileNameMask = bf.Xml_IncludeFileNameMask;
+				Xml_ExcludeFileNameMaskList= bf.Xml_ExcludeFileNameMaskList;
 				Xml_IncludeFileFullPathRegex = bf.Xml_IncludeFileFullPathRegex;
 			}
 			public string Xml_Path;
 			public string Xml_Description;
 			public string Xml_BackupToFile;
 			public string Xml_IncludeFileNameMask;
+			public string Xml_ExcludeFileNameMaskList;
 			public string Xml_IncludeFileFullPathRegex;
 			public bool FolderExists;
@@ -16,6 +16,7 @@ using System.Diagnostics;
 using Vrh.Log4Pro.MaintenanceConsole.MenuNS;
 using Vrh.Log4Pro.MaintenanceConsole.ColorConsoleNS;
 using Vrh.Log4Pro.MaintenanceConsole.CommandLineParserNS;
+using Vrh.Log4Pro.MaintenanceConsole.ToolsNS;
 using Vrh.XmlProcessing;
 using VRH.Common;
@@ -128,7 +129,8 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 				ColorConsole.Write($"{ws.Xml_Recurse}", fc2, prefix: "Recurse:", bracket: "[]");
 				var fc0 = ws.Xml_RemoveEmptyFolder ? ConsoleColor.Green : ConsoleColor.Yellow;
 				ColorConsole.Write($"{ws.Xml_RemoveEmptyFolder}", fc0, prefix: ", Remove empty folder:", bracket: "[]");
-				ColorConsole.WriteLine(ws.Xml_IncludeMask, ConsoleColor.Yellow, prefix: ", Include mask:");
+				ColorConsole.Write(ws.Xml_IncludeMask, ConsoleColor.Yellow, prefix: ", Include mask:");
+				ColorConsole.WriteLine(ws.Xml_ExcludeMaskList, ConsoleColor.Yellow, prefix: ", Exclude mask:");
 				return " ";
 			}
 			else if (lineix == 3)
@@ -175,8 +177,8 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 			if (ftc.FolderExists)
 			{
 				var di = new DirectoryInfo(ftc.Xml_DirectoryPath);
-				ftc.SizeFolderTotal = FileCleanerManagerCore.DirSize(di,"*","",ftc.Xml_Recurse);
-				ftc.SizeSelectedBeforeClean = FileCleanerManagerCore.DirSize(di, ftc.Xml_IncludeMask, ftc.Xml_IncludeFullpathRegexp, ftc.Xml_Recurse);
+				ftc.SizeFolderTotal = FileCleanerManagerCore.DirSize(di,"*","","",ftc.Xml_Recurse);
+				ftc.SizeSelectedBeforeClean = FileCleanerManagerCore.DirSize(di, ftc.Xml_IncludeMask,ftc.Xml_ExcludeMaskList, ftc.Xml_IncludeFullpathRegexp, ftc.Xml_Recurse);
 				ftc.SizeSelectedCleaned = FileCleanerManagerCore.CleanFolderFiles(di,ftc,delete:false);
 			}
 			return ftc;
@@ -199,17 +201,25 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 		#endregion IsDirectoryEmpty
 		#region public GetDirSize
-		public static long DirSize(DirectoryInfo d, string filenamemask, string filefullpathregex, bool recurse)
+		public static long DirSize(DirectoryInfo d, string includefilenamemask,string excludefilenamemaskcsvlist, string filefullpathregex, bool recurse)
 		{
 			long size = 0;
 			// Add file sizes.
-			FileInfo[] fis = d.GetFiles(filenamemask, SearchOption.TopDirectoryOnly);
-			if (fis != null) { foreach (FileInfo fi in fis) { if (Regex.Match(fi.FullName, filefullpathregex).Success) { size += fi.Length; } } }
+			FileInfo[] fis = d.GetFiles(includefilenamemask, SearchOption.TopDirectoryOnly);
+			if (fis != null) 
+			{ 
+				foreach (FileInfo fi in fis) 
+				{
+					bool toinclude1 = Regex.Match(fi.FullName, filefullpathregex, RegexOptions.IgnoreCase).Success;
+					bool toinclude2 = Regex.Match(fi.Name, ZipTools.FileNameMaskListToRegex(excludefilenamemaskcsvlist), RegexOptions.IgnoreCase).Success;
+					if (toinclude1 && toinclude2) { size += fi.Length; }
+				}
+			}
 			// Add subdirectory sizes.
 			if (recurse)
 			{
 				DirectoryInfo[] dis = d.GetDirectories();
-				if (dis != null) { foreach (DirectoryInfo di in dis) { size += DirSize(di, filenamemask, filefullpathregex, recurse); } }
+				if (dis != null) { foreach (DirectoryInfo di in dis) { size += DirSize(di, includefilenamemask, excludefilenamemaskcsvlist, filefullpathregex, recurse); } }
 			}
 			return size;
 		}
@@ -291,6 +301,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 					var fl = fi.Length;
 					try
 					{
+						if (Regex.Match(fi.Name, ZipTools.FileNameMaskListToRegex(ftc.Xml_ExcludeMaskList)).Success) continue;
 						if (delete) { File.Delete(fi.FullName); }
 						cleanedsize += fl;
 					}
@@ -361,6 +372,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 		public bool Xml_Recurse;
 		public bool Xml_RemoveEmptyFolder;
 		public string Xml_IncludeMask;
+		public string Xml_ExcludeMaskList;
 		public string Xml_IncludeFullpathRegexp;
 		public bool Xml_OrConditionList = true;
 		public List<Condition> Xml_ConditionList;
@@ -394,6 +406,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 			Xml_Recurse = GetValue(nameof(XmlStructure.FolderToClean.Attributes.Recurse), foldertocleanxml, XmlStructure.FolderToClean.Attributes.Recurse.Values.DEFAULT);
 			Xml_RemoveEmptyFolder = GetValue(nameof(XmlStructure.FolderToClean.Attributes.RemoveEmptyFolder), foldertocleanxml, XmlStructure.FolderToClean.Attributes.RemoveEmptyFolder.Values.DEFAULT);
 			Xml_IncludeMask = GetValue(nameof(XmlStructure.FolderToClean.Attributes.IncludeMask), foldertocleanxml, XmlStructure.FolderToClean.Attributes.IncludeMask.Values.DEFAULT);
+			Xml_ExcludeMaskList = GetValue(nameof(XmlStructure.FolderToClean.Attributes.ExcludeMaskList), foldertocleanxml, XmlStructure.FolderToClean.Attributes.ExcludeMaskList.Values.DEFAULT);
 			Xml_IncludeFullpathRegexp = GetValue(GetXElement(foldertocleanxml,nameof(XmlStructure.FolderToClean.IncludeFullpathRegexp)), XmlStructure.FolderToClean.IncludeFullpathRegexp.Values.DEFAULT);
 			Xml_IncludeFullpathRegexp = Xml_IncludeFullpathRegexp.Replace("{DTSREGEX}", commondatetimestampregex).Replace("{TSREGEX}", commontimestampregex).Replace("{DSREGEX}", commondatestampregex);
@@ -417,6 +430,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 			Xml_Recurse = ftc.Xml_Recurse;
 			Xml_RemoveEmptyFolder = ftc.Xml_RemoveEmptyFolder;
 			Xml_IncludeMask = ftc.Xml_IncludeMask;
+			Xml_ExcludeMaskList = ftc.Xml_ExcludeMaskList;
 			Xml_IncludeFullpathRegexp = ftc.Xml_IncludeFullpathRegexp;
 			Xml_OrConditionList = ftc.Xml_OrConditionList;
 			Xml_ConditionList = ftc.Xml_ConditionList.Select(c=>new Condition(c)).ToList(); ;
@@ -498,6 +512,13 @@ namespace Vrh.Log4Pro.MaintenanceConsole.FileCleanerManagerNS
 							public const string DEFAULT = "*.*";
 						}
 					}
+					public static class ExcludeMaskList
+					{
+						public static class Values
+						{
+							public const string DEFAULT = "";
+						}
+					}
 				}
 				public static class IncludeFullpathRegexp
 				{
@@ -546,7 +546,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
 					string ZIPbackupFullName = Path.Combine(backupdirectorypath, ZIPbackupfilename);
 					if (File.Exists(ZIPbackupFullName)) { File.Delete(ZIPbackupFullName); }
-					ZipTools.CreateEntriesFromDirectoryContent(backupdirectorypath, ZIPbackupFullName, backupfilename, "", removearchivedfiles: false, storepathinzip: false);
+					ZipTools.CreateEntriesFromDirectoryContent(backupdirectorypath, ZIPbackupFullName, backupfilename, "","", removearchivedfiles: false, storepathinzip: false);
 					if (File.Exists(backupFullName)) { File.Delete(backupFullName); }
 					returnfilename = ZIPbackupFullName;
 				}
@@ -926,7 +926,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
 				ScriptOneObject(sqlserver, tempbackupdirectorypath, backupfilenamemask + backupfilenameext, sqldatabase.Views.Cast<SqlSmoObject>().ToList(), vars);
 				ScriptOneObject(sqlserver, tempbackupdirectorypath, backupfilenamemask + backupfilenameext, sqldatabase.Tables.Cast<SqlSmoObject>().ToList(), vars);
 				ScriptOneObject(sqlserver, tempbackupdirectorypath, backupfilenamemask + backupfilenameext, sqldatabase.Triggers.Cast<SqlSmoObject>().ToList(), vars);
-				if (createZip) { ZipTools.CreateEntriesFromDirectoryContent(tempbackupdirectorypath, zipfilefullpath, "*.sql", backupts,removearchivedfiles:true, storepathinzip: false); }
+				if (createZip) { ZipTools.CreateEntriesFromDirectoryContent(tempbackupdirectorypath, zipfilefullpath, "*.sql","", backupts,removearchivedfiles:true, storepathinzip: false); }
 				var resultfilename = zipfilefullpath == null ? "-" : Path.GetFileName(zipfilefullpath);
 				ColorConsole.WriteLine($"SQL scripts created. DB name:'{dbname}'. BAK/ZIP file name:'{resultfilename}'", ConsoleColor.DarkGreen);
 			}
@@ -1048,7 +1048,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
 				if (createZip)
 				{
 					string fullpathregex = Regex.Escape(string.Join(";",backupfilepathlist)).Replace(';','|');
-					ZipTools.CreateEntriesFromDirectoryContent(tempbackupdirectorypath, zipfilefullpath, "*.sql", fullpathregex, removearchivedfiles: true, storepathinzip: false);
+					ZipTools.CreateEntriesFromDirectoryContent(tempbackupdirectorypath, zipfilefullpath, "*.sql","", fullpathregex, removearchivedfiles: true, storepathinzip: false);
 				}
 				var resultfilename = zipfilefullpath == null ? "-" : Path.GetFileName(zipfilefullpath);
 				ColorConsole.WriteLine($"SQL data scripts created. DB name:'{dbname}'. BAK/ZIP file name:'{resultfilename}'", ConsoleColor.DarkGreen);
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.17.1.0")]
-[assembly: AssemblyFileVersion("1.17.1.0")]
+[assembly: AssemblyVersion("1.18.0.0")]
+[assembly: AssemblyFileVersion("1.18.0.0")]
@@ -74,6 +74,18 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 	}
 	public static class ZipTools
 	{
+		public static string FileNameMaskListToRegex(string excludefilenamemaskcsvlist)
+		{
+			string pattern = "";
+			string regexor = "";
+			foreach (var exclmask in excludefilenamemaskcsvlist.Split(new char[] { ',', ';' }, StringSplitOptions.RemoveEmptyEntries))
+			{
+				pattern += regexor + "(^" + Regex.Escape(exclmask.Replace(".", "__DOT__").Replace("*", "__STAR__").Replace("?", "__QM__"))
+					.Replace("__DOT__", "[.]").Replace("__STAR__", ".*").Replace("__QM__", ".") + "$)";
+				regexor = "|";
+			}
+			return "(" + pattern + ")";
+		}
 		public static void Extract1stFileFromZIP(string targetfilefullpath, string ZIPfilefullpath)
 		{
 			if (File.Exists(targetfilefullpath)) { File.Delete(targetfilefullpath); }
@@ -98,11 +110,12 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 			}
 		}
-		public static void CreateEntriesFromDirectoryContent(string sourcefolderpath, string ZIPfilefullpath, string includefilenamemask, string includefullpathregex, bool removearchivedfiles = false,bool storepathinzip = true)
+		public static void CreateEntriesFromDirectoryContent(string sourcefolderpath, string ZIPfilefullpath, string includefilenamemask, string excludefilenamemasklist, string includefullpathregex, bool removearchivedfiles = false,bool storepathinzip = true)
 		{
 			if (File.Exists(ZIPfilefullpath)) { File.Delete(ZIPfilefullpath); }
 			DirectoryInfo di = new DirectoryInfo(sourcefolderpath);
-			var rgx = new Regex(includefullpathregex??"");
+			var inclrgx = new Regex(includefullpathregex??"");
+			var exclrgx = new Regex(FileNameMaskListToRegex(excludefilenamemasklist) ?? "");
 			var archivedfiles = new List<string>();
 			using (ZipArchive archive = ZipFile.Open(ZIPfilefullpath, ZipArchiveMode.Create))
 			{
@@ -113,10 +126,8 @@ namespace Vrh.Log4Pro.MaintenanceConsole.ToolsNS
 				int cpl = ColorConsole.CursorLeft;
 				foreach (var fi in fis)
 				{
-					var entryname = storepathinzip
-						? fi.FullName.Substring((Path.GetPathRoot(fi.FullName)?.Length) ?? 0)
-						: fi.Name;
-					if (rgx.Match(fi.FullName).Success)
+					var entryname = storepathinzip ? fi.FullName.Substring((Path.GetPathRoot(fi.FullName)?.Length) ?? 0) : fi.Name;
+					if (inclrgx.Match(fi.FullName).Success && !exclrgx.Match(fi.Name).Success)
 					{
 						try
 						{
@@ -359,13 +359,13 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConsoleFunction - Tools - Http.cs" />
-    <Compile Include="ConsoleFunction - Tools - TcpIp.cs" />
+    <Compile Include="Tools - Http.cs" />
+    <Compile Include="Tools - TcpIp.cs" />
     <Compile Include="ConsoleFunction - CommandLineParser.cs" />
     <Compile Include="ConsoleFunction - ColorConsole.cs" />
     <Compile Include="ConsoleFunction - Menu.cs" />
-    <Compile Include="ConsoleFunction - Tools - Membership.cs" />
-    <Compile Include="ConsoleFunction - Tools.cs" />
+    <Compile Include="Tools - Membership.cs" />
+    <Compile Include="Tools.cs" />
     <Compile Include="Manager - FTPManager.cs" />
     <Compile Include="Manager - BackupPackageManager.cs" />
     <Compile Include="Manager - InstallManager.cs" />