From 60f184ae43be58c8844f60c22a17d8a101a4ab2e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 20 Sep 2026 21:58:36 +0300 Subject: [PATCH 1/2] fix file.ext --- dev/tests/filesystem.lua | 5 +++++ res/modules/internal/extensions/file.lua | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/tests/filesystem.lua b/dev/tests/filesystem.lua index 38e7c4a04..80c080cdd 100644 --- a/dev/tests/filesystem.lua +++ b/dev/tests/filesystem.lua @@ -1,3 +1,8 @@ +debug.log("file extension") +asserts.equals(nil, file.ext("config:test")) +asserts.equals("cfg", file.ext("config:test.cfg")) +asserts.equals("gz", file.ext("config:test.cfg.gz")) + debug.log("check initial state") assert(file.exists("config:")) diff --git a/res/modules/internal/extensions/file.lua b/res/modules/internal/extensions/file.lua index d308eda9c..b19864cf6 100644 --- a/res/modules/internal/extensions/file.lua +++ b/res/modules/internal/extensions/file.lua @@ -8,7 +8,7 @@ function file.stem(path) end function file.ext(path) - return path:match("%.([^:/\\]+)$") + return path:match("[^:/\\.]%.([^.:/\\]+)$") end function file.prefix(path) From b9b17358a1576e740c4dcf7cf28e553b9d829db0 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 20 Sep 2026 22:01:18 +0300 Subject: [PATCH 2/2] fix file.remove_ext --- dev/tests/filesystem.lua | 1 + res/modules/internal/extensions/file.lua | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/tests/filesystem.lua b/dev/tests/filesystem.lua index 80c080cdd..cb5a052ac 100644 --- a/dev/tests/filesystem.lua +++ b/dev/tests/filesystem.lua @@ -2,6 +2,7 @@ debug.log("file extension") asserts.equals(nil, file.ext("config:test")) asserts.equals("cfg", file.ext("config:test.cfg")) asserts.equals("gz", file.ext("config:test.cfg.gz")) +asserts.equals("config:test.cfg", file.remove_ext("config:test.cfg.gz")) debug.log("check initial state") assert(file.exists("config:")) diff --git a/res/modules/internal/extensions/file.lua b/res/modules/internal/extensions/file.lua index b19864cf6..6d5dc30ba 100644 --- a/res/modules/internal/extensions/file.lua +++ b/res/modules/internal/extensions/file.lua @@ -24,7 +24,11 @@ function file.parent(path) end function file.remove_ext(path) - return string.format("%s/%s", file.parent(path), file.stem(path)) + local ext = file.ext(path) + if not ext then + return path + end + return path:sub(1, -#ext - 2) end function file.path(path)