feat(UI): hide macro ordering prefix [closes #96]

Author: AndyEveritt

src/UI/Screens/File/FilePresenter.cpp

@@ -9,11 +9,33 @@
 #include "UI/Screens/Home/HomeView.h"
 #include "i18n/i18n.h"
 #include "utils/StorageHelper.h"
+#include <cctype>
 
 namespace UI
 {
 	static std::string s_emptyStr = "";
 
+	static std::string_view stripMacroDisplayPrefix(std::string_view name)
+	{
+		if (name.empty() || !std::isdigit(static_cast<unsigned char>(name.front())))
+		{
+			return name;
+		}
+
+		size_t prefixEnd = 0;
+		while (prefixEnd < name.size() && std::isdigit(static_cast<unsigned char>(name[prefixEnd])))
+		{
+			prefixEnd++;
+		}
+
+		if (prefixEnd == 0 || prefixEnd >= name.size() || name[prefixEnd] != '_')
+		{
+			return name;
+		}
+
+		return name.substr(prefixEnd + 1);
+	}
+
 	static OM::Directories::DirectoryType getBaseFolderType(FilePresenter::BaseFolder folder)
 	{
 		ZoneScoped;
@@ -29,6 +51,16 @@ namespace UI
 		}
 	}
 
+	std::string_view FilePresenter::getDisplayName(std::string_view name, BaseFolder baseFolder)
+	{
+		if (baseFolder != BaseFolder::MACROS)
+		{
+			return name;
+		}
+
+		return stripMacroDisplayPrefix(name);
+	}
+
 	std::string_view FilePresenter::getBaseFolderPath() const
 	{
 		ZoneScoped;
@@ -131,7 +163,7 @@ namespace UI
 		}
 		else if (m_gcodePath.starts_with(OM::Directories::GetMacrosDirectory()))
 		{
-			m_view->confirmRunMacro(item->GetName().c_str());
+			m_view->confirmRunMacro(getDisplayName(item->GetName(), m_baseFolder));
 		}
 	}
 
@@ -187,7 +219,7 @@ namespace UI
 				continue;
 			}
 
-			item->m_filename = file->GetName();
+			item->m_filename = getDisplayName(file->GetName(), m_baseFolder);
 			item->m_date = file->GetDate();
 #if SHOW_FILE_ITEM_SIZE
 			item->m_size = file->GetReadableSize();

src/UI/Screens/File/FilePresenter.h

@@ -21,6 +21,7 @@ namespace UI
 
 		// Actions
 		void setBaseFolder(BaseFolder folder) { m_baseFolder = folder; }
+		static std::string_view getDisplayName(std::string_view name, BaseFolder baseFolder);
 		std::string_view getBaseFolderPath() const;
 		void setFolder(std::string_view folder);
 		void itemClicked(const size_t index);

tests/src/test_cases/UI/test_fileview.cpp

@@ -0,0 +1,28 @@
+/*
+ * test_fileview.cpp
+ *
+ *  Created on: 2026-03-12
+ *      Author: Andy Everitt
+ */
+
+#include "Debug.h"
+#include "UI/Screens/File/FileView.h"
+#include "test_utils/UiTestSuite.h"
+#include <gtest/gtest.h>
+
+using namespace UI;
+
+class TestFilePresenter : public TestSuite
+{
+  public:
+	TestFilePresenter() {}
+};
+
+TEST(TestFilePresenter, MacroDisplayNameRemovesNumericPrefix)
+{
+	EXPECT_EQ(FilePresenter::getDisplayName("12_Preheat.g", FilePresenter::BaseFolder::MACROS), "Preheat.g");
+	EXPECT_EQ(FilePresenter::getDisplayName("001_Home All.g", FilePresenter::BaseFolder::MACROS), "Home All.g");
+	EXPECT_EQ(FilePresenter::getDisplayName("Preheat.g", FilePresenter::BaseFolder::MACROS), "Preheat.g");
+	EXPECT_EQ(FilePresenter::getDisplayName("12Preheat.g", FilePresenter::BaseFolder::MACROS), "12Preheat.g");
+	EXPECT_EQ(FilePresenter::getDisplayName("12_Preheat.g", FilePresenter::BaseFolder::GCODES), "12_Preheat.g");
+}