[studio] Add support for deleting files

deps/ox/src/ox/fs/filesystem/filesystem.cpp

@@ -63,18 +63,6 @@ Error FileSystem::read(const FileAddress &addr, std::size_t readStart, std::size
 	}
 }
 
-Error FileSystem::remove(const FileAddress &addr, bool recursive) noexcept {
-	switch (addr.type()) {
-		case FileAddressType::Inode:
-			return remove(addr.getInode().value, recursive);
-		case FileAddressType::ConstPath:
-		case FileAddressType::Path:
-			return remove(StringView(addr.getPath().value), recursive);
-		default:
-			return ox::Error(1);
-	}
-}
-
 Error FileSystem::write(const FileAddress &addr, const void *buffer, uint64_t size, FileType fileType) noexcept {
 	switch (addr.type()) {
 		case FileAddressType::Inode:

deps/ox/src/ox/fs/filesystem/filesystem.hpp

@@ -57,9 +57,9 @@ class FileSystem {
 
 		virtual Result<Vector<String>> ls(StringViewCR dir) const noexcept = 0;
 
-		virtual Error remove(StringViewCR path, bool recursive) noexcept = 0;
+		Error remove(StringViewCR path, bool recursive = false) noexcept {
-
+			return removePath(path, recursive);
-		Error remove(const FileAddress &addr, bool recursive = false) noexcept;
+		}
 
 		virtual Error resize(uint64_t size, void *buffer) noexcept = 0;
 
@@ -142,6 +142,8 @@ class FileSystem {
 
 		virtual Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
 
+		virtual Error removePath(StringViewCR path, bool recursive) noexcept = 0;
+
 		virtual Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
 
 		virtual Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept = 0;
@@ -209,6 +211,8 @@ class FileSystemTemplate: public MemFS {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
+		Error removePath(StringViewCR path, bool recursive) noexcept override;
+
 		Result<const char*> directAccessInode(uint64_t) const noexcept override;
 
 		Result<Vector<String>> ls(StringViewCR dir) const noexcept override;
@@ -216,8 +220,6 @@ class FileSystemTemplate: public MemFS {
 		template<typename F>
 		Error ls(StringViewCR path, F cb) const;
 
-		Error remove(StringViewCR path, bool recursive) noexcept override;
-
 		/**
 		 * Resizes FileSystem to minimum possible size.
 		 */
@@ -356,6 +358,25 @@ Error FileSystemTemplate<FileStore, Directory>::readFileInodeRange(uint64_t inod
 	return m_fs.read(inode, readStart, readSize, reinterpret_cast<uint8_t*>(buffer), size);
 }
 
+template<typename FileStore, typename Directory>
+Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bool recursive) noexcept {
+	OX_REQUIRE(fd, fileSystemData());
+	Directory rootDir(m_fs, fd.rootDirInode);
+	OX_REQUIRE(inode, rootDir.find(path));
+	OX_REQUIRE(st, statInode(inode));
+	if (st.fileType == FileType::NormalFile || recursive) {
+		if (auto err = rootDir.remove(path)) {
+			// removal failed, try putting the index back
+			oxLogError(rootDir.write(path, inode));
+			return err;
+		}
+	} else {
+		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
+		return ox::Error(1);
+	}
+	return ox::Error(0);
+}
+
 template<typename FileStore, typename Directory>
 Result<const char*> FileSystemTemplate<FileStore, Directory>::directAccessInode(uint64_t inode) const noexcept {
 	auto data = m_fs.read(inode);
@@ -384,25 +405,6 @@ Error FileSystemTemplate<FileStore, Directory>::ls(StringViewCR path, F cb) cons
 	return dir.ls(cb);
 }
 
-template<typename FileStore, typename Directory>
-Error FileSystemTemplate<FileStore, Directory>::remove(StringViewCR path, bool recursive) noexcept {
-	OX_REQUIRE(fd, fileSystemData());
-	Directory rootDir(m_fs, fd.rootDirInode);
-	OX_REQUIRE(inode, rootDir.find(path));
-	OX_REQUIRE(st, statInode(inode));
-	if (st.fileType == FileType::NormalFile || recursive) {
-		if (auto err = rootDir.remove(path)) {
-			// removal failed, try putting the index back
-			oxLogError(rootDir.write(path, inode));
-			return err;
-		}
-	} else {
-		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
-		return ox::Error(1);
-	}
-	return ox::Error(0);
-}
-
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::resize() noexcept {
 	return m_fs.resize();

deps/ox/src/ox/fs/filesystem/passthroughfs.cpp

@@ -75,14 +75,6 @@ Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
 	return out;
 }
 
-Error PassThroughFS::remove(StringViewCR path, bool recursive) noexcept {
-	if (recursive) {
-		return ox::Error(std::filesystem::remove_all(m_path / stripSlash(path)) != 0);
-	} else {
-		return ox::Error(std::filesystem::remove(m_path / stripSlash(path)) != 0);
-	}
-}
-
 Error PassThroughFS::resize(uint64_t, void*) noexcept {
 	// unsupported
 	return ox::Error(1, "resize is not supported by PassThroughFS");
@@ -167,6 +159,14 @@ Error PassThroughFS::readFileInodeRange(uint64_t, std::size_t, std::size_t, void
 	return ox::Error(1, "read(uint64_t, std::size_t, std::size_t, void*, std::size_t*) is not supported by PassThroughFS");
 }
 
+Error PassThroughFS::removePath(StringViewCR path, bool const recursive) noexcept {
+	if (recursive) {
+		return ox::Error{std::filesystem::remove_all(m_path / stripSlash(path)) == 0};
+	} else {
+		return ox::Error{!std::filesystem::remove(m_path / stripSlash(path))};
+	}
+}
+
 Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType) noexcept {
 	const auto p = (m_path / stripSlash(path));
 	try {

deps/ox/src/ox/fs/filesystem/passthroughfs.hpp

@@ -45,8 +45,6 @@ class PassThroughFS: public FileSystem {
 		template<typename F>
 		Error ls(StringViewCR dir, F cb) const noexcept;
 
-		Error remove(StringViewCR path, bool recursive) noexcept override;
-
 		Error resize(uint64_t size, void *buffer) noexcept override;
 
 		Result<FileStat> statInode(uint64_t inode) const noexcept override;
@@ -75,6 +73,8 @@ class PassThroughFS: public FileSystem {
 
 		Error readFileInodeRange(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
 
+		Error removePath(StringViewCR path, bool recursive) noexcept override;
+
 		Error writeFilePath(StringViewCR path, const void *buffer, uint64_t size, FileType fileType) noexcept override;
 
 		Error writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept override;

src/olympic/studio/applib/src/projectexplorer.cpp

@@ -12,12 +12,12 @@ namespace studio {
 
 static ox::Result<ox::UniquePtr<ProjectTreeModel>> buildProjectTreeModel(
 		ProjectExplorer &explorer,
-		ox::StringView name,
+		ox::StringParam name,
 		ox::StringView path,
 		ProjectTreeModel *parent) noexcept {
 	auto const fs = explorer.romFs();
 	OX_REQUIRE(stat, fs->stat(path));
-	auto out = ox::make_unique<ProjectTreeModel>(explorer, ox::String(name), parent);
+	auto out = ox::make_unique<ProjectTreeModel>(explorer, std::move(name), parent);
 	if (stat.fileType == ox::FileType::Directory) {
 		OX_REQUIRE_M(children, fs->ls(path));
 		std::sort(children.begin(), children.end());
@@ -37,12 +37,14 @@ static ox::Result<ox::UniquePtr<ProjectTreeModel>> buildProjectTreeModel(
 ProjectExplorer::ProjectExplorer(turbine::Context &ctx) noexcept: m_ctx(ctx) {
 }
 
-void ProjectExplorer::draw(studio::StudioContext &ctx) noexcept {
+void ProjectExplorer::draw(StudioContext &ctx) noexcept {
 	auto const viewport = ImGui::GetContentRegionAvail();
 	ImGui::BeginChild("ProjectExplorer", ImVec2(300, viewport.y), true);
 	ImGui::SetNextItemOpen(true);
 	if (m_treeModel) {
-		m_treeModel->draw(ctx.tctx);
+		if (m_treeModel->draw(ctx.tctx)) {
+			oxLogError(refreshProjectTreeModel());
+		}
 	}
 	ImGui::EndChild();
 }

src/olympic/studio/applib/src/projectexplorer.hpp

@@ -12,27 +12,28 @@
 
 namespace studio {
 
-class ProjectExplorer: public studio::Widget {
+class ProjectExplorer: public Widget {
 	private:
 		ox::UPtr<ProjectTreeModel> m_treeModel;
 		turbine::Context &m_ctx;
+
 	public:
+		// slots
+		ox::Signal<ox::Error(ox::StringView const&)> fileChosen;
+
 		explicit ProjectExplorer(turbine::Context &ctx) noexcept;
 
-		void draw(studio::StudioContext &ctx) noexcept override;
+		void draw(StudioContext &ctx) noexcept override;
 
 		void setModel(ox::UPtr<ProjectTreeModel> &&model) noexcept;
 
 		ox::Error refreshProjectTreeModel(ox::StringViewCR = {}) noexcept;
 
 		[[nodiscard]]
-		inline ox::FileSystem *romFs() noexcept {
+		ox::FileSystem *romFs() noexcept {
 			return rom(m_ctx);
 		}
 
-	// slots
-	public:
-		ox::Signal<ox::Error(ox::StringView const&)> fileChosen;
 };
 
 }

src/olympic/studio/applib/src/projecttreemodel.cpp

@@ -9,7 +9,9 @@
 
 namespace studio {
 
-ProjectTreeModel::ProjectTreeModel(ProjectExplorer &explorer, ox::String name,
+ProjectTreeModel::ProjectTreeModel(
+	ProjectExplorer &explorer,
+	ox::StringParam name,
 	ProjectTreeModel *parent) noexcept:
 	m_explorer(explorer),
 	m_parent(parent),
@@ -23,12 +25,13 @@ ProjectTreeModel::ProjectTreeModel(ProjectTreeModel &&other) noexcept:
 	m_children(std::move(other.m_children)) {
 }
 
-void ProjectTreeModel::draw(turbine::Context &ctx) const noexcept {
+bool ProjectTreeModel::draw(turbine::Context &ctx) const noexcept {
+	bool updated = false;
 	constexpr auto dirFlags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick;
 	if (!m_children.empty()) {
 		if (ImGui::TreeNodeEx(m_name.c_str(), dirFlags)) {
 			for (auto const&child : m_children) {
-				child->draw(ctx);
+				updated = child->draw(ctx) || updated;
 			}
 			ImGui::TreePop();
 		}
@@ -39,9 +42,16 @@ void ProjectTreeModel::draw(turbine::Context &ctx) const noexcept {
 			if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(0)) {
 				m_explorer.fileChosen.emit(path);
 			}
+			if (ImGui::BeginPopupContextItem("FileMenu", ImGuiPopupFlags_MouseButtonRight)) {
+				if (ImGui::MenuItem("Delete")) {
+					updated = m_explorer.romFs()->remove(path).errCode == 0 || updated;
+				}
+				ImGui::EndPopup();
+			}
 			ImGui::TreePop();
 		}
 	}
+	return updated;
 }
 
 void ProjectTreeModel::setChildren(ox::Vector<ox::UPtr<ProjectTreeModel>> children) noexcept {

src/olympic/studio/applib/src/projecttreemodel.hpp

@@ -17,19 +17,23 @@ class ProjectTreeModel {
 		ProjectTreeModel *m_parent = nullptr;
 		ox::String m_name;
 		ox::Vector<ox::UPtr<ProjectTreeModel>> m_children;
+
 	public:
-		explicit ProjectTreeModel(class ProjectExplorer &explorer, ox::String name,
+		explicit ProjectTreeModel(
+			ProjectExplorer &explorer, ox::StringParam name,
 			ProjectTreeModel *parent = nullptr) noexcept;
 
 		ProjectTreeModel(ProjectTreeModel &&other) noexcept;
 
-		void draw(turbine::Context &ctx) const noexcept;
+		[[nodiscard]]
+		bool draw(turbine::Context &ctx) const noexcept;
 
 		void setChildren(ox::Vector<ox::UPtr<ProjectTreeModel>> children) noexcept;
 
 	private:
 		[[nodiscard]]
 		ox::BasicString<255> fullPath() const noexcept;
+
 };
 
 }