From 4113bc2d3623a5688dcbb728239e0fd03d37fcc1 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sun, 6 Sep 2020 00:27:09 -0700 Subject: [PATCH] Rename FileSystemProxy to FileSystemProxyImpl --- src/LibHac/Fs/SdCardAccessLog.cs | 2 +- ...stemProxyCore.cs => FileSystemProxyCoreImpl.cs} | 4 ++-- .../{FileSystemProxy.cs => FileSystemProxyImpl.cs} | 6 +++--- src/LibHac/FsSrv/FileSystemServer.cs | 14 +++++++------- src/LibHac/FsSrv/Impl/MultiCommitManager.cs | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) rename src/LibHac/FsSrv/{FileSystemProxyCore.cs => FileSystemProxyCoreImpl.cs} (99%) rename src/LibHac/FsSrv/{FileSystemProxy.cs => FileSystemProxyImpl.cs} (99%) diff --git a/src/LibHac/Fs/SdCardAccessLog.cs b/src/LibHac/Fs/SdCardAccessLog.cs index b5494ab9..35712aa0 100644 --- a/src/LibHac/Fs/SdCardAccessLog.cs +++ b/src/LibHac/Fs/SdCardAccessLog.cs @@ -4,7 +4,7 @@ using LibHac.FsSrv; namespace LibHac.Fs { /// - /// The default access logger that will output to the SD card via . + /// The default access logger that will output to the SD card via . /// public class SdCardAccessLog : IAccessLog { diff --git a/src/LibHac/FsSrv/FileSystemProxyCore.cs b/src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs similarity index 99% rename from src/LibHac/FsSrv/FileSystemProxyCore.cs rename to src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs index 6441ef3b..01183f0f 100644 --- a/src/LibHac/FsSrv/FileSystemProxyCore.cs +++ b/src/LibHac/FsSrv/FileSystemProxyCoreImpl.cs @@ -14,7 +14,7 @@ using RightsId = LibHac.Fs.RightsId; namespace LibHac.FsSrv { - public class FileSystemProxyCore + public class FileSystemProxyCoreImpl { internal FileSystemProxyConfiguration Config { get; } private FileSystemCreators FsCreators => Config.FsCreatorInterfaces; @@ -33,7 +33,7 @@ namespace LibHac.FsSrv internal ISaveDataIndexerManager SaveDataIndexerManager { get; private set; } - public FileSystemProxyCore(FileSystemProxyConfiguration config, ExternalKeySet externalKeys, IDeviceOperator deviceOperator) + public FileSystemProxyCoreImpl(FileSystemProxyConfiguration config, ExternalKeySet externalKeys, IDeviceOperator deviceOperator) { Config = config; ProgramRegistry = new ProgramRegistryImpl(Config.ProgramRegistryServiceImpl); diff --git a/src/LibHac/FsSrv/FileSystemProxy.cs b/src/LibHac/FsSrv/FileSystemProxyImpl.cs similarity index 99% rename from src/LibHac/FsSrv/FileSystemProxy.cs rename to src/LibHac/FsSrv/FileSystemProxyImpl.cs index 429f3ee1..156980a5 100644 --- a/src/LibHac/FsSrv/FileSystemProxy.cs +++ b/src/LibHac/FsSrv/FileSystemProxyImpl.cs @@ -15,9 +15,9 @@ using LibHac.Util; namespace LibHac.FsSrv { - public class FileSystemProxy : IFileSystemProxy, IFileSystemProxyForLoader + public class FileSystemProxyImpl : IFileSystemProxy, IFileSystemProxyForLoader { - private FileSystemProxyCore FsProxyCore { get; } + private FileSystemProxyCoreImpl FsProxyCore { get; } internal HorizonClient Hos { get; } public ulong CurrentProcess { get; private set; } @@ -27,7 +27,7 @@ namespace LibHac.FsSrv public FsPath SaveDataRootPath { get; } public bool AutoCreateSaveData { get; private set; } - internal FileSystemProxy(HorizonClient horizonClient, FileSystemProxyCore fsProxyCore) + internal FileSystemProxyImpl(HorizonClient horizonClient, FileSystemProxyCoreImpl fsProxyCore) { FsProxyCore = fsProxyCore; Hos = horizonClient; diff --git a/src/LibHac/FsSrv/FileSystemServer.cs b/src/LibHac/FsSrv/FileSystemServer.cs index c2a535e3..0fb886fb 100644 --- a/src/LibHac/FsSrv/FileSystemServer.cs +++ b/src/LibHac/FsSrv/FileSystemServer.cs @@ -12,7 +12,7 @@ namespace LibHac.FsSrv { internal const ulong SaveIndexerId = 0x8000000000000000; - private FileSystemProxyCore FsProxyCore { get; } + private FileSystemProxyCoreImpl FsProxyCore { get; } /// The client instance to be used for internal operations like save indexer access. public HorizonClient Hos { get; } @@ -42,12 +42,12 @@ namespace LibHac.FsSrv FileSystemProxyConfiguration fspConfig = InitializeFileSystemProxyConfiguration(config); - FsProxyCore = new FileSystemProxyCore(fspConfig, externalKeySet, config.DeviceOperator); + FsProxyCore = new FileSystemProxyCoreImpl(fspConfig, externalKeySet, config.DeviceOperator); FsProxyCore.SetSaveDataIndexerManager(new SaveDataIndexerManager(Hos.Fs, SaveIndexerId, new ArrayPoolMemoryResource(), new SdHandleManager(), false)); - FileSystemProxy fsProxy = GetFileSystemProxyServiceObject(); + FileSystemProxyImpl fsProxy = GetFileSystemProxyServiceObject(); fsProxy.SetCurrentProcess(Hos.Os.GetCurrentProcessId().Value).IgnoreResult(); fsProxy.CleanUpTemporaryStorage().IgnoreResult(); @@ -101,14 +101,14 @@ namespace LibHac.FsSrv return fspConfig; } - private FileSystemProxy GetFileSystemProxyServiceObject() + private FileSystemProxyImpl GetFileSystemProxyServiceObject() { - return new FileSystemProxy(Hos, FsProxyCore); + return new FileSystemProxyImpl(Hos, FsProxyCore); } - private FileSystemProxy GetFileSystemProxyForLoaderServiceObject() + private FileSystemProxyImpl GetFileSystemProxyForLoaderServiceObject() { - return new FileSystemProxy(Hos, FsProxyCore); + return new FileSystemProxyImpl(Hos, FsProxyCore); } private ProgramRegistryImpl GetProgramRegistryServiceObject() diff --git a/src/LibHac/FsSrv/Impl/MultiCommitManager.cs b/src/LibHac/FsSrv/Impl/MultiCommitManager.cs index ea44f8e1..39b748bf 100644 --- a/src/LibHac/FsSrv/Impl/MultiCommitManager.cs +++ b/src/LibHac/FsSrv/Impl/MultiCommitManager.cs @@ -25,11 +25,11 @@ namespace LibHac.FsSrv.Impl private static readonly object Locker = new object(); - private FileSystemProxy FsProxy { get; } + private FileSystemProxyImpl FsProxy { get; } private List FileSystems { get; } = new List(MaxFileSystemCount); private long CommitCount { get; set; } - public MultiCommitManager(FileSystemProxy fsProxy) + public MultiCommitManager(FileSystemProxyImpl fsProxy) { FsProxy = fsProxy; }