From 23b3711f96bd93171eebc401f983ccf0fb862772 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 27 Jun 2023 12:41:36 -0700
Subject: [PATCH 1/2] fix(filesystem): track failed copies and clones

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/FileSystem.cpp | 9 +++++++++
 launcher/FileSystem.h   | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index 835ad925d..0554cab86 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -36,6 +36,7 @@
  */
 
 #include "FileSystem.h"
+#include <qpair.h>
 
 #include "BuildConfig.h"
 
@@ -246,6 +247,7 @@ bool copy::operator()(const QString& offset, bool dryRun)
 {
     using copy_opts = fs::copy_options;
     m_copied = 0;  // reset counter
+    m_failedPaths.clear();
 
 // NOTE always deep copy on windows. the alternatives are too messy.
 #if defined Q_OS_WIN32
@@ -277,6 +279,9 @@ bool copy::operator()(const QString& offset, bool dryRun)
             qWarning() << "Failed to copy files:" << QString::fromStdString(err.message());
             qDebug() << "Source file:" << src_path;
             qDebug() << "Destination file:" << dst_path;
+            m_failedPaths.append(dst_path);
+            emit copyFailed(relative_dst_path);
+            return;
         }
         m_copied++;
         emit fileCopied(relative_dst_path);
@@ -1072,6 +1077,7 @@ bool clone::operator()(const QString& offset, bool dryRun)
     }
 
     m_cloned = 0;  // reset counter
+    m_failedClones.clear();
 
     auto src = PathCombine(m_src.absolutePath(), offset);
     auto dst = PathCombine(m_dst.absolutePath(), offset);
@@ -1092,6 +1098,9 @@ bool clone::operator()(const QString& offset, bool dryRun)
             qDebug() << "Failed to clone files: error" << err.value() << "message" << QString::fromStdString(err.message());
             qDebug() << "Source file:" << src_path;
             qDebug() << "Destination file:" << dst_path;
+            m_failedClones.append(qMakePair(src_path, dst_path));
+            emit cloneFailed(src_path, dst_path);
+            return;
         }
         m_cloned++;
         emit fileCloned(src_path, dst_path);
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h
index cb581d0c5..f8a82baef 100644
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -43,6 +43,7 @@
 #include <system_error>
 
 #include <QDir>
+#include <QPair>
 #include <QFlags>
 #include <QLocalServer>
 #include <QObject>
@@ -112,9 +113,12 @@ class copy : public QObject {
     bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
 
     int totalCopied() { return m_copied; }
+    int totalFailed() { return m_failedPaths.length(); }
+    QStringList failed() { return m_failedPaths; }
 
    signals:
     void fileCopied(const QString& relativeName);
+    void copyFailed(const QString& relativeName);
     // TODO: maybe add a "shouldCopy" signal in the future?
 
    private:
@@ -127,6 +131,7 @@ class copy : public QObject {
     QDir m_src;
     QDir m_dst;
     int m_copied;
+    QStringList m_failedPaths;
 };
 
 struct LinkPair {
@@ -471,6 +476,9 @@ class clone : public QObject {
     bool operator()(bool dryRun = false) { return operator()(QString(), dryRun); }
 
     int totalCloned() { return m_cloned; }
+    int totalFailed() { return m_failedClones.length(); }
+
+    QList<QPair<QString, QString>> failed() { return m_failedClones; }
 
    signals:
     void fileCloned(const QString& src, const QString& dst);
@@ -485,6 +493,7 @@ class clone : public QObject {
     QDir m_src;
     QDir m_dst;
     int m_cloned;
+    QList<QPair<QString, QString>> m_failedClones;
 };
 
 /**

From 00be211169134022813562cd09c69f831d0e400e Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 27 Jun 2023 13:01:28 -0700
Subject: [PATCH 2/2] Update launcher/FileSystem.cpp

Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/FileSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index 0554cab86..8a417831b 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "FileSystem.h"
-#include <qpair.h>
+#include <QPair>
 
 #include "BuildConfig.h"