LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-07 07:45:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: consolidate file I/O into IPlatformFileIO, delete PortableFileIO and PathHelper

Browse Source
This commit is contained in:
MatthewBeshay
2026-04-03 13:11:49 +11:00
parent e4d871cd2f
commit 98e23cfd4d
25 changed files with 220 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
targets/java/src/File.cpp
View File

@@ -8,8 +8,8 @@
#include <system_error>
#include <vector>
#include "console_helpers/PathHelper.h" // 4jcraft TODO
#include "console_helpers/StringHelpers.h" // 4jcraft TODO
#include "platform/PlatformServices.h"
#include "java/FileFilter.h"
const wchar_t File::pathSeparator = L'/';
@@ -21,8 +21,7 @@ namespace {
namespace fs = std::filesystem;
fs::path ToFilesystemPath(const std::wstring& path) {
const std::string nativePath = wstringtofilename(path);
return fs::path(nativePath);
return fs::path(path);
}
std::wstring ToFilename(const fs::path& path) {
@@ -65,11 +64,11 @@ File::File(const std::wstring& pathname) {
m_abstractPathName = fixedPath;
#if defined(__linux__)
std::string request = wstringtofilename(m_abstractPathName);
std::string request = std::filesystem::path(m_abstractPathName).string();
while (!request.empty() && request[0] == '/') request.erase(0, 1);
if (request.find("res/") == 0) request.erase(0, 4);
std::string exeDir = PathHelper::GetExecutableDirA();
std::string exeDir = PlatformFileIO.getBasePath().string();
std::string fileName = request;
size_t lastSlash = fileName.find_last_of('/');
if (lastSlash != std::string::npos)
@@ -85,11 +84,11 @@ File::File(const std::wstring& pathname) {
for (const char* base : bases) {
std::string tryFull = exeDir + base + request;
std::string tryFile = exeDir + base + fileName;
if (std::filesystem::exists(tryFull)) {
if (PlatformFileIO.exists(tryFull)) {
m_abstractPathName = convStringToWstring(tryFull);
return;
}
if (std::filesystem::exists(tryFile)) {
if (PlatformFileIO.exists(tryFile)) {
m_abstractPathName = convStringToWstring(tryFile);
return;
}
@@ -97,7 +96,7 @@ File::File(const std::wstring& pathname) {
#endif
#ifdef _WINDOWS64
std::string path = wstringtofilename(m_abstractPathName);
std::string path = std::filesystem::path(m_abstractPathName).string();
std::string finalPath = StorageManager.GetMountedPath(path.c_str());
if (finalPath.size() == 0) finalPath = path;
m_abstractPathName = convStringToWstring(finalPath);