From e7ae19da6e2fe7b031a8ef75575d216302ce2069 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Tue, 29 Apr 2025 15:12:07 -0400
Subject: [PATCH] Shove all the steam dir calculation into one function

---
 launcher/include/compatibilitytoolinstaller.h |  2 ++
 launcher/src/compatibilitytoolinstaller.cpp   | 25 +++++++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/launcher/include/compatibilitytoolinstaller.h b/launcher/include/compatibilitytoolinstaller.h
index 2595dd1..aa3576b 100644
--- a/launcher/include/compatibilitytoolinstaller.h
+++ b/launcher/include/compatibilitytoolinstaller.h
@@ -32,5 +32,7 @@ Q_SIGNALS:
     void isInstalledChanged();
 
 private:
+    QDir steamDir() const;
+
     LauncherCore &m_launcher;
 };
\ No newline at end of file
diff --git a/launcher/src/compatibilitytoolinstaller.cpp b/launcher/src/compatibilitytoolinstaller.cpp
index 706e6cf..bf4307b 100644
--- a/launcher/src/compatibilitytoolinstaller.cpp
+++ b/launcher/src/compatibilitytoolinstaller.cpp
@@ -16,9 +16,7 @@ CompatibilityToolInstaller::CompatibilityToolInstaller(LauncherCore &launcher, Q
 
 void CompatibilityToolInstaller::installCompatibilityTool()
 {
-    const QDir appDataDir = QStandardPaths::standardLocations(QStandardPaths::StandardLocation::HomeLocation)[0];
-    const QDir steamDir = appDataDir.absoluteFilePath(QStringLiteral(".steam"));
-    const QDir steamSteamDir = steamDir.absoluteFilePath(QStringLiteral("steam"));
+    const QDir steamSteamDir = steamDir();
     if (!steamSteamDir.exists()) {
         Q_EMIT error(i18n("Could not find a Steam installation."));
         return;
@@ -91,9 +89,7 @@ void CompatibilityToolInstaller::installCompatibilityTool()
 
 void CompatibilityToolInstaller::removeCompatibilityTool()
 {
-    const QDir appDataDir = QStandardPaths::standardLocations(QStandardPaths::StandardLocation::HomeLocation)[0];
-    const QDir steamDir = appDataDir.absoluteFilePath(QStringLiteral(".steam"));
-    const QDir steamSteamDir = steamDir.absoluteFilePath(QStringLiteral("steam"));
+    const QDir steamSteamDir = steamDir();
     if (!steamSteamDir.exists()) {
         Q_EMIT error(i18n("Could not find a Steam installation."));
         return;
@@ -114,24 +110,21 @@ void CompatibilityToolInstaller::removeCompatibilityTool()
 
 bool CompatibilityToolInstaller::isInstalled() const
 {
-    const QDir appDataDir = QStandardPaths::standardLocations(QStandardPaths::StandardLocation::HomeLocation)[0];
-    const QDir steamDir = appDataDir.absoluteFilePath(QStringLiteral(".steam"));
-    const QDir steamSteamDir = steamDir.absoluteFilePath(QStringLiteral("steam"));
-    if (!steamSteamDir.exists()) {
-        return false;
-    }
-
-    const QDir compatToolDir = steamSteamDir.absoluteFilePath(QStringLiteral("compatibilitytools.d"));
+    const QDir compatToolDir = steamDir().absoluteFilePath(QStringLiteral("compatibilitytools.d"));
     const QDir astraToolDir = compatToolDir.absoluteFilePath(QStringLiteral("astra"));
     return astraToolDir.exists();
 }
 
 bool CompatibilityToolInstaller::hasSteam() const
+{
+    return steamDir().exists();
+}
+
+QDir CompatibilityToolInstaller::steamDir() const
 {
     const QDir appDataDir = QStandardPaths::standardLocations(QStandardPaths::StandardLocation::HomeLocation)[0];
     const QDir steamDir = appDataDir.absoluteFilePath(QStringLiteral(".steam"));
-    const QDir steamSteamDir = steamDir.absoluteFilePath(QStringLiteral("steam"));
-    return steamSteamDir.exists();
+    return steamDir.absoluteFilePath(QStringLiteral("steam"));
 }
 
 #include "moc_compatibilitytoolinstaller.cpp"
\ No newline at end of file