claunia/osrepodbmgr
1
0
Fork 0
mirror of https://github.com/claunia/osrepodbmgr.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use DotNetZip to extract ZIP files that are not created by mac

Browse Source 
OS.
This commit is contained in:
Natalia Portillo
2017-05-11 03:22:50 +01:00
parent af85b89af8
commit 0705a4d26f
4 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osrepodbmgr.Core/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-11 Natalia Portillo <claunia@claunia.com>
* Workers.cs:
Use DotNetZip to extract ZIP files that are not created by
mac OS.
2017-05-11 Natalia Portillo <claunia@claunia.com>
* Workers.cs:

78
osrepodbmgr.Core/Workers.cs
View File

@@ -1171,26 +1171,48 @@ namespace osrepodbmgr.Core
try
{
Context.unarProcess = new Process();
Context.unarProcess.StartInfo.FileName = Settings.Current.UnArchiverPath;
Context.unarProcess.StartInfo.CreateNoWindow = true;
Context.unarProcess.StartInfo.RedirectStandardOutput = true;
Context.unarProcess.StartInfo.UseShellExecute = false;
Context.unarProcess.StartInfo.Arguments = string.Format("-o \"\"\"{0}\"\"\" -r -D -k hidden \"\"\"{1}\"\"\"", tmpFolder, Context.path);
long counter = 0;
Context.unarProcess.OutputDataReceived += (sender, e) =>
// If it's a ZIP file not created by Mac OS X, use DotNetZip to uncompress (unar freaks out or corrupts certain ZIP features)
if(ZipFile.IsZipFile(Context.path) && Context.copyArchive)
{
counter++;
if(UpdateProgress2 != null)
UpdateProgress2("", e.Data, counter, Context.noFilesInArchive);
};
Context.unarProcess.Start();
Context.unarProcess.BeginOutputReadLine();
Context.unarProcess.WaitForExit();
Context.unarProcess.Close();
try
{
ZipFile zf = ZipFile.Read(Context.path);
zf.ExtractExistingFile = ExtractExistingFileAction.OverwriteSilently;
zf.ExtractProgress += Zf_ExtractProgress;
zipCounter = 0;
zipCurrentEntryName = "";
zf.ExtractAll(tmpFolder);
}
catch
{
if(Failed != null)
Failed("Failed extraction");
return;
}
}
else
{
Context.unarProcess = new Process();
Context.unarProcess.StartInfo.FileName = Settings.Current.UnArchiverPath;
Context.unarProcess.StartInfo.CreateNoWindow = true;
Context.unarProcess.StartInfo.RedirectStandardOutput = true;
Context.unarProcess.StartInfo.UseShellExecute = false;
Context.unarProcess.StartInfo.Arguments = string.Format("-o \"\"\"{0}\"\"\" -r -D -k hidden \"\"\"{1}\"\"\"", tmpFolder, Context.path);
long counter = 0;
Context.unarProcess.OutputDataReceived += (sender, e) =>
{
counter++;
if(UpdateProgress2 != null)
UpdateProgress2("", e.Data, counter, Context.noFilesInArchive);
};
Context.unarProcess.Start();
Context.unarProcess.BeginOutputReadLine();
Context.unarProcess.WaitForExit();
Context.unarProcess.Close();
if(Finished != null)
Finished();
if(Finished != null)
Finished();
}
Context.tmpFolder = tmpFolder;
}
@@ -1203,6 +1225,26 @@ namespace osrepodbmgr.Core
}
}
static void Zf_ExtractProgress(object sender, ExtractProgressEventArgs e)
{
if(e.CurrentEntry != null && e.CurrentEntry.FileName != zipCurrentEntryName)
{
zipCurrentEntryName = e.CurrentEntry.FileName;
zipCounter++;
}
if(UpdateProgress != null && e.CurrentEntry != null && e.EntriesTotal > 0)
UpdateProgress("Extracting...", e.CurrentEntry.FileName, zipCounter, e.EntriesTotal);
if(UpdateProgress2 != null)
UpdateProgress2(string.Format("{0:P}", e.BytesTransferred / (double)e.TotalBytesToTransfer),
string.Format("{0} / {1}", e.BytesTransferred, e.TotalBytesToTransfer),
e.BytesTransferred, e.TotalBytesToTransfer);
Console.WriteLine("{0}", e.EventType);
if(e.EventType == ZipProgressEventType.Extracting_AfterExtractAll && Finished != null)
Finished();
}
public static void CopyArchive()
{
try