From 86d0acf76c18b373f81a48f6725605f2489be3c0 Mon Sep 17 00:00:00 2001
From: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
Date: Mon, 14 Jun 2021 13:55:37 -0700
Subject: [PATCH] fixes for invalid drive letter casing for scanfolder (#1281)

---
 .../assetprocessor_static_files.cmake         |  1 +
 .../AssetManager/assetScanFolderInfo.cpp      | 42 +++++++++++++++++++
 .../native/AssetManager/assetScanFolderInfo.h | 14 +------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp

diff --git a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
index 194e99b247..1e78d1dc6c 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake
@@ -19,6 +19,7 @@ set(FILES
     native/AssetManager/AssetRequestHandler.cpp
     native/AssetManager/AssetRequestHandler.h
     native/AssetManager/assetScanFolderInfo.h
+    native/AssetManager/assetScanFolderInfo.cpp
     native/AssetManager/assetScanner.cpp
     native/AssetManager/assetScanner.h
     native/AssetManager/assetScannerWorker.cpp
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp
new file mode 100644
index 0000000000..f849b4ee49
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.cpp
@@ -0,0 +1,42 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <native/AssetManager/assetScanFolderInfo.h>
+#include <native/utilities/assetUtils.h>
+
+namespace AssetProcessor
+{
+        ScanFolderInfo::ScanFolderInfo(
+            QString path,
+            QString displayName,
+            QString portableKey,
+            bool isRoot,
+            bool recurseSubFolders,
+            AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms,
+            int order,
+            AZ::s64 scanFolderID,
+            bool canSaveNewAssets)
+            : m_scanPath(path)
+            , m_displayName(displayName)
+            , m_portableKey (portableKey)
+            , m_isRoot(isRoot)
+            , m_recurseSubFolders(recurseSubFolders)
+            , m_order(order)
+            , m_scanFolderID(scanFolderID)
+            , m_platforms(platforms)
+            , m_canSaveNewAssets(canSaveNewAssets)
+        {
+            m_scanPath = AssetUtilities::NormalizeFilePath(m_scanPath);
+            // note that m_scanFolderID is 0 unless its filled in from the DB.
+        }
+
+} // end namespace AssetProcessor
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
index 5767822451..5fbda237d7 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetScanFolderInfo.h
@@ -33,19 +33,7 @@ namespace AssetProcessor
             AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms = AZStd::vector<AssetBuilderSDK::PlatformInfo>{},
             int order = 0,
             AZ::s64 scanFolderID = 0,
-            bool canSaveNewAssets = false)
-            : m_scanPath(path)
-            , m_displayName(displayName)
-            , m_portableKey (portableKey)
-            , m_isRoot(isRoot)
-            , m_recurseSubFolders(recurseSubFolders)
-            , m_order(order)
-            , m_scanFolderID(scanFolderID)
-            , m_platforms(platforms)
-            , m_canSaveNewAssets(canSaveNewAssets)
-        {
-            // note that m_scanFolderID is 0 unless its filled in from the DB.
-        }
+            bool canSaveNewAssets = false);
 
         ScanFolderInfo() = default;
         ScanFolderInfo(const ScanFolderInfo& other) = default;