dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: add migration for old QByteArray to base64

Browse source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2025-05-20 22:59:18 +03:00
parent 6177fa0148
commit 7e174f53af
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
3 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
launcher/minecraft/mod/ResourceFolderModel.cpp
View file

@ -1,5 +1,4 @@
#include "ResourceFolderModel.h" #include "ResourceFolderModel.h"
#include <qvariant.h>
#include <QMessageBox> #include <QMessageBox>
#include <QCoreApplication> #include <QCoreApplication>

40
launcher/settings/INIFile.cpp
View file

@ -50,7 +50,7 @@ INIFile::INIFile() {}
bool INIFile::saveFile(QString fileName) bool INIFile::saveFile(QString fileName)
{ {
if (!contains("ConfigVersion")) if (!contains("ConfigVersion"))
insert("ConfigVersion", "1.2"); insert("ConfigVersion", "1.3");
QSettings _settings_obj{ fileName, QSettings::Format::IniFormat }; QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
_settings_obj.setFallbacksEnabled(false); _settings_obj.setFallbacksEnabled(false);
_settings_obj.clear(); _settings_obj.clear();
@ -149,6 +149,14 @@ bool parseOldFileFormat(QIODevice& device, QSettings::SettingsMap& map)
return true; return true;
} }
QVariant migrateQByteArrayToBase64(QString key, QVariant value)
{
if (key.startsWith("WideBarVisibility_") || (key.startsWith("UI/") && key.endsWith("_Page/Columns"))) {
return value.toByteArray().toBase64();
}
return value;
}
bool INIFile::loadFile(QString fileName) bool INIFile::loadFile(QString fileName)
{ {
QSettings _settings_obj{ fileName, QSettings::Format::IniFormat }; QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
@ -168,22 +176,34 @@ bool INIFile::loadFile(QString fileName)
QSettings::SettingsMap map; QSettings::SettingsMap map;
parseOldFileFormat(file, map); parseOldFileFormat(file, map);
file.close(); file.close();
for (auto&& key : map.keys()) for (auto&& key : map.keys()) {
insert(key, map.value(key)); auto value = migrateQByteArrayToBase64(key, map.value(key));
insert("ConfigVersion", "1.2"); insert(key, value);
}
insert("ConfigVersion", "1.3");
} else if (_settings_obj.value("ConfigVersion").toString() == "1.1") { } else if (_settings_obj.value("ConfigVersion").toString() == "1.1") {
for (auto&& key : _settings_obj.allKeys()) { for (auto&& key : _settings_obj.allKeys()) {
if (auto valueStr = _settings_obj.value(key).toString(); auto value = migrateQByteArrayToBase64(key, _settings_obj.value(key));
if (auto valueStr = value.toString();
(valueStr.contains(QChar(';')) || valueStr.contains(QChar('=')) || valueStr.contains(QChar(','))) && (valueStr.contains(QChar(';')) || valueStr.contains(QChar('=')) || valueStr.contains(QChar(','))) &&
valueStr.endsWith("\"") && valueStr.startsWith("\"")) { valueStr.endsWith("\"") && valueStr.startsWith("\"")) {
insert(key, unquote(valueStr)); insert(key, unquote(valueStr));
} else } else {
insert(key, value);
}
}
insert("ConfigVersion", "1.3");
} else if (_settings_obj.value("ConfigVersion").toString() == "1.2") {
for (auto&& key : _settings_obj.allKeys()) {
auto value = migrateQByteArrayToBase64(key, _settings_obj.value(key));
insert(key, value);
}
insert("ConfigVersion", "1.3");
} else {
for (auto&& key : _settings_obj.allKeys()) {
insert(key, _settings_obj.value(key)); insert(key, _settings_obj.value(key));
} }
insert("ConfigVersion", "1.2"); }
} else
for (auto&& key : _settings_obj.allKeys())
insert(key, _settings_obj.value(key));
return true; return true;
} }

6
tests/INIFile_test.cpp
View file

@ -110,7 +110,7 @@ Wrapperommand=)";
f2.loadFile(fileName); f2.loadFile(fileName);
QCOMPARE(f2.get("PreLaunchCommand", "NOT SET").toString(), "\"$INST_JAVA\" -jar packwiz-installer-bootstrap.jar link"); QCOMPARE(f2.get("PreLaunchCommand", "NOT SET").toString(), "\"$INST_JAVA\" -jar packwiz-installer-bootstrap.jar link");
QCOMPARE(f2.get("Wrapperommand", "NOT SET").toString(), "\"$INST_JAVA\" -jar packwiz-installer-bootstrap.jar link ="); QCOMPARE(f2.get("Wrapperommand", "NOT SET").toString(), "\"$INST_JAVA\" -jar packwiz-installer-bootstrap.jar link =");
QCOMPARE(f2.get("ConfigVersion", "NOT SET").toString(), "1.2"); QCOMPARE(f2.get("ConfigVersion", "NOT SET").toString(), "1.3");
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
FS::deletePath(fileName); FS::deletePath(fileName);
#endif #endif
@ -151,7 +151,7 @@ Wrapperommand=)";
f2.loadFile(fileName); f2.loadFile(fileName);
for (auto key : settings.allKeys()) for (auto key : settings.allKeys())
QCOMPARE(f2.get(key, "NOT SET").toString(), settings.value(key).toString()); QCOMPARE(f2.get(key, "NOT SET").toString(), settings.value(key).toString());
QCOMPARE(f2.get("ConfigVersion", "NOT SET").toString(), "1.2"); QCOMPARE(f2.get("ConfigVersion", "NOT SET").toString(), "1.3");
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
FS::deletePath(fileName); FS::deletePath(fileName);
#endif #endif
@ -185,7 +185,7 @@ PreLaunchCommand=)";
INIFile f1; INIFile f1;
f1.loadFile(fileName); f1.loadFile(fileName);
QCOMPARE(f1.get("PreLaunchCommand", "NOT SET").toString(), "env mesa=true"); QCOMPARE(f1.get("PreLaunchCommand", "NOT SET").toString(), "env mesa=true");
QCOMPARE(f1.get("ConfigVersion", "NOT SET").toString(), "1.2"); QCOMPARE(f1.get("ConfigVersion", "NOT SET").toString(), "1.3");
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
FS::deletePath(fileName); FS::deletePath(fileName);
#endif #endif