Merge pull request #27 from hjaltisan/journeyId

JourneyId in the installer
ccpgames · Dec 1, 2020 · 186c985 · 186c985
2 parents f58606e + 928def0
commit 186c985
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 19 deletions.
diff --git a/src/libs/installer/eve_launcher/application.pb.cc b/src/libs/installer/eve_launcher/application.pb.cc
diff --git a/src/libs/installer/eve_launcher/application.pb.h b/src/libs/installer/eve_launcher/application.pb.h
diff --git a/src/libs/installer/eventlogger.cpp b/src/libs/installer/eventlogger.cpp
@@ -10,6 +10,7 @@
 #include <QRandomGenerator>
 #include <QUuid>
 #include <QDebug>
+#include <QRegularExpression>
 
 EventLogger::EventLogger()
 {
@@ -37,6 +38,32 @@ EventLogger::EventLogger()
     m_session = QString(QLatin1String("ls")) + QString(QLatin1String(hasher.result().toHex()));
 
     m_httpThreadController = new HttpThreadController();
+
+    // Get the journeyId from the installer filename
+    QUuid journeyId;
+    QString appName = QInstaller::getInstallerFileName().split(QLatin1String("/")).last();
+    if (appName.length() > 35)
+    {
+        QString pattern = QLatin1String("[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}");
+        QRegularExpression re(pattern, QRegularExpression::CaseInsensitiveOption);
+        QRegularExpressionMatch match = re.match(appName);
+        if (match.hasMatch()) {
+           qDebug() << "framework | EventLogger::EventLogger | JourneyId found in filename:" << match.captured(0);
+           journeyId = QUuid::fromString(match.captured(0));
+           qDebug() << "framework | EventLogger::EventLogger | JourneyId:" << journeyId.toString(QUuid::WithoutBraces);
+        }
+    }
+
+    // If journey Id was found, or we weren't able to create a QUuid from it, we create a new one instead
+    if (journeyId.isNull())
+    {
+        qDebug() << "framework | EventLogger::EventLogger | No JourneyId provided, one will be created instead";
+        journeyId = QUuid::createUuid();
+        qDebug() << "framework | EventLogger::EventLogger | JourneyId:" << journeyId.toString(QUuid::WithoutBraces);
+    }
+
+    m_journeyId = journeyId.toRfc4122();
+    QInstaller::setJourneyId(m_journeyId);
 }
 
 EventLogger::~EventLogger()
@@ -235,6 +262,9 @@ eve_launcher::application::EventMetadata* EventLogger::getEventMetadata()
         data->set_allocated_operating_system_uuid(new std::string(m_operatingSystemUuid.data(), size_t(m_operatingSystemUuid.size())));
     }
 
+    // Set the journey
+    data->set_allocated_journey(new std::string(m_journeyId.data(), size_t(m_journeyId.size())));
+
     return data;
 }
 

diff --git a/src/libs/installer/eventlogger.h b/src/libs/installer/eventlogger.h
@@ -74,6 +74,7 @@ class EventLogger : QObject
     QString m_session;
     QByteArray m_sessionId;
     QByteArray m_operatingSystemUuid;
+    QByteArray m_journeyId;
     QPointer<HttpThreadController> m_httpThreadController;
 
     explicit EventLogger();

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
@@ -41,6 +41,7 @@
 #include "productkeycheck.h"
 #include "repositorycategory.h"
 #include "componentselectionpage_p.h"
+#include "qsettingswrapper.h"
 
 #include "sysinfo.h"
 
@@ -3530,6 +3531,15 @@ void PerformInstallationPage::installationStarted()
 void PerformInstallationPage::installationFinished()
 {
     m_performInstallationForm->stopUpdateProgress();
+
+    // Store the journey Id in registry
+    qDebug() << "framework | PerformInstallationPage::installationFinished | Storing JourneyId to registry";
+    QByteArray journeyId = QInstaller::getJourneyId();
+    QString path = QLatin1String("HKEY_CURRENT_USER\\SOFTWARE\\CCP\\EVE\\");
+    QSettingsWrapper settings(path, QSettingsWrapper::NativeFormat);
+    settings.setValue(QLatin1String("InstallerJourneyId"), journeyId);
+    qDebug() << "framework | PerformInstallationPage::installationFinished | JourneyId stored to registry";
+
     if (!isAutoSwitching()) {
         m_performInstallationForm->scrollDetailsToTheEnd();
         m_performInstallationForm->setDetailsButtonEnabled(false);

diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp
@@ -273,6 +273,30 @@ QString QInstaller::getProvidedTelemetryEndpoint()
     return telemetryUrl;
 }
 
+static QString installerFileName;
+
+void QInstaller::setInstallerFileName(const QString& fileName)
+{
+    installerFileName = fileName;
+}
+
+QString QInstaller::getInstallerFileName()
+{
+    return installerFileName;
+}
+
+static QByteArray journeyId;
+
+void QInstaller::setJourneyId(const QByteArray& id)
+{
+    journeyId = id;
+}
+
+QByteArray QInstaller::getJourneyId()
+{
+    return journeyId;
+}
+
 std::ostream &QInstaller::operator<<(std::ostream &os, const QString &string)
 {
     return os << qPrintable(string);