archive_backend: Minor changes to match Switch IFileSystem.

This commit is contained in:
bunnei 2018-01-19 22:08:21 -05:00
parent 2f71a32363
commit 7988f02489
5 changed files with 26 additions and 26 deletions

View file

@ -81,13 +81,12 @@ public:
virtual std::string GetName() const = 0; virtual std::string GetName() const = 0;
/** /**
* Open a file specified by its path, using the specified mode * Create a file specified by its path
* @param path Path relative to the archive * @param path Path relative to the Archive
* @param mode Mode to open the file with * @param size The size of the new file, filled with zeroes
* @return Opened file, or error code * @return Result of the operation
*/ */
virtual ResultVal<std::unique_ptr<FileBackend>> OpenFile(const Path& path, virtual ResultCode CreateFile(const Path& path, u64 size) const = 0;
const Mode& mode) const = 0;
/** /**
* Delete a file specified by its path * Delete a file specified by its path
@ -97,12 +96,11 @@ public:
virtual ResultCode DeleteFile(const Path& path) const = 0; virtual ResultCode DeleteFile(const Path& path) const = 0;
/** /**
* Rename a File specified by its path * Create a directory specified by its path
* @param src_path Source path relative to the archive * @param path Path relative to the archive
* @param dest_path Destination path relative to the archive
* @return Result of the operation * @return Result of the operation
*/ */
virtual ResultCode RenameFile(const Path& src_path, const Path& dest_path) const = 0; virtual ResultCode CreateDirectory(const Path& path) const = 0;
/** /**
* Delete a directory specified by its path * Delete a directory specified by its path
@ -119,19 +117,12 @@ public:
virtual ResultCode DeleteDirectoryRecursively(const Path& path) const = 0; virtual ResultCode DeleteDirectoryRecursively(const Path& path) const = 0;
/** /**
* Create a file specified by its path * Rename a File specified by its path
* @param path Path relative to the Archive * @param src_path Source path relative to the archive
* @param size The size of the new file, filled with zeroes * @param dest_path Destination path relative to the archive
* @return Result of the operation * @return Result of the operation
*/ */
virtual ResultCode CreateFile(const Path& path, u64 size) const = 0; virtual ResultCode RenameFile(const Path& src_path, const Path& dest_path) const = 0;
/**
* Create a directory specified by its path
* @param path Path relative to the archive
* @return Result of the operation
*/
virtual ResultCode CreateDirectory(const Path& path) const = 0;
/** /**
* Rename a Directory specified by its path * Rename a Directory specified by its path
@ -141,6 +132,15 @@ public:
*/ */
virtual ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const = 0; virtual ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const = 0;
/**
* Open a file specified by its path, using the specified mode
* @param path Path relative to the archive
* @param mode Mode to open the file with
* @return Opened file, or error code
*/
virtual ResultVal<std::unique_ptr<FileBackend>> OpenFile(const Path& path,
const Mode& mode) const = 0;
/** /**
* Open a directory specified by its path * Open a directory specified by its path
* @param path Path relative to the archive * @param path Path relative to the archive
@ -152,7 +152,7 @@ public:
* Get the free space * Get the free space
* @return The number of free bytes in the archive * @return The number of free bytes in the archive
*/ */
virtual u64 GetFreeBytes() const = 0; virtual u64 GetFreeSpaceSize() const = 0;
}; };
class ArchiveFactory : NonCopyable { class ArchiveFactory : NonCopyable {

View file

@ -73,7 +73,7 @@ ResultVal<std::unique_ptr<DirectoryBackend>> ROMFSArchive::OpenDirectory(const P
return MakeResult<std::unique_ptr<DirectoryBackend>>(std::make_unique<ROMFSDirectory>()); return MakeResult<std::unique_ptr<DirectoryBackend>>(std::make_unique<ROMFSDirectory>());
} }
u64 ROMFSArchive::GetFreeBytes() const { u64 ROMFSArchive::GetFreeSpaceSize() const {
LOG_WARNING(Service_FS, "Attempted to get the free space in an ROMFS archive"); LOG_WARNING(Service_FS, "Attempted to get the free space in an ROMFS archive");
return 0; return 0;
} }

View file

@ -39,7 +39,7 @@ public:
ResultCode CreateDirectory(const Path& path) const override; ResultCode CreateDirectory(const Path& path) const override;
ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const override; ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const override;
ResultVal<std::unique_ptr<DirectoryBackend>> OpenDirectory(const Path& path) const override; ResultVal<std::unique_ptr<DirectoryBackend>> OpenDirectory(const Path& path) const override;
u64 GetFreeBytes() const override; u64 GetFreeSpaceSize() const override;
protected: protected:
std::shared_ptr<FileUtil::IOFile> romfs_file; std::shared_ptr<FileUtil::IOFile> romfs_file;

View file

@ -322,7 +322,7 @@ ResultVal<std::unique_ptr<DirectoryBackend>> SaveDataArchive::OpenDirectory(
return MakeResult<std::unique_ptr<DirectoryBackend>>(std::move(directory)); return MakeResult<std::unique_ptr<DirectoryBackend>>(std::move(directory));
} }
u64 SaveDataArchive::GetFreeBytes() const { u64 SaveDataArchive::GetFreeSpaceSize() const {
// TODO: Stubbed to return 1GiB // TODO: Stubbed to return 1GiB
return 1024 * 1024 * 1024; return 1024 * 1024 * 1024;
} }

View file

@ -34,7 +34,7 @@ public:
ResultCode CreateDirectory(const Path& path) const override; ResultCode CreateDirectory(const Path& path) const override;
ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const override; ResultCode RenameDirectory(const Path& src_path, const Path& dest_path) const override;
ResultVal<std::unique_ptr<DirectoryBackend>> OpenDirectory(const Path& path) const override; ResultVal<std::unique_ptr<DirectoryBackend>> OpenDirectory(const Path& path) const override;
u64 GetFreeBytes() const override; u64 GetFreeSpaceSize() const override;
protected: protected:
std::string mount_point; std::string mount_point;