chore: add migration for old QByteArray to base64
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
6177fa0148
commit
7e174f53af
3 changed files with 33 additions and 14 deletions
|
@ -1,5 +1,4 @@
|
|||
#include "ResourceFolderModel.h"
|
||||
#include <qvariant.h>
|
||||
#include <QMessageBox>
|
||||
|
||||
#include <QCoreApplication>
|
||||
|
|
|
@ -50,7 +50,7 @@ INIFile::INIFile() {}
|
|||
bool INIFile::saveFile(QString fileName)
|
||||
{
|
||||
if (!contains("ConfigVersion"))
|
||||
insert("ConfigVersion", "1.2");
|
||||
insert("ConfigVersion", "1.3");
|
||||
QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
|
||||
_settings_obj.setFallbacksEnabled(false);
|
||||
_settings_obj.clear();
|
||||
|
@ -149,6 +149,14 @@ bool parseOldFileFormat(QIODevice& device, QSettings::SettingsMap& map)
|
|||
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)
|
||||
{
|
||||
QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
|
||||
|
@ -168,22 +176,34 @@ bool INIFile::loadFile(QString fileName)
|
|||
QSettings::SettingsMap map;
|
||||
parseOldFileFormat(file, map);
|
||||
file.close();
|
||||
for (auto&& key : map.keys())
|
||||
insert(key, map.value(key));
|
||||
insert("ConfigVersion", "1.2");
|
||||
for (auto&& key : map.keys()) {
|
||||
auto value = migrateQByteArrayToBase64(key, map.value(key));
|
||||
insert(key, value);
|
||||
}
|
||||
insert("ConfigVersion", "1.3");
|
||||
} else if (_settings_obj.value("ConfigVersion").toString() == "1.1") {
|
||||
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.endsWith("\"") && valueStr.startsWith("\"")) {
|
||||
insert(key, unquote(valueStr));
|
||||
} else
|
||||
insert(key, _settings_obj.value(key));
|
||||
} else {
|
||||
insert(key, value);
|
||||
}
|
||||
}
|
||||
insert("ConfigVersion", "1.2");
|
||||
} else
|
||||
for (auto&& key : _settings_obj.allKeys())
|
||||
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));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue