kotoriの更新。

Tatakinov · Jan 7, 2023 · 45347ca · 45347ca
1 parent a28edc9
commit 45347ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ghost/master/corelib/path/init.lua b/ghost/master/corelib/path/init.lua
@@ -8,6 +8,11 @@ function M.join(...)
   return table.concat(t, SEP)
 end
 
+function M.basename(path)
+  local match = string.match(path, [[.+[/\](.-)$]])
+  return match or path
+end
+
 function M.normalize(path)
   -- TODO stub
   return path

diff --git a/ghost/master/shiori/init.lua b/ghost/master/shiori/init.lua
@@ -47,7 +47,8 @@ function M:load(path)
 
   --トーク読み込み
   Path.dirWalk(path .. "talk", function(file_path)
-    if string.sub(file_path, 1, 1) == "_" or string.sub(file_path, -4, -1) ~= ".lua" then
+    local file_name  = Path.basename(file_path)
+    if string.sub(file_name, 1, 1) == "_" or string.sub(file_name, -4, -1) ~= ".lua" then
       return
     end
     local t, err  = (function()
@@ -267,8 +268,10 @@ function M:autoReplace(x)
 end
 
 function M:autoReplaceVars(str)
-  local str = string.gsub(str, "%${([^}]+)}", function(s)
-    --print("replace: " .. s)
+  local str  = str:gsub("(\\?)%${([^}]+)}", function(escape, s)
+    if escape == "\\" then
+      return string.format("${%s}", s)
+    end
     return tostring(self.var(s))
   end)
   return str