Add simple lock file per configuration

Make use of lock files in configuration directory
for preventing multiple instances of Mirage from
being running at the same time, at least for a
single configuration.
Running multiple instances of Mirage is known to
cause encryption errors in one or more instances.
This commit is contained in:
vslg 2020-09-04 14:09:58 -03:00
parent bbcdcde53f
commit 6061b2f061
2 changed files with 52 additions and 3 deletions

View File

@ -109,10 +109,12 @@ ApplicationWindow {
tooltip: qsTr("Mirage") tooltip: qsTr("Mirage")
icon.source: `../icons/${iconPack}/tray-icon.png` icon.source: `../icons/${iconPack}/tray-icon.png`
onActivated: window.show()
menu: Menu { menu: Menu {
MenuItem { MenuItem {
text: qsTr("Quit") text: qsTr("Quit")
onTriggered: window.close() onTriggered: window.hide()
} }
} }
} }

View File

@ -12,6 +12,10 @@
#include <QQuickStyle> #include <QQuickStyle>
#include <QFontDatabase> #include <QFontDatabase>
#include <QDateTime> #include <QDateTime>
#include <QStandardPaths>
#include <QDir>
#include <QFile>
#include <QLockFile>
#include <signal.h> #include <signal.h>
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
@ -23,6 +27,9 @@
#include "clipboard_image_provider.h" #include "clipboard_image_provider.h"
QLockFile *lockFile = nullptr;
void loggingHandler( void loggingHandler(
QtMsgType type, QtMsgType type,
const QMessageLogContext &context, const QMessageLogContext &context,
@ -86,6 +93,42 @@ void onExitSignal(int signum) {
} }
bool setLockFile() {
QString customConfigDir(qEnvironmentVariable("MIRAGE_CONFIG_DIR"));
QDir configDir(
customConfigDir.isEmpty() ?
QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)
+ "/" + QCoreApplication::applicationName() :
customConfigDir
);
if (! configDir.mkpath(".")) {
qFatal("Could not create config file.");
exit(EXIT_FAILURE);
}
lockFile = new QLockFile(configDir.absoluteFilePath(".lock"));
lockFile->tryLock(0);
switch (lockFile->error()) {
case QLockFile::NoError: {
return true;
}
case QLockFile::LockFailedError: {
qWarning("Opening already running Mirage instance.");
QFile showFile(configDir.absoluteFilePath(".show"));
showFile.open(QIODevice::WriteOnly);
showFile.close();
return false;
}
default: {
qFatal("Cannot create lock file: no permission or unknown error.");
exit(EXIT_FAILURE);
}
}
}
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
qInstallMessageHandler(loggingHandler); qInstallMessageHandler(loggingHandler);
@ -95,6 +138,8 @@ int main(int argc, char *argv[]) {
QApplication::setApplicationDisplayName("Mirage"); QApplication::setApplicationDisplayName("Mirage");
QApplication::setApplicationVersion("0.6.2"); QApplication::setApplicationVersion("0.6.2");
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
if (! setLockFile()) return EXIT_SUCCESS;
QApplication app(argc, argv); QApplication app(argc, argv);
// Register handlers for quit signals, e.g. SIGINT/Ctrl-C in unix terminals // Register handlers for quit signals, e.g. SIGINT/Ctrl-C in unix terminals
@ -197,6 +242,8 @@ int main(int argc, char *argv[]) {
component.create(objectContext); component.create(objectContext);
// Finally, execute the app. Return its system exit code when it exits. // Finally, execute the app. Return its exit code after clearing the lock.
return app.exec(); int exit_code = app.exec();
delete lockFile;
return exit_code;
} }