mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Write extra data when creating directory save data

Browse source
This commit is contained in:
Alex Barney 2021-05-18 17:07:18 -07:00
parent 7294206116
commit ccb8c078aa
3 changed files with 65 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/LibHac/Fs/Shim/PosixTime.cs Normal file
View file

@ -0,0 +1,18 @@
using LibHac.FsSrv.Sf;
namespace LibHac.Fs.Shim
{
public static class PosixTimeShim
{
public static Result SetCurrentPosixTime(this FileSystemClient fs, Time.PosixTime currentPosixTime,
int timeDifferenceSeconds)
{
using ReferenceCountedDisposable<IFileSystemProxy> fsProxy = fs.Impl.GetFileSystemProxyServiceObject();
Result rc = fsProxy.Target.SetCurrentPosixTimeWithTimeDifference(currentPosixTime.Value,
timeDifferenceSeconds);
fs.Impl.AbortIfNeeded(rc);
return rc;
}
}
}

2
src/LibHac/FsSrv/SaveDataFileSystemService.cs
View file

@ -984,7 +984,7 @@ namespace LibHac.FsSrv
Result rc = RemoveSaveIndexerEntry();
if (rc.IsFailure()) return rc;
return Result.Success;
return ResultFs.TargetNotFound.LogConverted(saveFsResult);
}
if (ResultFs.TargetNotFound.Includes(saveFsResult))

59
src/LibHac/FsSrv/SaveDataFileSystemServiceImpl.cs
View file

@ -134,15 +134,9 @@ namespace LibHac.FsSrv
bool allowDirectorySaveData = IsAllowedDirectorySaveData2(spaceId, saveDataRootPath);
if (allowDirectorySaveData)
{
Span<byte> saveDirectoryPath = stackalloc byte[0x12];
var sb = new U8StringBuilder(saveDirectoryPath);
sb.Append((byte)'/').AppendFormat(saveDataId, 'x', 16);
rc = Utility.EnsureDirectory(saveDirectoryFs.Target, new U8Span(saveDirectoryPath));
if (rc.IsFailure()) return rc;
}
// Note: When directory save data is allowed, Nintendo creates the save directory if it doesn't exist.
// This bypasses normal save data// creation, leaving the save with empty extra data.
// Instead, we return that the save doesn't exist if the directory is missing.
// Note: Nintendo doesn't cache directory save data
// if (!allowDirectorySaveData)
@ -345,10 +339,10 @@ namespace LibHac.FsSrv
{
// Use directory save data for now
ReferenceCountedDisposable<IFileSystem> fileSystem = null;
ReferenceCountedDisposable<IFileSystem> saveDirectoryFs = null;
try
{
Result rc = OpenSaveDataDirectoryFileSystem(out fileSystem, creationInfo.SpaceId, saveDataRootPath,
Result rc = OpenSaveDataDirectoryFileSystem(out saveDirectoryFs, creationInfo.SpaceId, saveDataRootPath,
false);
if (rc.IsFailure()) return rc;
@ -358,7 +352,46 @@ namespace LibHac.FsSrv
if (_config.IsPseudoSaveData())
{
return Utility.EnsureDirectory(fileSystem.Target, new U8Span(saveDataPathBuffer));
rc = Utility.EnsureDirectory(saveDirectoryFs.Target, new U8Span(saveDataPathBuffer));
if (rc.IsFailure()) return rc;
ReferenceCountedDisposable<IFileSystem> saveFs = null;
ReferenceCountedDisposable<ISaveDataExtraDataAccessor> extraDataAccessor = null;
try
{
bool isJournalingSupported = SaveDataProperties.IsJournalingSupported(attribute.Type);
rc = _config.SaveFsCreator.Create(out saveFs, out extraDataAccessor, _saveDataFsCacheManager,
ref saveDirectoryFs, creationInfo.SpaceId, saveDataId, allowDirectorySaveData: true,
useDeviceUniqueMac: false, isJournalingSupported, isMultiCommitSupported: false,
openReadOnly: false, openShared: false, _timeStampGetter);
if (rc.IsFailure()) return rc;
var extraData = new SaveDataExtraData();
extraData.Attribute = attribute;
extraData.OwnerId = creationInfo.OwnerId;
rc = GetSaveDataCommitTimeStamp(out extraData.TimeStamp);
if (rc.IsFailure())
extraData.TimeStamp = 0;
extraData.CommitId = 0;
_config.GenerateRandomData(SpanHelpers.AsByteSpan(ref extraData.CommitId)).IgnoreResult();
extraData.Flags = creationInfo.Flags;
extraData.DataSize = creationInfo.Size;
extraData.JournalSize = creationInfo.JournalSize;
rc = extraDataAccessor.Target.WriteExtraData(in extraData);
if (rc.IsFailure()) return rc;
return extraDataAccessor.Target.CommitExtraData(true);
}
finally
{
saveFs?.Dispose();
extraDataAccessor?.Dispose();
}
}
else
{
@ -367,7 +400,7 @@ namespace LibHac.FsSrv
}
finally
{
fileSystem?.Dispose();
saveDirectoryFs?.Dispose();
}
}