mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fix

Browse source
This commit is contained in:
Xpl0itR 2020-01-30 12:47:44 +00:00
commit f86c39e5e7
No known key found for this signature in database
GPG key ID: 91798184109676AD
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Ryujinx/Ui/GameTableContextMenu.cs
View file

@ -162,7 +162,7 @@ namespace Ryujinx.Ui
{ {
Thread extractorThread = new Thread(() => Thread extractorThread = new Thread(() =>
{ {
string source = _gameTableStore.GetValue(_rowIter, 9).ToString(); string sourceFile = _gameTableStore.GetValue(_rowIter, 9).ToString();
Gtk.Application.Invoke(delegate Gtk.Application.Invoke(delegate
{ {
@ -171,25 +171,25 @@ namespace Ryujinx.Ui
Title = "Ryujinx - NCA Section Extractor", Title = "Ryujinx - NCA Section Extractor",
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.Icon.png"), Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.Icon.png"),
Text = "", Text = "",
SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(source)}...", SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(sourceFile)}...",
WindowPosition = WindowPosition.Center WindowPosition = WindowPosition.Center
}; };
_dialog.Response += (sender, args) => _dialog.Dispose(); _dialog.Response += (sender, args) => _dialog.Dispose();
_dialog.Show(); _dialog.Show();
}); });
using (FileStream file = new FileStream(source, FileMode.Open, FileAccess.Read)) using (FileStream file = new FileStream(sourceFile, FileMode.Open, FileAccess.Read))
{ {
Nca mainNca = null; Nca mainNca = null;
Nca patchNca = null; Nca patchNca = null;
if ((System.IO.Path.GetExtension(source).ToLower() == ".nsp") || if ((System.IO.Path.GetExtension(sourceFile).ToLower() == ".nsp") ||
(System.IO.Path.GetExtension(source).ToLower() == ".pfs0") || (System.IO.Path.GetExtension(sourceFile).ToLower() == ".pfs0") ||
(System.IO.Path.GetExtension(source).ToLower() == ".xci")) (System.IO.Path.GetExtension(sourceFile).ToLower() == ".xci"))
{ {
PartitionFileSystem pfs; PartitionFileSystem pfs;
if (System.IO.Path.GetExtension(source) == ".xci") if (System.IO.Path.GetExtension(sourceFile) == ".xci")
{ {
Xci xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage()); Xci xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage());
@ -221,7 +221,7 @@ namespace Ryujinx.Ui
} }
} }
} }
else if (System.IO.Path.GetExtension(source).ToLower() == ".nca") else if (System.IO.Path.GetExtension(sourceFile).ToLower() == ".nca")
{ {
mainNca = new Nca(_virtualFileSystem.KeySet, file.AsStorage()); mainNca = new Nca(_virtualFileSystem.KeySet, file.AsStorage());
} }
@ -243,10 +243,15 @@ namespace Ryujinx.Ui
IFileSystem ncaFileSystem = patchNca != null ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid) IFileSystem ncaFileSystem = patchNca != null ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
: mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid); : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
_virtualFileSystem.FsClient.Register(ncaSectionType.ToString().ToU8Span(), ncaFileSystem); FileSystemClient fsClient = _virtualFileSystem.FsClient;
_virtualFileSystem.FsClient.Register("output".ToU8Span(), new LocalFileSystem(destination));
Result resultCode = CopyDirectory(_virtualFileSystem.FsClient, $"{ncaSectionType}:/", "output:/"); string source = new Random().Next(0, 999999999).ToString();
string output = new Random().Next(0, 999999999).ToString();
fsClient.Register(source.ToU8Span(), ncaFileSystem);
fsClient.Register(output.ToU8Span(), new LocalFileSystem(destination));
Result resultCode = CopyDirectory(fsClient, $"{source}:/", $"{output}:/");
if (resultCode.IsFailure()) if (resultCode.IsFailure())
{ {
@ -268,8 +273,8 @@ namespace Ryujinx.Ui
}); });
} }
_virtualFileSystem.FsClient.Unmount(ncaSectionType.ToString()); fsClient.Unmount(source);
_virtualFileSystem.FsClient.Unmount("output"); fsClient.Unmount(output);
} }
}); });
extractorThread.Name = "GUI.NcaSectionExtractorThread"; extractorThread.Name = "GUI.NcaSectionExtractorThread";