summaryrefslogtreecommitdiffstatshomepage
path: root/plugins
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2017-07-27 17:29:22 -0500
committer cracyc <cracyc@users.noreply.github.com>2017-07-27 17:29:22 -0500
commit8408a79059afb83d3f371a07ac7ff7ef11dcdf2f (patch)
tree991c565deef6f6376d0f82a3df857006dc529ecf /plugins
parent14d282e0a447008fbefa4a1139a76a0a6de09227 (diff)
plugins/data: use 2 column format and clean up some parse errors (nw)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/data/data_story.lua19
-rw-r--r--plugins/data/load_dat.lua1
2 files changed, 11 insertions, 9 deletions
diff --git a/plugins/data/data_story.lua b/plugins/data/data_story.lua
index 1a933f0d74b..a6a6146b40c 100644
--- a/plugins/data/data_story.lua
+++ b/plugins/data/data_story.lua
@@ -1,23 +1,24 @@
local dat = {}
local ver, info
local datread = require("data/load_dat")
-local space_wid = mame_manager:ui():get_char_width(0x200a)
datread, ver = datread.open("story.dat", "# version")
function dat.check(set, softlist)
if softlist or not datread then
return nil
end
- local status
- status, info = pcall(datread, "story", "info", set)
- if not status or not info then
+ local status, data = pcall(datread, "story", "info", set)
+ if not status or not data then
return nil
end
- info = "#jf\n" .. info:gsub("([^%s]-)(%f[_]_+%f[0-9])([0-9.]+)",
- function(name, sep, score)
- local wid = mame_manager:ui():get_string_width(name .. score, 1.0)
- return name .. string.rep(utf8.char(0x200a), math.floor((.4 - wid) / space_wid)) .. score
- end)
+ local lines = {}
+ data = data:gsub("MAMESCORE records : ([^\n]+)", "MAMESCORE records :\t\n%1", 1)
+ for line in data:gmatch("[^\n]*") do
+ if not (#lines == 0 and line == "") and not (lines[#lines] == "" and line == "") then
+ lines[#lines + 1] = line:gsub("^(.-)_+([0-9.]+)$", "%1\t%2")
+ end
+ end
+ info = "#j2\n" .. table.concat(lines, "\n")
return "Mamescore"
end
diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua
index 0cbc3d3c83a..6f80458c593 100644
--- a/plugins/data/load_dat.lua
+++ b/plugins/data/load_dat.lua
@@ -85,6 +85,7 @@ function datfile.open(file, vertag, fixupcb)
ver = tostring(lfs.attributes(filepath, "change"))
end
if ver == dbver then
+ fh:close()
return read, dbver
end