epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10535 from pchote/mix-type-autodetection

Browse Source 
Auto-detect mix hash type.
This commit is contained in:
abcdefg30
2016-01-31 22:57:14 +01:00
parent a19baa9500 31cc399579
commit 1cc8330c51
7 changed files with 120 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/InstallUtils.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common
}
// TODO: The package should be mounted into its own context to avoid name collisions with installed files
public static bool ExtractFromPackage(string srcPath, string package, string annotation, Dictionary<string, string[]> filesByDirectory,
public static bool ExtractFromPackage(string srcPath, string package, Dictionary<string, string[]> filesByDirectory,
string destPath, bool overwrite, ContentInstaller.FilenameCase caseModifier, Action<string> onProgress, Action<string> onError)
{
Directory.CreateDirectory(destPath);
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.Common
Log.Write("debug", "Mounting {0}".F(srcPath));
Game.ModData.ModFiles.Mount(srcPath);
Log.Write("debug", "Mounting {0}".F(package));
Game.ModData.ModFiles.Mount(package, annotation);
Game.ModData.ModFiles.Mount(package);
foreach (var directory in filesByDirectory)
{

6
OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs
View File

@@ -131,8 +131,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
statusLabel.GetText = () => "Extracting {0}".F(filename);
var destFile = Platform.ResolvePath("^", "Content", modId, filename.ToLowerInvariant());
cabExtractor.ExtractFile(uint.Parse(archive[0]), destFile);
var annotation = archive.Length > 1 ? archive[1] : null;
InstallUtils.ExtractFromPackage(source, destFile, annotation, extractFiles, destDir, overwrite, installData.OutputFilenameCase, onProgress, onError);
InstallUtils.ExtractFromPackage(source, destFile, extractFiles, destDir, overwrite, installData.OutputFilenameCase, onProgress, onError);
progressBar.Percentage += installPercent;
}
}
@@ -157,7 +156,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var packageToExtract = installData.PackageToExtractFromCD.Split(':');
var extractPackage = packageToExtract.First();
var annotation = packageToExtract.Length > 1 ? packageToExtract.Last() : null;
var extractFiles = installData.ExtractFilesFromCD;
@@ -191,7 +189,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (!string.IsNullOrEmpty(extractPackage))
{
if (!InstallUtils.ExtractFromPackage(source, extractPackage, annotation, extractFiles, dest,
if (!InstallUtils.ExtractFromPackage(source, extractPackage, extractFiles, dest,
overwrite, installData.OutputFilenameCase, onProgress, onError))
{
onError("Extracting files from CD failed.");