update

tyanmahou · Dec 11, 2024 · 7c3957c · 7c3957c
1 parent 616e2db
commit 7c3957c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/Re-Abyss/app/debugs/Menu/MenuBuilder.cpp b/Re-Abyss/app/debugs/Menu/MenuBuilder.cpp
@@ -15,6 +15,7 @@
 #include <abyss/utils/DebugMenu/HrItem.hpp>
 #include <abyss/utils/Enum/EnumTraits.hpp>
 #include <abyss/utils/FPS/FrameRateController.hpp>
+#include <abyss/utils/FileUtil/FileUtil.hpp>
 #include <Siv3D.hpp>
 
 namespace
@@ -63,7 +64,7 @@ namespace
 				if (s3d::FileSystem::DirectoryContents(path).any([](const s3d::FilePath& p) {
 					return s3d::FileSystem::Extension(p) == U"tmx";
 					})) {
-					auto child = Node::Create<DebugMenu::Folder>(s3d::FileSystem::BaseName(path));
+					auto child = Node::Create<DebugMenu::Folder>(FileUtil::BaseName(path));
 					folder.add(BuildMainSceneChangeButtons(child, path));
 				}
 				continue;

diff --git a/Re-Abyss/app/utils/FileUtil/FileUtil.cpp b/Re-Abyss/app/utils/FileUtil/FileUtil.cpp
@@ -1,4 +1,4 @@
-#include <abyss/utils/FileUtil/FileUtil.hpp>
+#include <abyss/utils/FileUtil/FileUtil.hpp>
 
 #include <stack>
 #include <Siv3D.hpp>
@@ -14,7 +14,21 @@ namespace
 
 namespace abyss::FileUtil
 {
-    s3d::FilePath FixRelativePath(const s3d::FilePath& path)
+	s3d::String BaseName(s3d::FilePathView path)
+	{
+        if (path.ends_with(U'/')) {
+            path.remove_suffix(1);
+        }
+        return s3d::FileSystem::BaseName(path);
+	}
+    s3d::String FileName(s3d::FilePathView path)
+    {
+        if (path.ends_with(U'/')) {
+            path.remove_suffix(1);
+        }
+        return s3d::FileSystem::FileName(path);
+    }
+	s3d::FilePath FixRelativePath(const s3d::FilePath& path)
     {
 		std::stack<String> dirNameStack;
 		String dirName = U"";

diff --git a/Re-Abyss/app/utils/FileUtil/FileUtil.hpp b/Re-Abyss/app/utils/FileUtil/FileUtil.hpp
@@ -1,8 +1,11 @@
-#pragma once
+#pragma once
 #include <Siv3D/String.hpp>
 
 namespace abyss::FileUtil
 {
+   s3d::String BaseName(s3d::FilePathView path);
+   s3d::String FileName(s3d::FilePathView path);
+
     /// <summary>
     /// 相対パスの ../ ./を排除する
     /// ex Hoge/../Piyp/ => Hoge/
@@ -30,4 +33,4 @@ namespace abyss::FileUtil
 #else
     s3d::String FixPath(const s3d::FilePath& path, bool useResource = true);
 #endif
-}
+}