add basic support for wildcards in list file (compatible with far), small bug fixes

Author: force-net

Blazer.Exe/Program.cs

@@ -1,8 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 
 using Force.Blazer.Algorithms;
 using Force.Blazer.Exe.CommandLine;
@@ -84,6 +86,7 @@ private static int ProcessCompress(CommandLineParser<BlazerCommandLineOptions> o
 
 			string[] fileNamesMultiple = new[] { options.GetNonParamOptions(0) ?? string.Empty };
 			string archiveName = null;
+			var hasUnexistingFiles = false;
 
 			var listFile = options.GetNonParamOptions().FirstOrDefault(x => x[0] == '@');
 			if (listFile != null)
@@ -97,9 +100,10 @@ private static int ProcessCompress(CommandLineParser<BlazerCommandLineOptions> o
 
 				archiveName = fileNamesMultiple[0];
 				fileNamesMultiple = File.ReadAllLines(listFile).Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).ToArray();
+				fileNamesMultiple = ExpandFilesInList(fileNamesMultiple, out hasUnexistingFiles);
 			}
 
-			if (!opt.Stdin && fileNamesMultiple.Any(x => !File.Exists(x) && !Directory.Exists(x)))
+			if (!opt.Stdin && hasUnexistingFiles)
 			{
 				if (fileNamesMultiple[0] == string.Empty)
 				{
@@ -233,7 +237,7 @@ private static int ProcessDecompress(CommandLineParser<BlazerCommandLineOptions>
 
 			var archiveName = options.GetNonParamOptions(0) ?? string.Empty;
 
-			string[] customOutFileNames = null;
+			Regex[] customOutFileNames = null;
 
 			var listFile = options.GetNonParamOptions().FirstOrDefault(x => x[0] == '@');
 			if (listFile != null)
@@ -245,7 +249,9 @@ private static int ProcessDecompress(CommandLineParser<BlazerCommandLineOptions>
 					return 1;
 				}
 
-				customOutFileNames = File.ReadAllLines(listFile).Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).ToArray();
+				customOutFileNames = File.ReadAllLines(listFile).Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim())
+					.Select(x => new Regex(new string(x.SelectMany(y => char.IsLetterOrDigit(y) ? new[] { y } : (y == '*' ? new[] { '.', '*' } : new[] { '\\', y })).ToArray())))
+					.ToArray();
 			}
 
 			if (!opt.Stdin && !File.Exists(archiveName))
@@ -272,15 +278,19 @@ private static int ProcessDecompress(CommandLineParser<BlazerCommandLineOptions>
 				{
 					if (prevFile != null)
 					{
-						outFile[0].Flush();
-						outFile[0].Close();
-						outFile[0] = null;
+						if (outFile[0] != null)
+						{
+							outFile[0].Flush();
+							outFile[0].Close();
+							outFile[0] = null;
+						}
+
 						prevFile.ApplyToFile();
 						prevFile = null;
 					}
 
 					var fInfoFileName = fInfo.FileName;
-					if (customOutFileNames != null && !customOutFileNames.Contains(fInfoFileName))
+					if (customOutFileNames != null && !customOutFileNames.Any(y => y.IsMatch(fInfoFileName)))
 						return;
 
 					prevFile = fInfo;
@@ -343,7 +353,7 @@ private static int ProcessDecompress(CommandLineParser<BlazerCommandLineOptions>
 
 			if (opt.Stdout) outFile[0] = Console.OpenStandardOutput();
 			// we haven't received an file info from callback
-			if (outFile[0] == null)
+			if (outFile[0] == null && !outBlazerStream.HaveMultipleFiles)
 				outFile[0] = new StatStream(new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read), true);
 
 			using (var inFile = outStream)
@@ -536,5 +546,33 @@ private static CommandLineParser<BlazerCommandLineOptions> ParseArguments(string
 				return null;
 			}
 		}
+
+		private static string[] ExpandFilesInList(string[] initialFiles, out bool hasMissingFiles)
+		{
+			hasMissingFiles = false;
+			var l = new List<string>();
+			// todo: better search + unit tests
+			foreach (var s in initialFiles)
+			{
+				if (File.Exists(s))
+					l.Add(s);
+				else if (Directory.Exists(s)) l.Add(s);
+				else
+				{
+					var asteriskIdx = s.IndexOf("*", StringComparison.InvariantCulture);
+					if (asteriskIdx < 0) hasMissingFiles = true;
+					else
+					{
+						var slashIdx = s.LastIndexOfAny(
+							new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }, asteriskIdx - 1, asteriskIdx - 1);
+						var dirToSearch = string.Empty;
+						if (slashIdx >= 0) dirToSearch = s.Substring(0, slashIdx);
+						l.AddRange(Directory.GetFiles(dirToSearch, s.Remove(0, slashIdx + 1), SearchOption.AllDirectories));
+					}
+				}
+			}
+
+			return l.ToArray();
+		}
 	}
 }

