[studio] Fix not to try moving a parent directory to its child

src/nostalgia/modules/gfx/src/studio/paletteeditor/CMakeLists.txt

@@ -1,19 +1,6 @@
-target_sources(
-	NostalgiaCore-Studio PRIVATE
-		commands/addcolorcommand.cpp
-		commands/addpagecommand.cpp
-		commands/applycolorallpagescommand.cpp
-		commands/duplicatepagecommand.cpp
-		commands/movecolorcommand.cpp
-		commands/movepagecommand.cpp
-		commands/removecolorcommand.cpp
-		commands/removepagecommand.cpp
-		commands/renamepagecommand.cpp
-		commands/updatecolorcommand.cpp
-		commands/updatecolorinfocommand.cpp
-)
-
 target_sources(
 	NostalgiaCore-Studio-ImGui PRIVATE
 		paletteeditor-imgui.cpp
 )
+
+add_subdirectory(commands)

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/CMakeLists.txt

@@ -0,0 +1,15 @@
+
+target_sources(
+    NostalgiaCore-Studio PRIVATE
+        addcolorcommand.cpp
+        addpagecommand.cpp
+        applycolorallpagescommand.cpp
+        duplicatepagecommand.cpp
+        movecolorcommand.cpp
+        movepagecommand.cpp
+        removecolorcommand.cpp
+        removepagecommand.cpp
+        renamepagecommand.cpp
+        updatecolorcommand.cpp
+        updatecolorinfocommand.cpp
+)

src/olympic/studio/applib/src/studioapp.cpp

@@ -495,11 +495,15 @@ ox::Error StudioUI::queueFileMove(ox::StringParam src, ox::StringParam dst) noex
 
 void StudioUI::procFileMoves() noexcept {
 	for (auto const &m : m_queuedMoves) {
-		oxLogError(m_project->moveItem(m.a, m.b));
+		if (!m_project->exists(m.b)) {
+			oxLogError(m_project->moveItem(m.a, m.b));
+		}
 	}
 	m_queuedMoves.clear();
 	for (auto const &m : m_queuedDirMoves) {
-		oxLogError(m_project->moveDir(m.a, m.b));
+		if (!m_project->exists(m.b)) {
+			oxLogError(m_project->moveDir(m.a, m.b));
+		}
 	}
 	m_queuedDirMoves.clear();
 }

src/olympic/studio/modlib/src/project.cpp

@@ -46,6 +46,10 @@ static ox::Result<ox::Vector<ox::String>> listAllRecursive(ox::FileSystem &fs, o
 	return std::move(out);
 }
 
+[[nodiscard]]
+static constexpr bool isParentOf(ox::StringViewCR parent, ox::StringViewCR child) noexcept {
+	return beginsWith(child, parent);
+}
 
 Project::Project(keel::Context &ctx, ox::String path, ox::StringViewCR projectDataDir):
 	m_kctx(ctx),
@@ -99,6 +103,9 @@ ox::Error Project::moveItem(ox::StringViewCR src, ox::StringViewCR dest) noexcep
 }
 
 ox::Error Project::moveDir(ox::StringViewCR src, ox::StringViewCR dest) noexcept {
+	if (isParentOf(src, dest)) {
+		return ox::Error{1, "cannot move parent to a child directory"};
+	}
 	OX_REQUIRE(files, listAllRecursive(m_fs, src));
 	OX_RETURN_ERROR(m_fs.move(src, dest));
 	fileMoved.emit(src, dest, ox::UUID{});