Loader: Add VirtualDirectoryPtr::CreateSubdirectory

Author: N3xoX1

src/nxemu-loader/core/file_sys/vfs/vfs_types.cpp

@@ -11,6 +11,20 @@ VirtualDirectoryPtr::~VirtualDirectoryPtr()
 {
 }
 
+IVirtualDirectory * VirtualDirectoryPtr::CreateSubdirectory(const char * path) const
+{
+    if (m_directory.get() == nullptr)
+    {
+        return nullptr;
+    }
+    FileSys::VirtualDir dir = m_directory->CreateSubdirectory(path);
+    if (dir.get() == nullptr)
+    {
+        return nullptr;
+    }
+    return std::make_unique<VirtualDirectoryPtr>(dir).release();
+}
+
 IVirtualDirectory * VirtualDirectoryPtr::GetDirectoryRelative(const char * path) const
 {
     if (m_directory.get() == nullptr)

src/nxemu-loader/core/file_sys/vfs/vfs_types.h

@@ -45,6 +45,7 @@ class VirtualDirectoryPtr :
     operator bool() const;
 
     // IVirtualDirectory
+    IVirtualDirectory * CreateSubdirectory(const char * path) const override;
     IVirtualDirectory * GetDirectoryRelative(const char * path) const override;
     IVirtualDirectory * GetSubdirectory(const char * name) const override;
     IVirtualFile * CreateFile(const char * name) const override;

src/nxemu-module-spec/base.h

@@ -16,7 +16,7 @@
 
 enum
 {
-    MODULE_LOADER_SPECS_VERSION = 0x0109,
+    MODULE_LOADER_SPECS_VERSION = 0x010A,
     MODULE_VIDEO_SPECS_VERSION = 0x010C,
     MODULE_CPU_SPECS_VERSION = 0x0105,
     MODULE_OPERATING_SYSTEM_SPECS_VERSION = 0x010A,

src/nxemu-module-spec/system_loader.h

@@ -155,6 +155,7 @@ __interface IVirtualFile;
 
 __interface IVirtualDirectory
 {
+    IVirtualDirectory * CreateSubdirectory(const char* path) const = 0;
     IVirtualDirectory * GetDirectoryRelative(const char * path) const = 0;
     IVirtualDirectory * GetSubdirectory(const char* name) const = 0;
     IVirtualFile * CreateFile(const char* name) const = 0;

src/nxemu-os/core/file_sys/fsa/fs_i_filesystem.h

@@ -61,6 +61,10 @@ class IFileSystem {
         R_RETURN(this->DoRenameDirectory(old_path, new_path));
     }
 
+    Result GetEntryType(DirectoryEntryType* out, const Path& path) {
+        R_RETURN(this->DoGetEntryType(out, path));
+    }
+
     Result OpenFile(IVirtualFile ** out_file, const Path& path, VirtualFileOpenMode mode) {
         R_UNLESS(out_file != nullptr, ResultNullptrArgument);
         R_UNLESS(((uint32_t)mode & (uint32_t)VirtualFileOpenMode::ReadWrite) != 0, ResultInvalidOpenMode);
@@ -118,8 +122,7 @@ class IFileSystem {
     }
 
     Result DoCreateDirectory(const Path& path) {
-        UNIMPLEMENTED();
-        R_SUCCEED();
+        R_RETURN(backend.CreateDirectory(path.GetString()));
     }
 
     Result DoDeleteDirectory(const Path& path) {
@@ -142,6 +145,10 @@ class IFileSystem {
         R_SUCCEED();
     }
 
+    Result DoGetEntryType(DirectoryEntryType* out, const Path& path) {
+        R_RETURN(backend.GetEntryType(out, path.GetString()));
+    }
+
     Result DoOpenFile(IVirtualFile ** out_file, const Path& path, VirtualFileOpenMode mode) {
         R_RETURN(backend.OpenFile(out_file, path.GetString(), mode));
     }

src/nxemu-os/core/hle/service/filesystem/filesystem.cpp

@@ -61,6 +61,26 @@ Result VfsDirectoryServiceWrapper::CreateFile(const std::string& path_, u64 size
     return ResultSuccess;
 }
 
+Result VfsDirectoryServiceWrapper::CreateDirectory(const std::string& path_) const {
+    std::string path(Common::FS::SanitizePath(path_));
+
+    // NOTE: This is inaccurate behavior. CreateDirectory is not recursive.
+    // CreateDirectory should return PathNotFound if the parent directory does not exist.
+    // This is here temporarily in order to have UMM "work" in the meantime.
+    // TODO (Morph): Remove this when a hardware test verifies the correct behavior.
+    const auto components = Common::FS::SplitPathComponents(path);
+    std::string relative_path;
+    for (const auto& component : components) {
+        relative_path = Common::FS::SanitizePath(fmt::format("{}/{}", relative_path, component));
+        auto new_dir = backing->CreateSubdirectory(relative_path.c_str());
+        if (new_dir == nullptr) {
+            // TODO(DarkLordZach): Find a better error code for this
+            return ResultUnknown;
+        }
+    }
+    return ResultSuccess;
+}
+
 Result VfsDirectoryServiceWrapper::OpenFile(IVirtualFile** out_file,
                                             const std::string& path_,
                                             VirtualFileOpenMode mode) const {

src/nxemu-os/core/hle/service/filesystem/fsp/fs_i_filesystem.cpp

@@ -54,8 +54,7 @@ Result IFileSystem::CreateDirectory(
     const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path) {
     LOG_DEBUG(Service_FS, "called. directory={}", path->str);
 
-    UNIMPLEMENTED();
-    R_SUCCEED();
+    R_RETURN(backend->CreateDirectory(FileSys::Path(path->str)));
 }
 
 Result IFileSystem::DeleteDirectory(
@@ -116,7 +115,10 @@ Result IFileSystem::GetEntryType(
     Out<u32> out_type, const InLargeData<FileSys::Sf::Path, BufferAttr_HipcPointer> path) {
     LOG_DEBUG(Service_FS, "called. file={}", path->str);
 
-    UNIMPLEMENTED();
+    FileSys::DirectoryEntryType vfs_entry_type{};
+    R_TRY(backend->GetEntryType(&vfs_entry_type, FileSys::Path(path->str)));
+
+    *out_type = static_cast<u32>(vfs_entry_type);
     R_SUCCEED();
 }
 

src/nxemu-os/core/hle/service/filesystem/fsp/fsp_srv.cpp

@@ -218,7 +218,7 @@ Result FSP_SRV::OpenSdCardFileSystem(OutInterface<IFileSystem> out_interface) {
     {
         R_RETURN(FileSys::ResultPortSdCardNoDevice);
     }
-    UNIMPLEMENTED();
+    *out_interface = std::make_shared<IFileSystem>(system, std::move(sdmc_dir), SizeGetter::FromStorageId(fsc, StorageId::SdCard));
     R_SUCCEED();
 }