From a6d148475bea71e881ccc785c7146ac831f905eb Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 27 Sep 2017 14:52:21 -0700
Subject: [PATCH] Add removal of temporary baked files in AssetServer

---
 assignment-client/src/assets/AssetServer.cpp  | 13 ++++++++-
 assignment-client/src/assets/AssetServer.h    |  3 +-
 .../src/assets/BakeAssetTask.cpp              | 29 +++++++++++++++++--
 assignment-client/src/assets/BakeAssetTask.h  |  2 +-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp
index 9df606c227..c03721d097 100644
--- a/assignment-client/src/assets/AssetServer.cpp
+++ b/assignment-client/src/assets/AssetServer.cpp
@@ -1162,7 +1162,8 @@ void AssetServer::handleFailedBake(QString originalAssetHash, QString assetPath,
     _pendingBakes.remove(originalAssetHash);
 }
 
-void AssetServer::handleCompletedBake(QString originalAssetHash, QString originalAssetPath, QVector<QString> bakedFilePaths) {
+void AssetServer::handleCompletedBake(QString originalAssetHash, QString originalAssetPath,
+                                      QString bakedTempOutputDir, QVector<QString> bakedFilePaths) {
     bool errorCompletingBake { false };
     QString errorReason;
 
@@ -1234,6 +1235,16 @@ void AssetServer::handleCompletedBake(QString originalAssetHash, QString origina
         }
     }
 
+    for (auto& filePath : bakedFilePaths) {
+        QFile file(filePath);
+        if (!file.remove()) {
+            qWarning() << "Failed to remove temporary file:" << filePath;
+        }
+    }
+    if (!QDir(bakedTempOutputDir).rmdir(".")) {
+        qWarning() << "Failed to remove temporary directory:" << bakedTempOutputDir;
+    }
+
     if (!errorCompletingBake) {
         // create the meta file to store which version of the baking process we just completed
         writeMetaFile(originalAssetHash);
diff --git a/assignment-client/src/assets/AssetServer.h b/assignment-client/src/assets/AssetServer.h
index 94be560c9b..aeb40a416f 100644
--- a/assignment-client/src/assets/AssetServer.h
+++ b/assignment-client/src/assets/AssetServer.h
@@ -100,7 +100,8 @@ private:
     void bakeAsset(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath);
 
     /// Move baked content for asset to baked directory and update baked status
-    void handleCompletedBake(QString originalAssetHash, QString assetPath, QVector<QString> bakedFilePaths);
+    void handleCompletedBake(QString originalAssetHash, QString assetPath, QString bakedTempOutputDir,
+                             QVector<QString> bakedFilePaths);
     void handleFailedBake(QString originalAssetHash, QString assetPath, QString errors);
     void handleAbortedBake(QString originalAssetHash, QString assetPath);
 
diff --git a/assignment-client/src/assets/BakeAssetTask.cpp b/assignment-client/src/assets/BakeAssetTask.cpp
index 9073510f79..94a0739612 100644
--- a/assignment-client/src/assets/BakeAssetTask.cpp
+++ b/assignment-client/src/assets/BakeAssetTask.cpp
@@ -24,20 +24,39 @@ BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetP
 
 }
 
+void cleanupTempFiles(QString tempOutputDir, std::vector<QString> files) {
+    for (const auto& filename : files) {
+        QFile f { filename };
+        if (!f.remove()) {
+            qDebug() << "Failed to remove:" << filename;
+        }
+    }
+    if (!tempOutputDir.isEmpty()) {
+        QDir dir { tempOutputDir };
+        if (!dir.rmdir(".")) {
+            qDebug() << "Failed to remove temporary directory:" << tempOutputDir;
+        }
+    }
+};
+
 void BakeAssetTask::run() {
     _isBaking.store(true);
 
     qRegisterMetaType<QVector<QString> >("QVector<QString>");
     TextureBakerThreadGetter fn = []() -> QThread* { return QThread::currentThread();  };
 
+    QString tempOutputDir;
+
     if (_assetPath.endsWith(".fbx")) {
+        tempOutputDir = PathUtils::generateTemporaryDir();
         _baker = std::unique_ptr<FBXBaker> {
-            new FBXBaker(QUrl("file:///" + _filePath), fn, PathUtils::generateTemporaryDir())
+            new FBXBaker(QUrl("file:///" + _filePath), fn, tempOutputDir)
         };
     } else {
+        tempOutputDir = PathUtils::generateTemporaryDir();
         _baker = std::unique_ptr<TextureBaker> {
             new TextureBaker(QUrl("file:///" + _filePath), image::TextureUsage::CUBE_TEXTURE,
-                             PathUtils::generateTemporaryDir())
+                             tempOutputDir)
         };
     }
 
@@ -52,6 +71,8 @@ void BakeAssetTask::run() {
 
         _wasAborted.store(true);
 
+        cleanupTempFiles(tempOutputDir, _baker->getOutputFiles());
+
         emit bakeAborted(_assetHash, _assetPath);
     } else if (_baker->hasErrors()) {
         qDebug() << "Failed to bake: " << _assetHash << _assetPath << _baker->getErrors();
@@ -60,6 +81,8 @@ void BakeAssetTask::run() {
 
         _didFinish.store(true);
 
+        cleanupTempFiles(tempOutputDir, _baker->getOutputFiles());
+
         emit bakeFailed(_assetHash, _assetPath, errors);
     } else {
         auto vectorOutputFiles = QVector<QString>::fromStdVector(_baker->getOutputFiles());
@@ -68,7 +91,7 @@ void BakeAssetTask::run() {
 
         _didFinish.store(true);
 
-        emit bakeComplete(_assetHash, _assetPath, vectorOutputFiles);
+        emit bakeComplete(_assetHash, _assetPath, tempOutputDir, vectorOutputFiles);
     }
 }
 
diff --git a/assignment-client/src/assets/BakeAssetTask.h b/assignment-client/src/assets/BakeAssetTask.h
index 45e7ec8702..90458ac223 100644
--- a/assignment-client/src/assets/BakeAssetTask.h
+++ b/assignment-client/src/assets/BakeAssetTask.h
@@ -35,7 +35,7 @@ public:
     bool didFinish() const { return _didFinish.load(); }
 
 signals:
-    void bakeComplete(QString assetHash, QString assetPath, QVector<QString> outputFiles);
+    void bakeComplete(QString assetHash, QString assetPath, QString tempOutputDir, QVector<QString> outputFiles);
     void bakeFailed(QString assetHash, QString assetPath, QString errors);
     void bakeAborted(QString assetHash, QString assetPath);