CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use std::wstring for Windows filenames

Browse Source 
Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-08-07 14:30:38 -03:00
parent c496ad1237
commit ee0fb2d0e0
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
launcher/FileSystem.cpp
View File

@ -61,6 +61,22 @@
#include <filesystem> #include <filesystem>
#if defined Q_OS_WIN32
std::wstring toStdString(QString s)
{
return s.toStdWString();
}
#else
std::string toStdString(QString s)
{
return s.toStdString();
}
#endif
namespace FS { namespace FS {
void ensureExists(const QDir& dir) void ensureExists(const QDir& dir)
@ -166,7 +182,7 @@ bool copy::operator()(const QString& offset)
auto dst_path = PathCombine(dst, relative_path); auto dst_path = PathCombine(dst, relative_path);
ensureFilePathExists(dst_path); ensureFilePathExists(dst_path);
std::filesystem::copy(src_path.toStdString(), dst_path.toStdString(), opt, err); std::filesystem::copy(toStdString(src_path), toStdString(dst_path), opt, err);
if (err) { if (err) {
qWarning() << "Failed to copy files:" << QString::fromStdString(err.message()); qWarning() << "Failed to copy files:" << QString::fromStdString(err.message());
qDebug() << "Source file:" << src_path; qDebug() << "Source file:" << src_path;
@ -181,7 +197,7 @@ bool deletePath(QString path)
{ {
std::error_code err; std::error_code err;
std::filesystem::remove_all(path.toStdString(), err); std::filesystem::remove_all(toStdString(path), err);
if (err) { if (err) {
qWarning() << "Failed to remove files:" << QString::fromStdString(err.message()); qWarning() << "Failed to remove files:" << QString::fromStdString(err.message());
@ -368,7 +384,7 @@ bool overrideFolder(QString overwritten_path, QString override_path)
std::error_code err; std::error_code err;
std::filesystem::copy_options opt = copy_opts::recursive | copy_opts::overwrite_existing; std::filesystem::copy_options opt = copy_opts::recursive | copy_opts::overwrite_existing;
std::filesystem::copy(override_path.toStdString(), overwritten_path.toStdString(), opt, err); std::filesystem::copy(toStdString(override_path), toStdString(overwritten_path), opt, err);
if (err) { if (err) {
qCritical() << QString("Failed to apply override from %1 to %2").arg(override_path, overwritten_path); qCritical() << QString("Failed to apply override from %1 to %2").arg(override_path, overwritten_path);