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

Put extractor on a new thread and added dialogs

Browse source
This commit is contained in:
Xpl0itR 2020-01-27 22:23:54 +00:00
commit 8ae6f26e78
No known key found for this signature in database
GPG key ID: 91798184109676AD
1 changed files with 114 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

98
Ryujinx/Ui/GameTableContextMenu.cs
View file

@ -1,10 +1,12 @@
using Gtk; using Gtk;
using LibHac; using LibHac;
using LibHac.Common;
using LibHac.Fs; using LibHac.Fs;
using LibHac.Fs.Shim; using LibHac.Fs.Shim;
using LibHac.FsSystem; using LibHac.FsSystem;
using LibHac.FsSystem.NcaUtils; using LibHac.FsSystem.NcaUtils;
using LibHac.Ncm; using LibHac.Ncm;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.FileSystem;
using System; using System;
using System.Buffers; using System.Buffers;
@ -12,17 +14,18 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using LibHac.Common; using System.Threading;
using Ryujinx.Common.Logging;
using GUI = Gtk.Builder.ObjectAttribute; using GUI = Gtk.Builder.ObjectAttribute;
namespace Ryujinx.Ui namespace Ryujinx.Ui
{ {
public class GameTableContextMenu : Menu public class GameTableContextMenu : Menu
{ {
private static ListStore _gameTableStore; private ListStore _gameTableStore;
private static TreeIter _rowIter; private TreeIter _rowIter;
private VirtualFileSystem _virtualFileSystem; private VirtualFileSystem _virtualFileSystem;
private MessageDialog _dialog;
#pragma warning disable CS0649 #pragma warning disable CS0649
#pragma warning disable IDE0044 #pragma warning disable IDE0044
@ -150,22 +153,43 @@ namespace Ryujinx.Ui
{ {
FileChooserDialog fileChooser = new FileChooserDialog("Choose the folder to extract into", null, FileChooserAction.SelectFolder, "Cancel", ResponseType.Cancel, "Extract", ResponseType.Accept); FileChooserDialog fileChooser = new FileChooserDialog("Choose the folder to extract into", null, FileChooserAction.SelectFolder, "Cancel", ResponseType.Cancel, "Extract", ResponseType.Accept);
if (fileChooser.Run() == (int)ResponseType.Accept) int response = fileChooser.Run();
{ string destination = fileChooser.Filename;
string path = _gameTableStore.GetValue(_rowIter, 9).ToString();
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read)) fileChooser.Dispose();
if (response == (int)ResponseType.Accept)
{
Thread extractorThread = new Thread(() =>
{
string source = _gameTableStore.GetValue(_rowIter, 9).ToString();
Gtk.Application.Invoke(delegate
{
_dialog = new MessageDialog(null, DialogFlags.DestroyWithParent, MessageType.Info, ButtonsType.None, null)
{
Title = "Ryujinx - NCA Section Extractor",
Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.Icon.png"),
Text = "",
SecondaryText = $"Extracting {ncaSectionType} section from {System.IO.Path.GetFileName(source)}...",
WindowPosition = WindowPosition.Center
};
_dialog.Response += (sender, args) => _dialog.Dispose();
_dialog.Show();
});
using (FileStream file = new FileStream(source, FileMode.Open, FileAccess.Read))
{ {
Nca mainNca = null; Nca mainNca = null;
Nca patchNca = null; Nca patchNca = null;
if ((System.IO.Path.GetExtension(path).ToLower() == ".nsp") || if ((System.IO.Path.GetExtension(source).ToLower() == ".nsp") ||
(System.IO.Path.GetExtension(path).ToLower() == ".pfs0") || (System.IO.Path.GetExtension(source).ToLower() == ".pfs0") ||
(System.IO.Path.GetExtension(path).ToLower() == ".xci")) (System.IO.Path.GetExtension(source).ToLower() == ".xci"))
{ {
PartitionFileSystem pfs; PartitionFileSystem pfs;
if (System.IO.Path.GetExtension(path) == ".xci") if (System.IO.Path.GetExtension(source) == ".xci")
{ {
Xci xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage()); Xci xci = new Xci(_virtualFileSystem.KeySet, file.AsStorage());
@ -197,7 +221,7 @@ namespace Ryujinx.Ui
} }
} }
} }
else if (System.IO.Path.GetExtension(path).ToLower() == ".nca") else if (System.IO.Path.GetExtension(source).ToLower() == ".nca")
{ {
mainNca = new Nca(_virtualFileSystem.KeySet, file.AsStorage()); mainNca = new Nca(_virtualFileSystem.KeySet, file.AsStorage());
} }
@ -205,41 +229,53 @@ namespace Ryujinx.Ui
if (mainNca == null) if (mainNca == null)
{ {
Logger.PrintError(LogClass.Application, "Extraction failed. The main NCA was not present in the selected file."); Logger.PrintError(LogClass.Application, "Extraction failed. The main NCA was not present in the selected file.");
GtkDialog.CreateErrorDialog("Extraction failed. The main NCA was not present in the selected file.");
fileChooser.Dispose(); Gtk.Application.Invoke(delegate
{
GtkDialog.CreateErrorDialog("Extraction failed. The main NCA was not present in the selected file.");
});
return; return;
} }
int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType); int index = Nca.GetSectionIndexFromType(ncaSectionType, mainNca.Header.ContentType);
IFileSystem ncaFileSystem; IFileSystem ncaFileSystem = patchNca != null ? mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid)
if (patchNca != null) : mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
{
ncaFileSystem = mainNca.OpenFileSystemWithPatch(patchNca, index, IntegrityCheckLevel.ErrorOnInvalid);
}
else
{
ncaFileSystem = mainNca.OpenFileSystem(index, IntegrityCheckLevel.ErrorOnInvalid);
}
_virtualFileSystem.FsClient.Register(ncaSectionType.ToString().ToU8Span(), ncaFileSystem); _virtualFileSystem.FsClient.Register(ncaSectionType.ToString().ToU8Span(), ncaFileSystem);
_virtualFileSystem.FsClient.Register("output".ToU8Span(), new LocalFileSystem(fileChooser.Filename)); _virtualFileSystem.FsClient.Register("output".ToU8Span(), new LocalFileSystem(destination));
Result rc = CopyDirectory(_virtualFileSystem.FsClient, $"{ncaSectionType}:/", "output:/"); Result resultCode = CopyDirectory(_virtualFileSystem.FsClient, $"{ncaSectionType}:/", "output:/");
if (rc.IsFailure())
if (resultCode.IsFailure())
{ {
Logger.PrintError(LogClass.Application, $"LibHac returned error code: {rc.ErrorCode}"); Logger.PrintError(LogClass.Application, $"LibHac returned error code: {resultCode.ErrorCode}");
GtkDialog.CreateErrorDialog($"Extraction failed. Read the log file for further information.");
Gtk.Application.Invoke(delegate
{
_dialog.Text = "Ryujinx has encountered an error";
_dialog.SecondaryText = "Extraction failed. Read the log file for further information.";
_dialog.AddButton("OK", ResponseType.Ok);
});
}
else if (resultCode.IsSuccess())
{
Gtk.Application.Invoke(delegate
{
_dialog.SecondaryText = "Extraction has completed successfully.";
_dialog.AddButton("OK", ResponseType.Ok);
});
} }
_virtualFileSystem.FsClient.Unmount(ncaSectionType.ToString()); _virtualFileSystem.FsClient.Unmount(ncaSectionType.ToString());
_virtualFileSystem.FsClient.Unmount("output"); _virtualFileSystem.FsClient.Unmount("output");
} }
});
extractorThread.Name = "GUI.NcaSectionExtractorThread";
extractorThread.IsBackground = true;
extractorThread.Start();
} }
fileChooser.Dispose();
} }
private static Result CopyDirectory(FileSystemClient fs, string sourcePath, string destPath) private static Result CopyDirectory(FileSystemClient fs, string sourcePath, string destPath)