Remove getProjectPath method and replace it with existing helper GetC…

…urrentMayaWorkspacePath
Autodesk · Aug 8, 2023 · c7f1144 · c7f1144
1 parent 0ea58bf
commit c7f1144
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/lib/mayaUsd/utils/utilFileSystem.cpp b/lib/mayaUsd/utils/utilFileSystem.cpp
@@ -174,20 +174,14 @@ std::pair<std::string, bool> UsdMayaUtilFileSystem::makePathRelativeTo(
     return std::make_pair(relativePath.generic_string(), true);
 }
 
-std::string UsdMayaUtilFileSystem::getProjectPath()
-{
-    MString projectPath = MGlobal::executeCommandStringResult("workspace -q -rd");
-    return projectPath.asChar();
-}
-
 std::string UsdMayaUtilFileSystem::getPathRelativeToProject(const std::string& fileName)
 {
     if (fileName.empty())
         return {};
 
     // Note: don't use isEmpty() because it is not available in Maya 2022 and earlier.
-    const std::string projectPath = getProjectPath();
-    if (projectPath.empty())
+    const MString projectPath = UsdMayaUtil::GetCurrentMayaWorkspacePath();
+    if (projectPath.isEmpty())
         return {};
 
     // Note: we do *not* use filesystem function to attempt to make the
@@ -197,11 +191,11 @@ std::string UsdMayaUtilFileSystem::getPathRelativeToProject(const std::string& f
     //       preserve paths entered manually with relative folder ("..")
     //       by keping an absolute path with ".." embedded in them,
     //       so this works even in this situation.
-    const auto pos = fileName.rfind(projectPath, 0);
+    const auto pos = fileName.rfind(projectPath.asChar(), 0);
     if (pos != 0)
         return {};
 
-    auto relativePathAndSuccess = makePathRelativeTo(fileName, projectPath);
+    auto relativePathAndSuccess = makePathRelativeTo(fileName, projectPath.asChar());
 
     if (!relativePathAndSuccess.second)
         return {};
@@ -211,19 +205,20 @@ std::string UsdMayaUtilFileSystem::getPathRelativeToProject(const std::string& f
 
 std::string UsdMayaUtilFileSystem::makeProjectRelatedPath(const std::string& fileName)
 {
-    const std::string projectPath = UsdMayaUtilFileSystem::getProjectPath();
-    if (projectPath.empty())
+    const MString projectPath = UsdMayaUtil::GetCurrentMayaWorkspacePath();
+    if (projectPath.isEmpty())
         return {};
 
     // Attempt to create a relative path relative to the project folder.
     // If that fails, we cannot create the project-relative path.
-    const auto pathAndSuccess = UsdMayaUtilFileSystem::makePathRelativeTo(fileName, projectPath);
+    const auto pathAndSuccess
+        = UsdMayaUtilFileSystem::makePathRelativeTo(fileName, projectPath.asChar());
     if (!pathAndSuccess.second)
         return {};
 
     // Make the path absolute but relative to the project folder. That is an absolute
     // path that starts with the project path.
-    return UsdMayaUtilFileSystem::appendPaths(projectPath, pathAndSuccess.first);
+    return UsdMayaUtilFileSystem::appendPaths(projectPath.asChar(), pathAndSuccess.first);
 }
 
 std::string UsdMayaUtilFileSystem::getPathRelativeToDirectory(

diff --git a/lib/mayaUsd/utils/utilFileSystem.h b/lib/mayaUsd/utils/utilFileSystem.h
@@ -89,11 +89,6 @@ getPathRelativeToDirectory(const std::string& fileName, const std::string& relat
 MAYAUSD_CORE_PUBLIC
 std::string getPathRelativeToProject(const std::string& fileName);
 
-/*! \brief returns the path to the Maya scene project folder.
- */
-MAYAUSD_CORE_PUBLIC
-std::string getProjectPath();
-
 /*! \brief returns the absolute path of a file but relative to the Maya scene project folder.
            Returns an empty string if the path cannot be made relative to the project.
  */