Skip to content

Commit

Permalink
added helper method for convenient file extraction, slightly improved…
Browse files Browse the repository at this point in the history 
… command line handling for compression
  • Loading branch information
@force-net
force-net committed Feb 7, 2018
1 parent 36b30a2 commit 5520e01
Show file tree
Hide file tree
Showing 6 changed files with 245 additions and 118 deletions.
7 changes: 7 additions & 0 deletions Blazer.Exe/FileNameHelper.cs
View file
Expand Up @@ -65,6 +65,13 @@ public static FileOptions ParseCompressOptions(CommandLineParser<BlazerCommandLi
filesToCompress = opt.Stdin ? new string[0] : nonParamOptions.Skip(1).ToArray();

if (filesToCompress.Length == 0 && archiveName != null && !opt.Stdin) filesToCompress = new[] { archiveName };
if (!opt.Stdin)
{
/*if (filesToCompress.Length == 1 && Directory.Exists(filesToCompress[0]))
filesToCompress = Directory.GetFiles(filesToCompress[0], "*", SearchOption.AllDirectories);
else*/
filesToCompress = filesToCompress.SelectMany(x => Directory.Exists(x) ? Directory.GetFiles(x, "*", SearchOption.AllDirectories) : new[] { x }).ToArray();
}
}

