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

Pass FileSystem in to InstallUtils.

Browse Source
This commit is contained in:
Paul Chote
2016-02-15 03:11:31 +00:00
parent b9f8301959
commit a0141318d5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ using System.IO;
using System.Linq; using System.Linq;
using ICSharpCode.SharpZipLib; using ICSharpCode.SharpZipLib;
using ICSharpCode.SharpZipLib.Zip; using ICSharpCode.SharpZipLib.Zip;
using OpenRA.FileSystem;
namespace OpenRA.Mods.Common namespace OpenRA.Mods.Common
{ {
@@ -55,15 +56,15 @@ namespace OpenRA.Mods.Common
} }
// TODO: The package should be mounted into its own context to avoid name collisions with installed files // 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, Dictionary<string, string[]> filesByDirectory, public static bool ExtractFromPackage(FileSystem.FileSystem fileSystem, string srcPath, string package, Dictionary<string, string[]> filesByDirectory,
string destPath, bool overwrite, ContentInstaller.FilenameCase caseModifier, Action<string> onProgress, Action<string> onError) string destPath, bool overwrite, ContentInstaller.FilenameCase caseModifier, Action<string> onProgress, Action<string> onError)
{ {
Directory.CreateDirectory(destPath); Directory.CreateDirectory(destPath);
Log.Write("debug", "Mounting {0}".F(srcPath)); Log.Write("debug", "Mounting {0}".F(srcPath));
Game.ModData.ModFiles.Mount(srcPath); fileSystem.Mount(srcPath);
Log.Write("debug", "Mounting {0}".F(package)); Log.Write("debug", "Mounting {0}".F(package));
Game.ModData.ModFiles.Mount(package); fileSystem.Mount(package);
foreach (var directory in filesByDirectory) foreach (var directory in filesByDirectory)
{ {
@@ -86,7 +87,7 @@ namespace OpenRA.Mods.Common
Directory.CreateDirectory(containingDir); Directory.CreateDirectory(containingDir);
using (var sourceStream = Game.ModData.ModFiles.Open(file)) using (var sourceStream = fileSystem.Open(file))
using (var destStream = File.Create(dest)) using (var destStream = File.Create(dest))
{ {
Log.Write("debug", "Extracting {0} to {1}".F(file, dest)); Log.Write("debug", "Extracting {0} to {1}".F(file, dest));

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

@@ -91,6 +91,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
insertDiskContainer.IsVisible = () => false; insertDiskContainer.IsVisible = () => false;
installingContainer.IsVisible = () => true; installingContainer.IsVisible = () => true;
progressBar.Percentage = 0; progressBar.Percentage = 0;
var modData = Game.ModData;
new Thread(() => new Thread(() =>
{ {
@@ -131,7 +132,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
statusLabel.GetText = () => "Extracting {0}".F(filename); statusLabel.GetText = () => "Extracting {0}".F(filename);
var destFile = Platform.ResolvePath("^", "Content", modId, filename.ToLowerInvariant()); var destFile = Platform.ResolvePath("^", "Content", modId, filename.ToLowerInvariant());
cabExtractor.ExtractFile(uint.Parse(archive[0]), destFile); cabExtractor.ExtractFile(uint.Parse(archive[0]), destFile);
InstallUtils.ExtractFromPackage(source, destFile, extractFiles, destDir, overwrite, installData.OutputFilenameCase, onProgress, onError); InstallUtils.ExtractFromPackage(modData.ModFiles, source, destFile, extractFiles, destDir, overwrite, installData.OutputFilenameCase, onProgress, onError);
progressBar.Percentage += installPercent; progressBar.Percentage += installPercent;
} }
} }
@@ -150,7 +151,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
retryButton.IsDisabled = () => true; retryButton.IsDisabled = () => true;
insertDiskContainer.IsVisible = () => false; insertDiskContainer.IsVisible = () => false;
installingContainer.IsVisible = () => true; installingContainer.IsVisible = () => true;
var modData = Game.ModData;
var dest = Platform.ResolvePath("^", "Content", modId); var dest = Platform.ResolvePath("^", "Content", modId);
var copyFiles = installData.CopyFilesFromCD; var copyFiles = installData.CopyFilesFromCD;
@@ -189,7 +190,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (!string.IsNullOrEmpty(extractPackage)) if (!string.IsNullOrEmpty(extractPackage))
{ {
if (!InstallUtils.ExtractFromPackage(source, extractPackage, extractFiles, dest, if (!InstallUtils.ExtractFromPackage(modData.ModFiles, source, extractPackage, extractFiles, dest,
overwrite, installData.OutputFilenameCase, onProgress, onError)) overwrite, installData.OutputFilenameCase, onProgress, onError))
{ {
onError("Extracting files from CD failed."); onError("Extracting files from CD failed.");