refactor: Move ini to use QSettings && drop get/setList functions
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
@ -1,7 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
/*
|
||||
* PolyMC - Minecraft Launcher
|
||||
* Prism Launcher - Minecraft Launcher
|
||||
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
|
||||
* Copyright (C) 2023 flowln <flowlnlnln@gmail.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -42,132 +43,51 @@
|
||||
#include <QSaveFile>
|
||||
#include <QDebug>
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
INIFile::INIFile()
|
||||
{
|
||||
}
|
||||
|
||||
QString INIFile::unescape(QString orig)
|
||||
{
|
||||
QString out;
|
||||
QChar prev = QChar::Null;
|
||||
for(auto c: orig)
|
||||
{
|
||||
if(prev == '\\')
|
||||
{
|
||||
if(c == 'n')
|
||||
out += '\n';
|
||||
else if(c == 't')
|
||||
out += '\t';
|
||||
else if(c == '#')
|
||||
out += '#';
|
||||
else
|
||||
out += c;
|
||||
prev = QChar::Null;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(c == '\\')
|
||||
{
|
||||
prev = c;
|
||||
continue;
|
||||
}
|
||||
out += c;
|
||||
prev = QChar::Null;
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
QString INIFile::escape(QString orig)
|
||||
{
|
||||
QString out;
|
||||
for(auto c: orig)
|
||||
{
|
||||
if(c == '\n')
|
||||
out += "\\n";
|
||||
else if (c == '\t')
|
||||
out += "\\t";
|
||||
else if(c == '\\')
|
||||
out += "\\\\";
|
||||
else if(c == '#')
|
||||
out += "\\#";
|
||||
else
|
||||
out += c;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
bool INIFile::saveFile(QString fileName)
|
||||
{
|
||||
QByteArray outArray;
|
||||
for (Iterator iter = begin(); iter != end(); iter++)
|
||||
{
|
||||
QString value = iter.value().toString();
|
||||
value = escape(value);
|
||||
outArray.append(iter.key().toUtf8());
|
||||
outArray.append('=');
|
||||
outArray.append(value.toUtf8());
|
||||
outArray.append('\n');
|
||||
}
|
||||
QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
|
||||
_settings_obj.setFallbacksEnabled(false);
|
||||
|
||||
for (Iterator iter = begin(); iter != end(); iter++)
|
||||
_settings_obj.setValue(iter.key(), iter.value());
|
||||
|
||||
_settings_obj.sync();
|
||||
|
||||
if (auto status = _settings_obj.status(); status != QSettings::Status::NoError) {
|
||||
// Shouldn't be possible!
|
||||
Q_ASSERT(status != QSettings::Status::FormatError);
|
||||
|
||||
if (status == QSettings::Status::AccessError)
|
||||
qCritical() << "An access error occurred (e.g. trying to write to a read-only file).";
|
||||
|
||||
try
|
||||
{
|
||||
FS::write(fileName, outArray);
|
||||
}
|
||||
catch (const Exception &e)
|
||||
{
|
||||
qCritical() << e.what();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool INIFile::loadFile(QString fileName)
|
||||
{
|
||||
QFile file(fileName);
|
||||
if (!file.open(QIODevice::ReadOnly))
|
||||
QSettings _settings_obj{ fileName, QSettings::Format::IniFormat };
|
||||
_settings_obj.setFallbacksEnabled(false);
|
||||
|
||||
if (auto status = _settings_obj.status(); status != QSettings::Status::NoError) {
|
||||
if (status == QSettings::Status::AccessError)
|
||||
qCritical() << "An access error occurred (e.g. trying to write to a read-only file).";
|
||||
if (status == QSettings::Status::FormatError)
|
||||
qCritical() << "A format error occurred (e.g. loading a malformed INI file).";
|
||||
return false;
|
||||
bool success = loadFile(file.readAll());
|
||||
file.close();
|
||||
return success;
|
||||
}
|
||||
|
||||
bool INIFile::loadFile(QByteArray file)
|
||||
{
|
||||
QTextStream in(file);
|
||||
#if QT_VERSION <= QT_VERSION_CHECK(6, 0, 0)
|
||||
in.setCodec("UTF-8");
|
||||
#endif
|
||||
|
||||
QStringList lines = in.readAll().split('\n');
|
||||
for (int i = 0; i < lines.count(); i++)
|
||||
{
|
||||
QString &lineRaw = lines[i];
|
||||
// Ignore comments.
|
||||
int commentIndex = 0;
|
||||
QString line = lineRaw;
|
||||
// Search for comments until no more escaped # are available
|
||||
while((commentIndex = line.indexOf('#', commentIndex + 1)) != -1) {
|
||||
if(commentIndex > 0 && line.at(commentIndex - 1) == '\\') {
|
||||
continue;
|
||||
}
|
||||
line = line.left(lineRaw.indexOf('#')).trimmed();
|
||||
}
|
||||
|
||||
int eqPos = line.indexOf('=');
|
||||
if (eqPos == -1)
|
||||
continue;
|
||||
QString key = line.left(eqPos).trimmed();
|
||||
QString valueStr = line.right(line.length() - eqPos - 1).trimmed();
|
||||
|
||||
valueStr = unescape(valueStr);
|
||||
|
||||
QVariant value(valueStr);
|
||||
this->operator[](key) = value;
|
||||
}
|
||||
|
||||
for (auto&& key : _settings_obj.allKeys())
|
||||
insert(key, _settings_obj.value(key));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -184,20 +104,3 @@ void INIFile::set(QString key, QVariant val)
|
||||
this->operator[](key) = val;
|
||||
}
|
||||
|
||||
void INIFile::setList(QString key, QVariantList val)
|
||||
{
|
||||
QString stringList = QJsonDocument(QVariant(val).toJsonArray()).toJson(QJsonDocument::Compact);
|
||||
|
||||
this->operator[](key) = stringList;
|
||||
}
|
||||
|
||||
QVariantList INIFile::getList(QString key, QVariantList def) const
|
||||
{
|
||||
if (this->contains(key)) {
|
||||
auto src = this->operator[](key);
|
||||
|
||||
return QJsonDocument::fromJson(src.toByteArray()).toVariant().toList();
|
||||
}
|
||||
|
||||
return def;
|
||||
}
|
||||
|
Reference in New Issue
Block a user