bool hasMissingFiles;
Expand Down
251 changes: 139 additions & 112 deletions Blazer.Exe/Program.cs
View file
Expand Up @@ -196,7 +196,11 @@ private static int ProcessCompress(CommandLineParser<BlazerCommandLineOptions> o
{
var blazerFileInfo = BlazerFileInfo.FromFileName(fileName, !opt.NoPathName);
outFile.WriteFileInfo(blazerFileInfo);
if ((blazerFileInfo.Attributes & FileAttributes.Directory) != 0)
if ((blazerFileInfo.Attributes & FileAttributes.Directory) != 0) continue;
}
else
{
if (compressionOptions.FileInfo != null && (compressionOptions.FileInfo.Attributes & FileAttributes.Directory) != 0)
continue;
}

Expand All @@ -218,108 +222,43 @@ private static int ProcessDecompress(CommandLineParser<BlazerCommandLineOptions>

var fileOptions = FileNameHelper.ParseDecompressOptions(options);

if (fileOptions == null) return 1;
if (fileOptions == null)
return 1;

Regex[] customOutFileNames = fileOptions.SourceFiles
.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim())
.Select(x => new Regex(new string(x.SelectMany(y => char.IsLetterOrDigit(y) || y == '_' ? new[] { y } : (y == '*' ? new[] { '.', '*' } : new[] { '\\', y })).ToArray())))
.ToArray();
.Where(x => !string.IsNullOrWhiteSpace(x))
.Select(x => x.Trim())
.Select(x => new Regex(new string(x.SelectMany(y => char.IsLetterOrDigit(y) || y == '_' ? new[] { y } : (y == '*' ? new[] { '.', '*' } : new[] { '\\', y })).ToArray())))
.ToArray();

if (customOutFileNames.Length == 0)
customOutFileNames = new[] { new Regex(".*") };

Stream inStreamSource = opt.Stdin ? Console.OpenStandardInput() : File.OpenRead(fileOptions.ArchiveName);

var decOptions = new BlazerDecompressionOptions(opt.Password) { EncyptFull = opt.EncryptFull, DoNotFireInfoCallbackOnOneFile = true };
var decOptions = new BlazerDecompressionOptions(opt.Password)
{
EncyptFull = opt.EncryptFull,
DoNotFireInfoCallbackOnOneFile = true
};

BlazerOutputStream outBlazerStream = null;
Stream outStream;
BlazerFileInfo prevFile = null;
Stream[] outFile = { null };
bool forceAllOverride = false;
bool forceAllSkip = opt.Stdin && !opt.Force; // nothing to do, just skip
bool hasMultipleFiles = false;
bool doExit = false;
decOptions.FileInfoCallback = fInfo =>
{
if (opt.Stdout)
return;
if (prevFile != 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.Any(y => y.IsMatch(fInfoFileName)))
return;
prevFile = fInfo;
if ((fInfo.Attributes & FileAttributes.Directory) != 0)
{
if (!opt.NoPathName && !Directory.Exists(fInfoFileName)) Directory.CreateDirectory(fInfoFileName);
}
else
{
if (opt.NoPathName) fInfoFileName = Path.GetFileName(fInfoFileName);
if (File.Exists(fInfoFileName))
{
if (forceAllSkip)
return;
if (!opt.Force && !forceAllOverride)
{
// ReSharper disable AccessToModifiedClosure
Console.WriteLine("Target " + fInfoFileName + " already exists. Overwrite? (Y)es (N)o" + (hasMultipleFiles ? " (A)ll (S)kip all existing" : string.Empty));
// ReSharper restore AccessToModifiedClosure
var readLine = Console.ReadLine().Trim().ToLowerInvariant();
forceAllOverride = readLine.IndexOf("a", StringComparison.Ordinal) >= 0;
forceAllSkip = readLine.IndexOf("s", StringComparison.Ordinal) >= 0;
if (!forceAllOverride && readLine.IndexOf("y", StringComparison.Ordinal) < 0)
{
// ReSharper disable AccessToModifiedClosure
if (!hasMultipleFiles)
{
doExit = true;
return;
}
// ReSharper restore AccessToModifiedClosure
var sts = outFile[0] as StatStream;
if (sts != null)
sts.Prefix = "Skipping " + fInfo.FileName + " ";
return;
}
}
new FileStream(fInfoFileName, FileMode.Truncate, FileAccess.Write).Close();
}
var directoryName = Path.GetDirectoryName(fInfoFileName);
if (!string.IsNullOrEmpty(directoryName)) Directory.CreateDirectory(directoryName);
outFile[0] = new StatStream(new FileStream(fInfoFileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read), true);
var statStream = outFile[0] as StatStream;
Console.WriteLine();
statStream.Prefix = "Extracting " + fInfo.FileName + " ";
}
};

if (opt.DataArray)
{
var mode = (opt.Mode ?? "block").ToLowerInvariant();
if (mode == "stream" || mode == "streamhigh") decOptions.SetDecoderByAlgorithm(BlazerAlgorithm.Stream);
else if (mode == "none") decOptions.SetDecoderByAlgorithm(BlazerAlgorithm.NoCompress);
else if (mode == "block") decOptions.SetDecoderByAlgorithm(BlazerAlgorithm.Block);
else throw new InvalidOperationException("Unsupported mode");
if (mode == "stream" || mode == "streamhigh")
decOptions.SetDecoderByAlgorithm(BlazerAlgorithm.Stream);
else if (mode == "none")
decOptions.SetDecoderByAlgorithm(BlazerAlgorithm.NoCompress);
else if (mode == "block")
decOptions.SetDecoderByAlgorithm(BlazerAlgorithm.Block);
else
throw new InvalidOperationException("Unsupported mode");

var ms = new MemoryStream();
inStreamSource.CopyTo(ms);
var comprArray = ms.ToArray();
Expand All @@ -331,53 +270,141 @@ private static int ProcessDecompress(CommandLineParser<BlazerCommandLineOptions>
outStream = outBlazerStream;
}

hasMultipleFiles = outBlazerStream != null && outBlazerStream.HaveMultipleFiles;
bool hasMultipleFiles = outBlazerStream != null && outBlazerStream.HaveMultipleFiles;

if (opt.NoFileName && hasMultipleFiles)
{
Console.Error.WriteLine("Cannot decompress without filename when archive contains multiple files");
return 1;
}

var fileName = Path.GetFileName(fileOptions.ArchiveName ?? "dummy");
if (fileName.EndsWith(".blz")) fileName = fileName.Substring(0, fileName.Length - 4);
else fileName += (fileName.EndsWith(".") ? string.Empty : ".") + "unpacked";
if (fileName.EndsWith(".blz"))
fileName = fileName.Substring(0, fileName.Length - 4);
else
fileName += (fileName.EndsWith(".") ? string.Empty : ".") + "unpacked";

if (outBlazerStream != null && outBlazerStream.FileInfo != null && !opt.NoFileName)
{
fileName = outBlazerStream.FileInfo.FileName;
}

// nothing to do
if (!hasMultipleFiles && !customOutFileNames.Any(y => y.IsMatch(fileName)))
return 0;

if (opt.Stdout) outFile[0] = Console.OpenStandardOutput();
if (!hasMultipleFiles)
decOptions.FileInfoCallback(new BlazerFileInfo { FileName = fileName, CreationTimeUtc = DateTime.UtcNow, LastWriteTimeUtc = DateTime.UtcNow });
// we haven't received an file info from callback
// if (outFile[0] == null && !outBlazerStream.HaveMultipleFiles)
// outFile[0] = new StatStream(new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read), true);
Stream consoleStream = null;
if (opt.Stdout)
consoleStream = Console.OpenStandardOutput();

using (var inFile = outStream)
Action<BlazerFileInfo, StatStream> endCallback = (fInfo, s) =>
{
if (s != null)
{
s.Flush();
s.Close();
// no file info, using some fake data
if (fInfo == null)
fInfo = new BlazerFileInfo
{
FileName = fileName,
CreationTimeUtc = DateTime.UtcNow,
LastWriteTimeUtc = DateTime.UtcNow
};
fInfo.ApplyToFile();
}
};

Func<BlazerFileInfo, StatStream> startCallback = fInfo =>
{
if (opt.Stdout)
return new StatStream(consoleStream);
// no file info, using some fake data
if (fInfo == null)
{
fInfo = new BlazerFileInfo
{
FileName = fileName,
CreationTimeUtc = DateTime.UtcNow,
LastWriteTimeUtc = DateTime.UtcNow
};
}
var fInfoFileName = fInfo.FileName;
if (customOutFileNames != null && !customOutFileNames.Any(y => y.IsMatch(fInfoFileName)))
return null;
if (opt.NoPathName)
fInfoFileName = Path.GetFileName(fInfoFileName);
if (File.Exists(fInfoFileName))
{
if (forceAllSkip)
{
var sts = new StatStream(new NullStream(), true);
sts.Prefix = "Skipping " + fInfo.FileName + " ";
return sts;
}
if (!opt.Force && !forceAllOverride)
{
// ReSharper disable AccessToModifiedClosure
Console.WriteLine();
Console.WriteLine(
"Target " + fInfoFileName + " already exists. Overwrite? (Y)es (N)o"
+ (hasMultipleFiles ? " (A)ll (S)kip all existing" : string.Empty));
// ReSharper restore AccessToModifiedClosure
var readLine = Console.ReadLine().Trim().ToLowerInvariant();
forceAllOverride = readLine.Trim().IndexOf("a", StringComparison.Ordinal) == 0;
forceAllSkip = readLine.Trim().IndexOf("s", StringComparison.Ordinal) == 0;
if (!forceAllOverride && readLine.Trim().IndexOf("y", StringComparison.Ordinal) != 0)
{
var sts = new StatStream(new NullStream(), true);
sts.Prefix = "Skipping " + fInfo.FileName + " ";
return sts;
}
}
new FileStream(fInfoFileName, FileMode.Truncate, FileAccess.Write).Close();
}
var directoryName = Path.GetDirectoryName(fInfoFileName);
if (!string.IsNullOrEmpty(directoryName))
Directory.CreateDirectory(directoryName);
var statStream =
new StatStream(new FileStream(fInfoFileName, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read), true);
Console.WriteLine();
statStream.Prefix = "Extracting " + fInfo.FileName + " ";
return statStream;
};

if (outBlazerStream == null)
{
var buf = new byte[81920];
int cnt = 1;
while (cnt > 0)
using (outStream)
{
if (doExit)
break;
cnt = inFile.Read(buf, 0, buf.Length);
if (outFile[0] != null)
outFile[0].Write(buf, 0, cnt);
var sts = startCallback(null);
outStream.CopyTo(sts);
endCallback(null, sts);
}
}

if (prevFile != null && outFile[0] != null)
else
{
outFile[0].Flush();
outFile[0].Close();
prevFile.ApplyToFile();
using (outBlazerStream)
BlazerFileHelper.ReadFilesFromStream(
outBlazerStream,
fInfo =>
{
if (opt.Stdout) return;
var fInfoFileName = fInfo.FileName;
if (customOutFileNames != null && !customOutFileNames.Any(y => y.IsMatch(fInfoFileName))) return;
if (!opt.NoPathName && !Directory.Exists(fInfoFileName)) Directory.CreateDirectory(fInfoFileName);
},
startCallback,
endCallback);
}

return 0;
Expand Down
7 changes: 6 additions & 1 deletion Blazer.Exe/StatStream.cs
View file
Expand Up @@ -34,7 +34,12 @@ public StatStream(Stream baseStream, bool doStats = false)
public override void Close()
{
_baseStream.Close();
DoStats();
if (_doStats)
{
DoStats();
if (_sw.ElapsedMilliseconds > 0)
Console.WriteLine();
}
}

public override void Flush()
Expand Down
1 change: 1 addition & 0 deletions Blazer.Net/Blazer.Net.csproj
View file
Expand Up @@ -66,6 +66,7 @@
<Compile Include="BlazerFlushMode.cs" />
<Compile Include="BlazerPatternedHelper.cs" />
<Compile Include="Encyption\Iso10126TransformEmulator.cs" />
<Compile Include="Helpers\BlazerFileHelper.cs" />
<Compile Include="Helpers\DataArrayCompressorHelper.cs" />
<Compile Include="Helpers\FileHeaderHelper.cs" />
<Compile Include="Algorithms\StreamEncoderHigh.cs" />
Expand Down
13 changes: 8 additions & 5 deletions Blazer.Net/BlazerOutputStream.cs
View file
Expand Up @@ -146,7 +146,7 @@ public override long Position

private BlazerFileInfo _fileInfo;

private bool _doNotPerformDecoding;
private readonly bool _doNotPerformDecoding;

/// <summary>
/// Returns information about compressed file, if exists (and only one file in archive)
Expand Down Expand Up @@ -218,7 +218,10 @@ public byte[] CommentRaw

private Action<byte[], int, int> _controlDataCallback { get; set; }

private Action<BlazerFileInfo> _fileInfoCallback { get; set; }
/// <summary>
/// Callback on new file info
/// </summary>
public Action<BlazerFileInfo> FileInfoCallback { get; set; }

private bool _doNotFireInfoCallbackOnOneFile { get; set; }

Expand All @@ -235,7 +238,7 @@ public BlazerOutputStream(Stream innerStream, BlazerDecompressionOptions options

var password = options.PasswordRaw;
_controlDataCallback = options.ControlDataCallback ?? ((b, o, c) => { });
_fileInfoCallback = options.FileInfoCallback ?? (f => { });
FileInfoCallback = options.FileInfoCallback ?? (f => { });
_doNotFireInfoCallbackOnOneFile = options.DoNotFireInfoCallbackOnOneFile;
_noSeek = options.NoSeek;
_doNotPerformDecoding = options.DoNotPerformDecoding;
Expand Down Expand Up @@ -335,7 +338,7 @@ private void ReadCommonBlocks()

_fileInfo = FileHeaderHelper.ParseFileHeader(fInfo.Buffer, fInfo.Offset, fInfo.Count);
if (!_haveMultipleFiles && !_doNotFireInfoCallbackOnOneFile)
_fileInfoCallback(_fileInfo);
FileInfoCallback(_fileInfo);
}
}

Expand Down Expand Up @@ -392,7 +395,7 @@ public override int Read(byte[] buffer, int offset, int count)
{
// current file info
_fileInfo = FileHeaderHelper.ParseFileHeader(info.Buffer, info.Offset, info.Count);
_fileInfoCallback(_fileInfo);
FileInfoCallback(_fileInfo);
goto start;
}
else
Expand Down

0 comments on commit 5520e01

Please sign in to comment.