Merge pull request #4416 from Autodesk/deboisj/cc_save_fix

Author: antonkhelou

lib/mayaUsd/utils/utilComponentCreator.cpp

@@ -14,14 +14,20 @@
 // limitations under the License.
 //
 
+#include "util.h"
+#include "utilFileSystem.h"
+
 #include <mayaUsd/utils/utilComponentCreator.h>
 
 #include <pxr/base/tf/diagnostic.h>
 #include <pxr/pxr.h>
+#include <pxr/usd/usd/stage.h>
 
 #include <maya/MGlobal.h>
 #include <maya/MString.h>
 
+#include <ghc/filesystem.hpp>
+
 #include <vector>
 
 PXR_NAMESPACE_USING_DIRECTIVE
@@ -203,5 +209,19 @@ std::string moveAdskUsdComponent(
     return {};
 }
 
+bool shouldDisplayComponentInitialSaveDialog(
+    const pxr::UsdStageRefPtr stage,
+    const std::string&        proxyShapePath)
+{
+    if (!MayaUsd::ComponentUtils::isAdskUsdComponent(proxyShapePath)) {
+        return false;
+    }
+
+    MString tempDir;
+    MGlobal::executeCommand("internalVar -userTmpDir", tempDir);
+    return UsdMayaUtilFileSystem::isPathInside(
+        UsdMayaUtil::convert(tempDir), stage->GetRootLayer()->GetRealPath());
+}
+
 } // namespace ComponentUtils
 } // namespace MAYAUSD_NS_DEF

lib/mayaUsd/utils/utilComponentCreator.h

@@ -65,6 +65,14 @@ std::string moveAdskUsdComponent(
     const std::string& componentName,
     const std::string& proxyPath);
 
+/*! \brief Checks if the initial save dialog for components should be opened.
+ * \return Returns true if the initial save dialog for components should be opened.
+ */
+MAYAUSD_CORE_PUBLIC
+bool shouldDisplayComponentInitialSaveDialog(
+    const pxr::UsdStageRefPtr stage,
+    const std::string&        proxyShapePath);
+
 } // namespace ComponentUtils
 } // namespace MAYAUSD_NS_DEF
 

lib/mayaUsd/utils/utilFileSystem.cpp

@@ -803,3 +803,20 @@ void UsdMayaUtilFileSystem::FileBackup::restore()
     const std::string backupFileName = getBackupFilename();
     rename(backupFileName.c_str(), _filename.c_str());
 }
+
+bool UsdMayaUtilFileSystem::isPathInside(const std::string& parentDir, const std::string& childPath)
+{
+    ghc::filesystem::path parent = ghc::filesystem::weakly_canonical(parentDir);
+    ghc::filesystem::path child = ghc::filesystem::weakly_canonical(childPath);
+
+    // Iterate up from child to root
+    for (ghc::filesystem::path p = child; !p.empty(); p = p.parent_path()) {
+        if (p == parent)
+            return true;
+
+        ghc::filesystem::path next = p.parent_path();
+        if (next == p) // reached root (ex "C:\")
+            break;
+    }
+    return false;
+}

lib/mayaUsd/utils/utilFileSystem.h

@@ -308,6 +308,11 @@ void pathRemoveExtension(std::string& filePath);
 MAYAUSD_CORE_PUBLIC
 std::string pathFindExtension(std::string& filePath);
 
+/*! \brief returns true if the given child path is inside the given parent directory.
+ */
+MAYAUSD_CORE_PUBLIC
+bool isPathInside(const std::string& parentDir, const std::string& childPath);
+
 // Backup a file and restore it if not committed.
 class FileBackup
 {

lib/usd/ui/layerEditor/layerTreeModel.cpp

@@ -50,37 +50,6 @@ namespace {
 const QString LAYER_EDITOR_MIME_TYPE = QStringLiteral("text/plain");
 const QString LAYED_EDITOR_MIME_SEP = QStringLiteral(";");
 
-bool isPathInside(const std::string& parentDir, const std::string& childPath)
-{
-    ghc::filesystem::path parent = ghc::filesystem::weakly_canonical(parentDir);
-    ghc::filesystem::path child = ghc::filesystem::weakly_canonical(childPath);
-
-    // Iterate up from child to root
-    for (ghc::filesystem::path p = child; !p.empty(); p = p.parent_path()) {
-        if (p == parent)
-            return true;
-
-        ghc::filesystem::path next = p.parent_path();
-        if (next == p) // reached root (ex "C:\")
-            break;
-    }
-    return false;
-}
-
-bool shouldDisplayComponentInitialSaveDialog(
-    const UsdStageRefPtr stage,
-    const std::string&   proxyShapePath)
-{
-    if (!MayaUsd::ComponentUtils::isAdskUsdComponent(proxyShapePath)) {
-        return false;
-    }
-
-    MString tempDir;
-    MGlobal::executeCommand("internalVar -userTmpDir", tempDir);
-
-    return isPathInside(UsdMayaUtil::convert(tempDir), stage->GetRootLayer()->GetRealPath());
-}
-
 } // namespace
 
 namespace UsdLayerEditor {
@@ -575,7 +544,7 @@ void LayerTreeModel::saveStage(QWidget* in_parent)
     }
 
     // Show the save dialog for component stages (initial save) or if confirmation is needed
-    if (shouldDisplayComponentInitialSaveDialog(
+    if (MayaUsd::ComponentUtils::shouldDisplayComponentInitialSaveDialog(
             _sessionState->stageEntry()._stage, _sessionState->stageEntry()._proxyShapePath)
         || showConfirmDgl) {
         bool             isExporting = false;

lib/usd/ui/layerEditor/saveLayersDialog.cpp

@@ -502,8 +502,9 @@ SaveLayersDialog::SaveLayersDialog(
         msg.format(StringResources::getAsMString(StringResources::kSaveName), stageName.c_str());
         dialogTitle = MQtUtil::toQString(msg);
 
-        // Check if this stage is a component stage
-        if (MayaUsd::ComponentUtils::isAdskUsdComponent(stageEntry._proxyShapePath)) {
+        // Check if this stage is an unsaved component stage.
+        if (MayaUsd::ComponentUtils::shouldDisplayComponentInitialSaveDialog(
+                _sessionState->stageEntry()._stage, _sessionState->stageEntry()._proxyShapePath)) {
             MayaUsd::StageSavingInfo info;
             MObject                  proxyObj;
             UsdMayaUtil::GetMObjectByName(stageEntry._proxyShapePath, proxyObj);