feat: Add name, version and uid to dumpsis, plus --json, --nolang, --…

src/cmdline.lua

@@ -62,7 +62,7 @@ local function printHelp(params)
         printf("Options:\n")
     end
     for _, opt in ipairs(opts) do
-        local shortopt = shorts[opt] and string.format("|-%s", shorts[opt]) or ""
+        local shortopt = shorts[opt] and string.format(" | -%s", shorts[opt]) or ""
         if params[opt] == string then
             printf("    --%s%s <value>\n", opt, shortopt)
         elseif params[opt] == table then

src/dumpsis.lua

@@ -29,25 +29,40 @@ dofile(arg[0]:match("^(.-)[a-z]+%.lua$").."cmdline.lua")
 function main()
     local args = getopt({
         "filename",
-        "dest"
+        "dest",
+        verbose = true, v = "verbose",
+        json = true, j = "json",
+        nolangs = true, n = "nolangs",
     })
 
     sis = require("sis")
     local data = readFile(args.filename)
-    local sisfile = sis.parseSisFile(data, false)
+    local sisfile = sis.parseSisFile(data, args.verbose)
 
     if args.dest then
         installSis(sisfile, args.dest)
     else
-        describeSis(sisfile, "")
-        return
+        if args.json then
+            print(json.encode(makeManifest(sisfile, not args.nolangs)))
+        else
+            describeSis(sisfile, "")
+        end
     end
 end
 
 function describeSis(sisfile, indent)
+    for _, name in ipairs(sisfile.name) do
+        printf("%sName: %s\n", indent, name)
+    end
+
+    printf("%sVersion: %d.%d\n", indent, sisfile.version[1], sisfile.version[2])
+
+    printf("%sUid: 0x%08X\n", indent, sisfile.uid)
+
     for _, lang in ipairs(sisfile.langs) do
         printf("%sLanguage: 0x%04X (%s)\n", indent, lang, sis.Locales[lang])
     end
+
     local langIdx = sis.getBestLangIdx(sisfile.langs)
     for _, file in ipairs(sisfile.files) do
         local len
@@ -88,4 +103,70 @@ function extractFile(file, langIdx, dest)
     writeFile(outName, data)
 end
 
+function langListToLocaleMap(langs, list)
+    local result = {}
+    for i = 1, math.min(#langs, #list) do
+        local langName = sis.Locales[langs[i]]
+        if langName then
+            result[langName] = list[i]
+        else
+            io.stderr:write(string.format("Warning: Language 0x%x not recognized!\n", langs[i]))
+        end
+    end
+    return result
+end
+
+function makeManifest(sisfile, includeLangs)
+    local langIdx
+    if not includeLangs then
+        langIdx = sis.getBestLangIdx(sisfile.langs)
+    end
+
+    local result = {
+        name = includeLangs and json.Dict(langListToLocaleMap(sisfile.langs, sisfile.name)) or sisfile.name[langIdx],
+        version = string.format("%d.%d", sisfile.version[1], sisfile.version[2]),
+        uid = sisfile.uid,
+        languages = {},
+        files = json.Dict {},
+    }
+    for _, lang in ipairs(sisfile.langs) do
+        table.insert(result.languages, sis.Locales[lang])
+    end
+
+    for i, file in ipairs(sisfile.files) do
+        local f = {
+            type = sis.FileType[file.type]
+        }
+        if file.type ~= sis.FileType.FileNull then
+            f.src = file.src
+            if includeLangs then
+                f.len = {}
+                if file.langData then
+                    for i = 1, #sisfile.langs do
+                        f.len[sis.Locales[sisfile.langs[i]]] = #file.langData[i]
+                    end
+                else
+                    for i = 1, #sisfile.langs do
+                        f.len[sis.Locales[sisfile.langs[i]]] = #file.data
+                    end
+                end
+            else
+                f.len = #(file.data or file.langData[langIdx])
+            end
+        end
+        if file.type ~= sis.FileType.FileText then
+            f.dest = file.dest
+        end
+
+        if file.type == sis.FileType.SisComponent then
+            local componentSis = sis.parseSisFile(file.data)
+            f.sis = makeManifest(componentSis, includeLangs)
+        end
+
+        result.files[i] = f
+    end
+
+    return result
+end
+
 pcallMain()

src/init.lua

@@ -54,6 +54,13 @@ function enum(tbl)
     return result
 end
 
+json = {
+    dictHintMetatable = {},
+    null = function() error("json.null should never actually be called") end,
+    encode = function(val) return dump(val, "json") end,
+    Dict = function(tbl) return setmetatable(tbl, json.dictHintMetatable) end,
+}
+
 function printf(...)
     io.stdout:write(string.format(...))
 end

src/init_dump.lua

@@ -177,10 +177,7 @@ function dump(t, outputFormat, indent, indentChars, seenTables)
     local tableStart, tableEnd = "{", "}"
     if nkeys == 0 and outputFormat == "json" then
         -- Check if there's a hint to say that this should be a dict
-        if jsonDictHintMetatable == nil then
-            jsonDictHintMetatable = native.getJsonDictHintMetatable()
-        end
-        if getmetatable(t) == jsonDictHintMetatable then
+        if getmetatable(t) == json.dictHintMetatable then
             array = false
         end
     end

src/sis.lua

@@ -164,18 +164,21 @@ function parseSisFile(data, verbose)
 
     assert(instVer == 0x64, "Only ER5 SIS files are supported")
 
-    local options, type, verMaj, verMin, variant, langPtr, filesPtr, reqPtr, pos =
-        string.unpack("<I2I2I2I2I4I4I4I4", data, pos)
+    local options, type, verMaj, verMin, variant, langPtr, filesPtr, reqPtr, certPtr, namePtr, pos =
+        string.unpack("<I2I2I2I2I4I4I4I4I4I4", data, pos)
     if verbose then
-        printf("options=%d type=%d verMaj=%d verMin=%d variant=%d langPtr=0x%08X filesPtr=0x%08X reqPtr=0x%08X\n",
-            options, type, verMaj, verMin, variant, langPtr, filesPtr, reqPtr)
+        printf("options=%d type=%d verMaj=%d verMin=%d variant=%d langPtr=0x%08X filesPtr=0x%08X reqPtr=0x%08X certPtr=0x%08X namePtr=0x%08X \n",
+            options, type, verMaj, verMin, variant, langPtr, filesPtr, reqPtr, certPtr, namePtr)
     end
 
     assert(options & Options.IsUnicode == 0, "ER5U not supported!")
 
     local result = {
+        name = {},
         langs = {},
         files = {},
+        version = { verMaj, verMin },
+        uid = uid1,
     }
 
     pos = 1 + langPtr
@@ -198,6 +201,14 @@ function parseSisFile(data, verbose)
         end
         result.files[i] = file
     end
+
+    pos = 1 + namePtr
+    for i = 1, nLangs do
+        local len, ptr
+        len, ptr, pos = string.unpack("<I4I4", data, pos)
+        result.name[i] = data:sub(1 + ptr, ptr + len)
+    end
+
     return result
 end