mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-28 17:21:22 -08:00
63b24b4af2
* Use savedata FS commands from LibHac * Add EnsureSaveData. Use ApplicationControlProperty struct * Add a function to migrate to the new directory layout * LibHac update * Change backup structure * Don't create UI files in the save path * Update RyuFs paths * Add GetProgramIndexForAccessLog Ryujinx only runs one program at a time, so always return values reflecting that * Load control NCA when loading from an NSP * Skip over UI stats when exiting * Set TitleName and TitleId in more cases. Fix TitleID naming style * Completely comment out GUI play stats code * rebase * Update LibHac * Update LibHac * Revert UI changes * Do migration automatically at startup * Rename RyuFs directory to Ryujinx * Update RyuFs text * Store savedata paths in the GUI * Make "Open Save Directory" work * Use a dummy NACP in EnsureSaveData if one is not loaded * Remove manual migration button * Respond to feedback * Don't read the installer config to get a version string * Delete nuget.config * Exclude 'sdcard' and 'bis' during migration Co-authored-by: Thog <thog@protonmail.com>
456 lines
18 KiB
C#
456 lines
18 KiB
C#
using LibHac;
|
|
using LibHac.Fs;
|
|
using LibHac.FsService;
|
|
using LibHac.FsSystem;
|
|
using LibHac.FsSystem.NcaUtils;
|
|
using LibHac.Ncm;
|
|
using Ryujinx.Common;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy;
|
|
using System.IO;
|
|
|
|
using static Ryujinx.HLE.Utilities.StringUtils;
|
|
using StorageId = Ryujinx.HLE.FileSystem.StorageId;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Fs
|
|
{
|
|
[Service("fsp-srv")]
|
|
class IFileSystemProxy : IpcService
|
|
{
|
|
private LibHac.FsService.IFileSystemProxy _baseFileSystemProxy;
|
|
|
|
public IFileSystemProxy(ServiceCtx context)
|
|
{
|
|
_baseFileSystemProxy = context.Device.System.FsServer.CreateFileSystemProxyService();
|
|
}
|
|
|
|
[Command(1)]
|
|
// Initialize(u64, pid)
|
|
public ResultCode Initialize(ServiceCtx context)
|
|
{
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(8)]
|
|
// OpenFileSystemWithId(nn::fssrv::sf::FileSystemType filesystem_type, nn::ApplicationId tid, buffer<bytes<0x301>, 0x19, 0x301> path)
|
|
// -> object<nn::fssrv::sf::IFileSystem> contentFs
|
|
public ResultCode OpenFileSystemWithId(ServiceCtx context)
|
|
{
|
|
FileSystemType fileSystemType = (FileSystemType)context.RequestData.ReadInt32();
|
|
long titleId = context.RequestData.ReadInt64();
|
|
string switchPath = ReadUtf8String(context);
|
|
string fullPath = context.Device.FileSystem.SwitchPathToSystemPath(switchPath);
|
|
|
|
if (!File.Exists(fullPath))
|
|
{
|
|
if (fullPath.Contains("."))
|
|
{
|
|
ResultCode result = FileSystemProxyHelper.OpenFileSystemFromInternalFile(context, fullPath, out FileSystemProxy.IFileSystem fileSystem);
|
|
|
|
if (result == ResultCode.Success)
|
|
{
|
|
MakeObject(context, fileSystem);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
return ResultCode.PathDoesNotExist;
|
|
}
|
|
|
|
FileStream fileStream = new FileStream(fullPath, FileMode.Open, FileAccess.Read);
|
|
string extension = Path.GetExtension(fullPath);
|
|
|
|
if (extension == ".nca")
|
|
{
|
|
ResultCode result = FileSystemProxyHelper.OpenNcaFs(context, fullPath, fileStream.AsStorage(), out FileSystemProxy.IFileSystem fileSystem);
|
|
|
|
if (result == ResultCode.Success)
|
|
{
|
|
MakeObject(context, fileSystem);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
else if (extension == ".nsp")
|
|
{
|
|
ResultCode result = FileSystemProxyHelper.OpenNsp(context, fullPath, out FileSystemProxy.IFileSystem fileSystem);
|
|
|
|
if (result == ResultCode.Success)
|
|
{
|
|
MakeObject(context, fileSystem);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
return ResultCode.InvalidInput;
|
|
}
|
|
|
|
[Command(11)]
|
|
// OpenBisFileSystem(nn::fssrv::sf::Partition partitionID, buffer<bytes<0x301>, 0x19, 0x301>) -> object<nn::fssrv::sf::IFileSystem> Bis
|
|
public ResultCode OpenBisFileSystem(ServiceCtx context)
|
|
{
|
|
BisPartitionId bisPartitionId = (BisPartitionId)context.RequestData.ReadInt32();
|
|
|
|
Result rc = FileSystemProxyHelper.ReadFsPath(out FsPath path, context);
|
|
if (rc.IsFailure()) return (ResultCode)rc.Value;
|
|
|
|
rc = _baseFileSystemProxy.OpenBisFileSystem(out LibHac.Fs.IFileSystem fileSystem, ref path, bisPartitionId);
|
|
if (rc.IsFailure()) return (ResultCode)rc.Value;
|
|
|
|
MakeObject(context, new FileSystemProxy.IFileSystem(fileSystem));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(18)]
|
|
// OpenSdCardFileSystem() -> object<nn::fssrv::sf::IFileSystem>
|
|
public ResultCode OpenSdCardFileSystem(ServiceCtx context)
|
|
{
|
|
Result rc = _baseFileSystemProxy.OpenSdCardFileSystem(out LibHac.Fs.IFileSystem fileSystem);
|
|
if (rc.IsFailure()) return (ResultCode)rc.Value;
|
|
|
|
MakeObject(context, new FileSystemProxy.IFileSystem(fileSystem));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(21)]
|
|
public ResultCode DeleteSaveDataFileSystem(ServiceCtx context)
|
|
{
|
|
ulong saveDataId = context.RequestData.ReadUInt64();
|
|
|
|
Result result = _baseFileSystemProxy.DeleteSaveDataFileSystem(saveDataId);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(22)]
|
|
public ResultCode CreateSaveDataFileSystem(ServiceCtx context)
|
|
{
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
SaveDataCreateInfo createInfo = context.RequestData.ReadStruct<SaveDataCreateInfo>();
|
|
SaveMetaCreateInfo metaCreateInfo = context.RequestData.ReadStruct<SaveMetaCreateInfo>();
|
|
|
|
Result result = _baseFileSystemProxy.CreateSaveDataFileSystem(ref attribute, ref createInfo, ref metaCreateInfo);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(23)]
|
|
public ResultCode CreateSaveDataFileSystemBySystemSaveDataId(ServiceCtx context)
|
|
{
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
SaveDataCreateInfo createInfo = context.RequestData.ReadStruct<SaveDataCreateInfo>();
|
|
|
|
Result result = _baseFileSystemProxy.CreateSaveDataFileSystemBySystemSaveDataId(ref attribute, ref createInfo);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(25)]
|
|
public ResultCode DeleteSaveDataFileSystemBySaveDataSpaceId(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
ulong saveDataId = context.RequestData.ReadUInt64();
|
|
|
|
Result result = _baseFileSystemProxy.DeleteSaveDataFileSystemBySaveDataSpaceId(spaceId, saveDataId);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(28)]
|
|
public ResultCode DeleteSaveDataFileSystemBySaveDataAttribute(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
|
|
Result result = _baseFileSystemProxy.DeleteSaveDataFileSystemBySaveDataAttribute(spaceId, ref attribute);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(30)]
|
|
// OpenGameCardStorage(u32, u32) -> object<nn::fssrv::sf::IStorage>
|
|
public ResultCode OpenGameCardStorage(ServiceCtx context)
|
|
{
|
|
GameCardHandle handle = new GameCardHandle(context.RequestData.ReadInt32());
|
|
GameCardPartitionRaw partitionId = (GameCardPartitionRaw)context.RequestData.ReadInt32();
|
|
|
|
Result result = _baseFileSystemProxy.OpenGameCardStorage(out LibHac.Fs.IStorage storage, handle, partitionId);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new FileSystemProxy.IStorage(storage));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(35)]
|
|
public ResultCode CreateSaveDataFileSystemWithHashSalt(ServiceCtx context)
|
|
{
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
SaveDataCreateInfo createInfo = context.RequestData.ReadStruct<SaveDataCreateInfo>();
|
|
SaveMetaCreateInfo metaCreateInfo = context.RequestData.ReadStruct<SaveMetaCreateInfo>();
|
|
HashSalt hashSalt = context.RequestData.ReadStruct<HashSalt>();
|
|
|
|
Result result = _baseFileSystemProxy.CreateSaveDataFileSystemWithHashSalt(ref attribute, ref createInfo, ref metaCreateInfo, ref hashSalt);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(51)]
|
|
// OpenSaveDataFileSystem(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> saveDataFs
|
|
public ResultCode OpenSaveDataFileSystem(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
|
|
if (attribute.TitleId == TitleId.Zero)
|
|
{
|
|
attribute.TitleId = new TitleId(context.Process.TitleId);
|
|
}
|
|
|
|
Result result = _baseFileSystemProxy.OpenSaveDataFileSystem(out LibHac.Fs.IFileSystem fileSystem, spaceId, ref attribute);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new FileSystemProxy.IFileSystem(fileSystem));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(52)]
|
|
// OpenSaveDataFileSystemBySystemSaveDataId(u8 save_data_space_id, nn::fssrv::sf::SaveStruct saveStruct) -> object<nn::fssrv::sf::IFileSystem> systemSaveDataFs
|
|
public ResultCode OpenSaveDataFileSystemBySystemSaveDataId(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
|
|
Result result = _baseFileSystemProxy.OpenSaveDataFileSystemBySystemSaveDataId(out LibHac.Fs.IFileSystem fileSystem, spaceId, ref attribute);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new FileSystemProxy.IFileSystem(fileSystem));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(53)]
|
|
// OpenReadOnlySaveDataFileSystem(u8 save_data_space_id, nn::fssrv::sf::SaveStruct save_struct) -> object<nn::fssrv::sf::IFileSystem>
|
|
public ResultCode OpenReadOnlySaveDataFileSystem(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
SaveDataAttribute attribute = context.RequestData.ReadStruct<SaveDataAttribute>();
|
|
|
|
if (attribute.TitleId == TitleId.Zero)
|
|
{
|
|
attribute.TitleId = new TitleId(context.Process.TitleId);
|
|
}
|
|
|
|
Result result = _baseFileSystemProxy.OpenReadOnlySaveDataFileSystem(out LibHac.Fs.IFileSystem fileSystem, spaceId, ref attribute);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new FileSystemProxy.IFileSystem(fileSystem));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(60)]
|
|
public ResultCode OpenSaveDataInfoReader(ServiceCtx context)
|
|
{
|
|
Result result = _baseFileSystemProxy.OpenSaveDataInfoReader(out LibHac.FsService.ISaveDataInfoReader infoReader);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new ISaveDataInfoReader(infoReader));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(61)]
|
|
public ResultCode OpenSaveDataInfoReaderBySaveDataSpaceId(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadByte();
|
|
|
|
Result result = _baseFileSystemProxy.OpenSaveDataInfoReaderBySaveDataSpaceId(out LibHac.FsService.ISaveDataInfoReader infoReader, spaceId);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new ISaveDataInfoReader(infoReader));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(67)]
|
|
public ResultCode FindSaveDataWithFilter(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
SaveDataFilter filter = context.RequestData.ReadStruct<SaveDataFilter>();
|
|
|
|
long bufferPosition = context.Request.ReceiveBuff[0].Position;
|
|
long bufferLen = context.Request.ReceiveBuff[0].Size;
|
|
|
|
byte[] infoBuffer = new byte[bufferLen];
|
|
|
|
Result result = _baseFileSystemProxy.FindSaveDataWithFilter(out long count, infoBuffer, spaceId, ref filter);
|
|
|
|
context.Memory.WriteBytes(bufferPosition, infoBuffer);
|
|
context.ResponseData.Write(count);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(68)]
|
|
public ResultCode OpenSaveDataInfoReaderWithFilter(ServiceCtx context)
|
|
{
|
|
SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64();
|
|
SaveDataFilter filter = context.RequestData.ReadStruct<SaveDataFilter>();
|
|
|
|
Result result = _baseFileSystemProxy.OpenSaveDataInfoReaderWithFilter(out LibHac.FsService.ISaveDataInfoReader infoReader, spaceId, ref filter);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new ISaveDataInfoReader(infoReader));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(200)]
|
|
// OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage
|
|
public ResultCode OpenDataStorageByCurrentProcess(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new FileSystemProxy.IStorage(context.Device.FileSystem.RomFs.AsStorage()));
|
|
|
|
return 0;
|
|
}
|
|
|
|
[Command(202)]
|
|
// OpenDataStorageByDataId(u8 storageId, nn::ApplicationId tid) -> object<nn::fssrv::sf::IStorage> dataStorage
|
|
public ResultCode OpenDataStorageByDataId(ServiceCtx context)
|
|
{
|
|
StorageId storageId = (StorageId)context.RequestData.ReadByte();
|
|
byte[] padding = context.RequestData.ReadBytes(7);
|
|
long titleId = context.RequestData.ReadInt64();
|
|
|
|
NcaContentType contentType = NcaContentType.Data;
|
|
|
|
StorageId installedStorage =
|
|
context.Device.System.ContentManager.GetInstalledStorage(titleId, contentType, storageId);
|
|
|
|
if (installedStorage == StorageId.None)
|
|
{
|
|
contentType = NcaContentType.PublicData;
|
|
|
|
installedStorage =
|
|
context.Device.System.ContentManager.GetInstalledStorage(titleId, contentType, storageId);
|
|
}
|
|
|
|
if (installedStorage != StorageId.None)
|
|
{
|
|
string contentPath = context.Device.System.ContentManager.GetInstalledContentPath(titleId, storageId, contentType);
|
|
string installPath = context.Device.FileSystem.SwitchPathToSystemPath(contentPath);
|
|
|
|
if (!string.IsNullOrWhiteSpace(installPath))
|
|
{
|
|
string ncaPath = installPath;
|
|
|
|
if (File.Exists(ncaPath))
|
|
{
|
|
try
|
|
{
|
|
LibHac.Fs.IStorage ncaStorage = new LocalStorage(ncaPath, FileAccess.Read, FileMode.Open);
|
|
Nca nca = new Nca(context.Device.System.KeySet, ncaStorage);
|
|
LibHac.Fs.IStorage romfsStorage = nca.OpenStorage(NcaSectionType.Data, context.Device.System.FsIntegrityCheckLevel);
|
|
|
|
MakeObject(context, new FileSystemProxy.IStorage(romfsStorage));
|
|
}
|
|
catch (HorizonResultException ex)
|
|
{
|
|
return (ResultCode)ex.ResultValue.Value;
|
|
}
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
else
|
|
{
|
|
throw new FileNotFoundException($"No Nca found in Path `{ncaPath}`.");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
throw new DirectoryNotFoundException($"Path for title id {titleId:x16} on Storage {storageId} was not found in Path {installPath}.");
|
|
}
|
|
}
|
|
|
|
throw new FileNotFoundException($"System archive with titleid {titleId:x16} was not found on Storage {storageId}. Found in {installedStorage}.");
|
|
}
|
|
|
|
[Command(203)]
|
|
// OpenPatchDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage>
|
|
public ResultCode OpenPatchDataStorageByCurrentProcess(ServiceCtx context)
|
|
{
|
|
MakeObject(context, new FileSystemProxy.IStorage(context.Device.FileSystem.RomFs.AsStorage()));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(400)]
|
|
// OpenDataStorageByCurrentProcess() -> object<nn::fssrv::sf::IStorage> dataStorage
|
|
public ResultCode OpenDeviceOperator(ServiceCtx context)
|
|
{
|
|
Result result = _baseFileSystemProxy.OpenDeviceOperator(out LibHac.FsService.IDeviceOperator deviceOperator);
|
|
|
|
if (result.IsSuccess())
|
|
{
|
|
MakeObject(context, new IDeviceOperator(deviceOperator));
|
|
}
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
[Command(1005)]
|
|
// GetGlobalAccessLogMode() -> u32 logMode
|
|
public ResultCode GetGlobalAccessLogMode(ServiceCtx context)
|
|
{
|
|
int mode = context.Device.System.GlobalAccessLogMode;
|
|
|
|
context.ResponseData.Write(mode);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1006)]
|
|
// OutputAccessLogToSdCard(buffer<bytes, 5> log_text)
|
|
public ResultCode OutputAccessLogToSdCard(ServiceCtx context)
|
|
{
|
|
string message = ReadUtf8StringSend(context);
|
|
|
|
// FS ends each line with a newline. Remove it because Ryujinx logging adds its own newline
|
|
Logger.PrintAccessLog(LogClass.ServiceFs, message.TrimEnd('\n'));
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
|
|
[Command(1011)]
|
|
public ResultCode GetProgramIndexForAccessLog(ServiceCtx context)
|
|
{
|
|
int programIndex = 0;
|
|
int programCount = 1;
|
|
|
|
context.ResponseData.Write(programIndex);
|
|
context.ResponseData.Write(programCount);
|
|
|
|
return ResultCode.Success;
|
|
}
|
|
}
|
|
} |