Rewrite runningCheck and print config before running

Author: lsk-china

configuration.cpp

@@ -83,3 +83,15 @@ const QSize &configuration::getWidgetSize() const {
 void configuration::setWidgetSize(const QSize &widgetSize) {
     configuration::widgetSize = widgetSize;
 }
+
+QString configuration::toString() {
+    QString result = "";
+    result += QString("HideOnHover: ") + B2S(this->isHideOnHover()) + '\n';
+    result += QString("WidgetOnLeft: ") + B2S(this->isWidgetOnLeft()) + '\n';
+    result += QString("MouseSensibility: ") + N2S(this->getMouseSensibility()) + '\n';
+    result += QString("WidgetHeight: ") + N2S(this->getWidgetSize().height()) + '\n';
+    result += QString("WidgetWidth: ") + N2S(this->getWidgetSize().width()) + '\n';
+    result += QString("ModelName: ") + this->getModelName() + '\n';
+    result += QString("ResourceDir: ") + this->getResourceDir() + '\n';
+    return result;
+}

configuration.h

@@ -9,6 +9,9 @@
 #include <QApplication>
 #include <QSize>
 
+#define B2S(boolean) QString(boolean ? "true" : "false")
+#define N2S(number) QString("%1").arg(number)
+
 class configuration {
 public:
     configuration();
@@ -40,6 +43,8 @@ class configuration {
 
     void setWidgetSize(const QSize &widgetSize);
 
+    QString toString();
+
 private:
     bool hideOnHover;
     QString resourceDir;

main.cpp

@@ -2,24 +2,18 @@
 #include "runningCheck.h"
 #include "configuration.h"
 #include <QApplication>
-#include <string.h>
 
 int main(int argc, char *argv[]) {
     QApplication a(argc, argv);
+    configuration config;
+    Widget w(config);
+    QObject::connect(&a, &QApplication::aboutToQuit, &w, []() {
+        deleteLock();
+    });
     if (check()) {
         std::perror("already running!");
         return -1;
     }
-    configuration config;
-    Widget w(config);
-//    cout << "argc: " << argc << endl;
-//    if (argc == 3) {
-//        w.setModel(argv[1], argv[2]);
-//    }
-//    if (argc == 4) {
-//        w.setModel(argv[1], argv[2]);
-//        w.setWidgetPosition(strcmp("left", argv[3]) == 0);
-//    }
     w.show();
     return QApplication::exec();
 }

runningCheck.cpp

@@ -17,34 +17,51 @@ static QByteArray calcHash(QString procDir) {
     return hash.result();
 }
 
-static bool isDigit(QString s) {
-    for (auto i : s) {
-        if (!isdigit(i.toLatin1())) {
+bool check() {
+    QFile lockFile = QFile(LOCK_FILE);
+    if (! lockFile.exists()) {
+        if (!lockFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::NewOnly)) {
+            QMessageBox::critical(nullptr, "Error", "Cannot open lock file!");
+            QCoreApplication::exit(1);
+        }
+        lockFile.write(QByteArray().fromStdString(std::to_string(THIS_PID)));
+        lockFile.close();
+        return false;
+    } else {
+        // if the lock file exists, there are 2 situations:
+        //  1. another process is running
+        //  2. another process didn't exit properly and didn't delete the lock file
+        // So we need to check if the pid in the lock file is exists and represents a QDesktopPet instance.
+        if (!lockFile.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate)) {
+            QMessageBox::critical(nullptr, "Error", "Cannot open lock file!");
+            QCoreApplication::exit(1);
+        }
+        int pid = lockFile.readLine().toInt();
+        QDir processDir = QDir(QString("/proc/$1").arg(pid));
+        if (! processDir.exists()) {
+            // situation 2 and the process doesn't exist. we just need to update the pid
+            lockFile.write(QByteArray().fromStdString(std::to_string(THIS_PID)));
+            lockFile.close();
             return false;
+        } else {
+            // check if the process is a QDesktopPet instance
+            QDir thisProcess = QDir(QString("/proc/$1").arg(THIS_PID));
+            if (calcHash(thisProcess.absolutePath()) == calcHash(processDir.absolutePath())) {
+                // situation 1, process exists and process is a QDesktopPet instance
+                lockFile.close();
+                return true;
+            } else {
+                // situation 2 and the process is not a QDesktopPet instance
+                // update the pid and continue
+                lockFile.write(QByteArray().fromStdString(std::to_string(THIS_PID)));
+                lockFile.close();
+                return false;
+            }
         }
     }
-    return true;
 }
 
-bool check() {
-    qint64 selfPid = QCoreApplication::applicationPid();
-    std::cout << selfPid << std::endl;
-    QString procDir = "/proc/";
-    QString selfProcDir = procDir + QString::number(selfPid);
-    QByteArray selfMD5 = calcHash(selfProcDir);
-    QDirIterator iter("/proc", QDirIterator::Subdirectories);
-    while (iter.hasNext()) {
-        QString aProcDir = iter.next();
-        if (isDigit(aProcDir.right(aProcDir.lastIndexOf('/')))) {
-            int pid = aProcDir.right(aProcDir.lastIndexOf('/')).toInt();
-            if (pid > 50 && pid < selfPid) {
-                QByteArray procHash = calcHash(aProcDir);
-                if (procHash == selfMD5) {
-                    std::cout<< aProcDir.toStdString() << std::endl;
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
+void deleteLock() {
+    QFile lockFile = QFile(LOCK_FILE);
+    lockFile.remove();
 }

runningCheck.h

@@ -10,9 +10,14 @@
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QDirIterator>
+#include <QMessageBox>
+#include <QTextStream>
+
+#define LOCK_FILE QDir::homePath() + "/.pet_running"
+#define THIS_PID QCoreApplication::applicationPid()
 
-static QByteArray calcHash(QString);
-static bool isDigit(QString s);
 bool check();
+void deleteLock();
+static QByteArray calcHash(QString);
 
 #endif //QDESKTOPPET_2_CMAKE_RUNNINGCHECK_H

widget.cpp

@@ -91,14 +91,13 @@ Widget::~Widget() {
 }
 
 void Widget::live2dInitialized(QLive2dWidget *wid) {
-    cout << "Starting with model " << this->currentConfiguration.getModelName().toStdString() << " in " << this->currentConfiguration.getResourceDir().toStdString() << "." << endl;
+    cout << "Starting Live2D Widget with configuration: " << endl;
+    cout << QTS(this->currentConfiguration.toString());
     wid->setResDir(this->currentConfiguration.getResourceDir().toStdString());
     wid->setModel(this->currentConfiguration.getModelName().toStdString());
     this->initialized = true;
 }
 void Widget::mouseEvent(QPoint rel, QPoint raw) {
-    //cout<<"rel: "<<rel.x()<<", "<<rel.y()<<endl;
-    //cout<<"abs: "<<raw.x()<<", "<<raw.y()<<endl;
     widget->mouseMove(rel);
     //widget->mouseMove(rel);
     if (this->currentConfiguration.isHideOnHover()) {