Blazer.Exe/Properties/AssemblyInfo.cs

@@ -32,4 +32,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.1.9")]
+[assembly: AssemblyFileVersion("0.9.2.10")]

Blazer.Net/Blazer.Net.nuspec

@@ -3,7 +3,7 @@
   <metadata>
     <id>Blazer.Net</id>
     <title>Blazer.Net</title>
-    <version>0.9.0</version>
+    <version>0.9.2</version>
     <authors>force</authors>
     <owners>force</owners>
     <licenseUrl>https://github.com/force-net/blazer/blob/develop/LICENSE</licenseUrl>
@@ -20,11 +20,9 @@
 	See project site for detailed information.
     </description>
     <releaseNotes>
-	Fixed bugs
-	Added some helper methods for compression
-	Improved Crc32C api to use it in external applications if needed (instead of separate library)
-	NoSeek option for decryption
-	Mega-feature: patterned compression, which can reduce compressed size of similar small messages
+    StreamHigh optimized and its compression rate slightly improved.
+    Added MaxBlockSize option from flags.
+    Added support for multiple files in one archive.
     </releaseNotes>
     <copyright>Copyright by Force 2016</copyright>
     <tags>.NET fast compression archive crc32c</tags>

Blazer.Net/BlazerFileInfo.cs

@@ -68,11 +68,18 @@ public static BlazerFileInfo FromFileName(string fileName, bool leaveFullName)
 		/// </summary>
 		public void ApplyToFile()
 		{
-			if (!File.Exists(FileName) && !Directory.Exists(FileName))
-				return;
-			File.SetAttributes(FileName, Attributes);
-			File.SetCreationTimeUtc(FileName, CreationTimeUtc);
-			File.SetLastWriteTimeUtc(FileName, CreationTimeUtc);
+			if (File.Exists(FileName))
+			{
+				File.SetAttributes(FileName, Attributes);
+				File.SetCreationTimeUtc(FileName, CreationTimeUtc);
+				File.SetLastWriteTimeUtc(FileName, LastWriteTimeUtc);
+			}
+			else if (Directory.Exists(FileName))
+			{
+				new DirectoryInfo(FileName).Attributes = Attributes;
+				Directory.SetCreationTimeUtc(FileName, CreationTimeUtc);
+				Directory.SetLastWriteTimeUtc(FileName, LastWriteTimeUtc);
+			}
 		}
 	}
 }

README.md

@@ -120,6 +120,7 @@ Extract=Blazer -d {-p%%P} -f %%AQ @%%LQMN
 ExtractWithoutPath=Blazer -d {-p%%P} --nopathname -f %%AQ @%%LQMN
 Test=Blazer -t {-p%%P} %%AQ @%%LQMN
 Add=Blazer {-p%%P} %%AQ @%%LQMN
+AddRecurse=Blazer {-p%%P} %%AQ @%%LQMN
 AllFilesMask="*"
 
 ```
@@ -139,6 +140,7 @@ Blazer compresses data into stream with special format and with variety of setti
 * Ability to compress to stdout and read data from stdin (no seeks in stream, if it does not support it)
 * Ability to use non-compressed data in same structure
 * **[Compression with pattern](Doc/PatternedCompression.md)**
+* Archive with one or multiple files (command-line utility has only basic support for multi-file archives).
 
 ## Implementation