Skip to content

Migrate to new settings file to avoid compat issues #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Silarn merged 2 commits into from
May 6, 2026
Merged

Migrate to new settings file to avoid compat issues #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7549b
Migrate to new settings file to avoid compat issues
Silarn May 5, 2026
cdd0137
Restore IniFormat
Silarn May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/handlerstorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
static const QRegularExpression invalid_arguments("\"?%[0-9]+\"?");

HandlerStorage::HandlerStorage(const QString& storagePath, QObject* parent)
: QObject(parent), m_SettingsPath(storagePath + "/nxmhandler.ini")
: QObject(parent), m_SettingsPath(storagePath + "/downloadhandler.ini")
{
loadStore();
}
Expand Down
22 changes: 16 additions & 6 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ HandlerStorage* registerSchemaExecutable(const QDir& storagePath,
return storage;
}

QSettings resolveSettings(QDir baseDir)
{
if (!baseDir.exists("downloadhandler.ini") && baseDir.exists("nxmhandler.ini")) {
QFile oldSettings(baseDir.absoluteFilePath("nxmhandler.ini"));
oldSettings.copy(baseDir.absoluteFilePath("downloadhandler.ini"));
}
return QSettings(baseDir.absoluteFilePath("downloadhandler.ini"),
QSettings::IniFormat);
}

HandlerStorage* registerHandler(HandlerStorage* storage, const QString& schema,
bool forceReg)
{
Expand All @@ -125,21 +135,21 @@ HandlerStorage* registerHandler(HandlerStorage* storage, const QString& schema,

QDir handlerBaseDir = QFileInfo(handlerPath).absoluteDir();

QSettings settings(baseDir.absoluteFilePath("nxmhandler.ini"), QSettings::IniFormat);
bool noRegister = settings.value("noregister", false).toBool();
if (globalStorage.exists("nxmhandler.ini") &&
QSettings settings = resolveSettings(baseDir);
bool noRegister = settings.value("noregister", false).toBool();
if (globalStorage.exists("downloadhandler.ini") &&
handlerPath.endsWith("nxmhandler.exe", Qt::CaseInsensitive) &&
QFile::exists(handlerPath)) {
// global configuration avaible - use it
// global configuration available - use it
if (storage == nullptr)
storage = new HandlerStorage(globalStorage.path());
} else if (handlerBaseDir.exists("nxmhandler.ini") &&
} else if (handlerBaseDir.exists("downloadhandler.ini") &&
handlerPath.endsWith("nxmhandler.exe", Qt::CaseInsensitive) &&
QFile::exists(handlerPath)) {
// a portable installation is registered to handle links, use its
// configuration
if (storage == nullptr)
storage = new HandlerStorage(globalStorage.path());
storage = new HandlerStorage(handlerBaseDir.path());
if (forceReg && (QString::compare(QDir::toNativeSeparators(
QCoreApplication::applicationFilePath()),
handlerPath, Qt::CaseInsensitive))) {
Expand Down
Loading