Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-23 19:34:15 +08:00
Code Issues Projects Releases Wiki Activity

tweaked if/else branching.

Browse Source
This commit is contained in:
morkt 2015-09-17 04:25:36 +04:00
parent 4a7678c3cd
commit eef86f0804
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
GarExtract.cs
View File

@ -60,25 +60,7 @@ namespace GARbro.GUI
if (!Directory.Exists (destination))
destination = "";
var vm = ViewModel;
if (!vm.IsArchive)
{
if (!entry.IsDirectory)
{
var source = entry.Source.Name;
SetBusyState();
if (string.IsNullOrEmpty (destination))
{
// extract into directory named after archive
if (!string.IsNullOrEmpty (Path.GetExtension (entry.Name)))
destination = Path.GetFileNameWithoutExtension (source);
else
destination = vm.Path.First();
}
extractor = new GarExtract (this, source);
extractor.ExtractAll (destination);
}
}
else if (vm.Path.Count > 1)
if (vm.IsArchive)
{
if (string.IsNullOrEmpty (destination))
destination = Path.GetDirectoryName (vm.Path.First());
@ -89,6 +71,21 @@ namespace GARbro.GUI
else
extractor.Extract (entry, destination);
}
else if (!entry.IsDirectory)
{
var source = entry.Source.Name;
SetBusyState();
if (string.IsNullOrEmpty (destination))
{
// extract into directory named after archive
if (!string.IsNullOrEmpty (Path.GetExtension (entry.Name)))
destination = Path.GetFileNameWithoutExtension (source);
else
destination = vm.Path.First();
}
extractor = new GarExtract (this, source);
extractor.ExtractAll (destination);
}
}
catch (OperationCanceledException X)
{