Module:InfoboxItem - Revision history

Evospace: Undo revision 5719 by Evospace (talk)

2025-08-02T10:16:52Z

@@ Line 89: / Line 89: @@
      return table.concat(out, '\n')
 end
@@ Line 102: / Line 117: @@
      end
-     local dictName = "Data/" .. itemModule .. "/InOutput"
+     local dictName = "Data/"..itemModule.."/InOutput"
      local success, recipes = pcall(mw.loadData, "Module:" .. dictName)
-     if not success or type(recipes) ~= "table" or next(recipes) == nil then
+     if not success or type(recipes) ~= "table" then
          return ""
      end
@@ Line 148: / Line 129: @@
      local out = {}
      table.insert(out, '{| class="infobox"')
      table.insert(out, '|-')
      table.insert(out, '| colspan="2" style="text-align:center;" | ' ..
          string.format('[[File:%s|64px|link=%s]] [[%s]]',
              imageName, pageName, pageName))
      table.insert(out, '|-')
-    table.insert(out, '! colspan="2" | Recipe input')
+     table.insert(out, '| colspan="2" style="text-align:center;" | ' .. renderRecipeInput(recipes[1]))
      table.insert(out, '|}')

Evospace: Undo revision 5720 by Evospace (talk)

2025-08-02T10:16:17Z

Undo revision 5720 by Evospace (talk)

← Older revision		Revision as of 10:16, 2 August 2025
Line 15:		Line 15:
	local result = {}		local result = {}
	if not tbl then return result end		if not tbl then return result end
	for _, v in pairs(tbl) do		for k, v in pairs(tbl) do
			-- Каждая строка тоже может быть ассоциативной таблицей
	if type(v) == "table" then		if type(v) == "table" then
	local name = v[1] or v.name or v["1"]		local name = v[1] or v.name or v["1"]
	local count = v[2] or v.count or v["2"] or 1		local count = v[2] or v.count or v["2"] or 1
	~~if name and name ~= "" then~~		table.insert(result, {name, count})
	table.insert(result, {name, count})
	~~end~~
	end		end
	end		end
Line 70:		Line 69:
	local out = {}		local out = {}
	table.insert(out, '{\| class="infobox"')		table.insert(out, '{\| class="infobox"')

			-- Первая строка: объединённая ячейка, иконка + название со ссылками
	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..		table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..
	string.format('[[File:%s\|64px\|link=%s]] [[%s]]', imageName, pageName, pageName))		string.format('[[File:%s\|64px\|link=%s]] [[%s]]',
			imageName, pageName, pageName))

			-- Остальные поля
	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '! Category')		table.insert(out, '! Category')
Line 83:		Line 87:
	table.insert(out, '\| ' .. (data.StackSize or ''))		table.insert(out, '\| ' .. (data.StackSize or ''))
	table.insert(out, '\|}')		table.insert(out, '\|}')

	return table.concat(out, '\n')		return table.concat(out, '\n')
	end		end
Line 103:		Line 108:
	end		end

	-- Берём первый рецепт		-- Берём первый рецепт из таблицы (работает и для массивов, и для словарей)
	local firstRecipe = recipes[1]		local firstRecipe
	~~if not firstRecipe then~~		if recipes[1] then
			firstRecipe = recipes[1]
			else
	for _, v in pairs(recipes) do		for _, v in pairs(recipes) do
	firstRecipe = v		firstRecipe = v
Line 111:		Line 118:
	end		end
	end		end

			-- Если нет корректных данных – пропускаем
	if type(firstRecipe) ~= "table" then		if type(firstRecipe) ~= "table" then
	return ""		return ""
	end		end

	local inputs = normalizeArray(~~firstRecipe~~.input)		local function renderRecipeInput(recipe)
			local inputs = normalizeArray(recipe.input)
			if #inputs == 0 then
			return "—"
			end

			local parts = {}
			for _, ing in ipairs(inputs) do
			table.insert(parts,
			string.format("[[File:T_%s.png\|22px]] [[%s]] × %s",
			ing[1],
			splitCamelCase(ing[1]),
			tostring(ing[2])
			)
			)
			end
			return table.concat(parts, "<br/>")
			end

	local pageName = splitCamelCase(itemModule)		local pageName = splitCamelCase(itemModule)
Line 124:		Line 150:
	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..		table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..
	string.format('[[File:%s\|64px\|link=%s]] [[%s]]', imageName, pageName, pageName))		string.format('[[File:%s\|64px\|link=%s]] [[%s]]',
			imageName, pageName, pageName))

	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '! colspan="2" \| Recipe input')		table.insert(out, '! colspan="2" \| Recipe input')
			table.insert(out, '\|-')
			table.insert(out, '\| colspan="2" style="text-align:center;" \| ' .. renderRecipeInput(firstRecipe))
			table.insert(out, '\|}')

	~~if #inputs == 0 then~~
	~~table.insert(out, '\|-')~~
	~~table.insert(out, '\| colspan="2" style="text-align:center;" \| —')~~
	~~else~~
	~~for _, ing in ipairs(inputs) do~~
	~~table.insert(out, '\|-')~~
	~~table.insert(out, string.format('\| [[File:T_%s.png\|22px]] \|\| [[%s]] × %s',~~
	~~ing[1],~~
	~~splitCamelCase(ing[1]),~~
	~~tostring(ing[2])~~
	))
	~~end~~
	~~end~~

	~~table.insert(out, '\|}')~~
	return table.concat(out, '\n')		return table.concat(out, '\n')
	end		end

	return p		return p

Evospace at 10:14, 2 August 2025

2025-08-02T10:14:07Z

← Older revision		Revision as of 10:14, 2 August 2025
Line 15:		Line 15:
	local result = {}		local result = {}
	if not tbl then return result end		if not tbl then return result end
	for k, v in pairs(tbl) do		for _, v in pairs(tbl) do
	~~-- Каждая строка тоже может быть ассоциативной таблицей~~
	if type(v) == "table" then		if type(v) == "table" then
	local name = v[1] or v.name or v["1"]		local name = v[1] or v.name or v["1"]
	local count = v[2] or v.count or v["2"] or 1		local count = v[2] or v.count or v["2"] or 1
	table.insert(result, {name, count})		if name and name ~= "" then
			table.insert(result, {name, count})
			end
	end		end
	end		end
Line 69:		Line 70:
	local out = {}		local out = {}
	table.insert(out, '{\| class="infobox"')		table.insert(out, '{\| class="infobox"')

	~~-- Первая строка: объединённая ячейка, иконка + название со ссылками~~
	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..		table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..
	string.format('[[File:%s\|64px\|link=%s]] [[%s]]',		string.format('[[File:%s\|64px\|link=%s]] [[%s]]', imageName, pageName, pageName))
	imageName, pageName, pageName))

	~~-- Остальные поля~~
	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '! Category')		table.insert(out, '! Category')
Line 87:		Line 83:
	table.insert(out, '\| ' .. (data.StackSize or ''))		table.insert(out, '\| ' .. (data.StackSize or ''))
	table.insert(out, '\|}')		table.insert(out, '\|}')

	return table.concat(out, '\n')		return table.concat(out, '\n')
	end		end
Line 108:		Line 103:
	end		end

	-- Берём первый рецепт ~~из таблицы (работает и для массивов, и для словарей)~~		-- Берём первый рецепт
	local ~~firstRecipe~~		local firstRecipe = recipes[1]
	~~if recipes[1] then~~		if not firstRecipe then
	firstRecipe = recipes[1]
	~~else~~
	for _, v in pairs(recipes) do		for _, v in pairs(recipes) do
	firstRecipe = v		firstRecipe = v
Line 118:		Line 111:
	end		end
	end		end

	~~-- Если нет корректных данных – пропускаем~~
	if type(firstRecipe) ~= "table" then		if type(firstRecipe) ~= "table" then
	return ""		return ""
	end		end

	~~local function renderRecipeInput(recipe)~~		local inputs = normalizeArray(firstRecipe.input)
	local inputs = normalizeArray(~~recipe~~.input)
	~~if #inputs == 0 then~~
	~~return "—"~~
	~~end~~

	~~local parts = {}~~
	~~for _, ing in ipairs(inputs) do~~
	~~table.insert(parts,~~
	~~string.format("[[File:T_%s.png\|22px]] [[%s]] × %s",~~
	~~ing[1],~~
	~~splitCamelCase(ing[1]),~~
	~~tostring(ing[2])~~
	)
	)
	~~end~~
	~~return table.concat(parts, "<br/>")~~
	~~end~~

	local pageName = splitCamelCase(itemModule)		local pageName = splitCamelCase(itemModule)
Line 150:		Line 124:
	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..		table.insert(out, '\| colspan="2" style="text-align:center;" \| ' ..
	string.format('[[File:%s\|64px\|link=%s]] [[%s]]',		string.format('[[File:%s\|64px\|link=%s]] [[%s]]', imageName, pageName, pageName))
	imageName, pageName, pageName))

	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '! colspan="2" \| Recipe input')		table.insert(out, '! colspan="2" \| Recipe input')
	table.insert(out, '\|-')
	table.insert(out, '\| colspan="2" style="text-align:center;" \| ' .. ~~renderRecipeInput~~(~~firstRecipe~~))		if #inputs == 0 then
			table.insert(out, '\|-')
			table.insert(out, '\| colspan="2" style="text-align:center;" \| —')
			else
			for _, ing in ipairs(inputs) do
			table.insert(out, '\|-')
			table.insert(out, string.format('\| [[File:T_%s.png\|22px]] \|\| [[%s]] × %s',
			ing[1],
			splitCamelCase(ing[1]),
			tostring(ing[2])
			))
			end
			end

	table.insert(out, '\|}')		table.insert(out, '\|}')

	return table.concat(out, '\n')		return table.concat(out, '\n')
	end		end

	return p		return p

Evospace at 10:12, 2 August 2025

2025-08-02T10:12:53Z

@@ Line 89: / Line 89: @@
      return table.concat(out, '\n')
 end
@@ Line 117: / Line 102: @@
      end
-     local dictName = "Data/"..itemModule.."/InOutput"
+     local dictName = "Data/" .. itemModule .. "/InOutput"
-     local success, recipes = pcall(mw.loadData, "Module:" .. dictName)
+     -- Если нет корректных данных – пропускаем
-     if not success or type(recipes) ~= "table" then
+     if type(firstRecipe) ~= "table" then
          return ""
      end
@@ Line 129: / Line 148: @@
      local out = {}
      table.insert(out, '{| class="infobox"')
      table.insert(out, '|-')
      table.insert(out, '| colspan="2" style="text-align:center;" | ' ..
@@ Line 136: / Line 153: @@
              imageName, pageName, pageName))
      table.insert(out, '|-')
-     table.insert(out, '| colspan="2" style="text-align:center;" | ' .. renderRecipeInput(recipes[1]))
+    table.insert(out, '! colspan="2" | Recipe input')
      table.insert(out, '|}')

Evospace at 10:10, 2 August 2025

2025-08-02T10:10:29Z

← Older revision		Revision as of 10:10, 2 August 2025
Line 98:		Line 98:
	if #inputs > 0 then		if #inputs > 0 then
	for _, ing in ipairs(inputs) do		for _, ing in ipairs(inputs) do
	str = str .. string.format("[[File:T_%s.png\|22px]]", ing[1]) .. string.format("[[%s]] × %s", splitCamelCase(ing[1]), tostring(ing[2])) .. "\n"		str = str .. string.format("[[File:T_%s.png\|22px]]", ing[1]) .. string.format("[[%s]] × %s", splitCamelCase(ing[1]), tostring(ing[2])) .. "\n\n"
	end		end
	else		else

Evospace at 10:09, 2 August 2025

2025-08-02T10:09:23Z

← Older revision		Revision as of 10:09, 2 August 2025
Line 10:		Line 10:
	end		end
	return nil		return nil
			end

			local function normalizeArray(tbl)
			local result = {}
			if not tbl then return result end
			for k, v in pairs(tbl) do
			-- Каждая строка тоже может быть ассоциативной таблицей
			if type(v) == "table" then
			local name = v[1] or v.name or v["1"]
			local count = v[2] or v.count or v["2"] or 1
			table.insert(result, {name, count})
			end
			end
			table.sort(result, function(a,b) return tostring(a[1]) < tostring(b[1]) end)
			return result
	end		end

Line 77:		Line 92:

	local function renderRecipeInput(recipe)		local function renderRecipeInput(recipe)
	local inputs = recipe.input		local inputs = normalizeArray(recipe.input)
	local tableNode = mw.html.create("table")		local tableNode = mw.html.create("table")
	:addClass("recipe-table")		:addClass("recipe-table")

Evospace at 10:06, 2 August 2025

2025-08-02T10:06:42Z

← Older revision		Revision as of 10:06, 2 August 2025
Line 102:		Line 102:
	end		end

	local dictName = "Data/"..~~frame.args[1]~~.."/InOutput"		local dictName = "Data/"..itemModule.."/InOutput"

	local success, recipes = pcall(mw.loadData, "Module:" .. dictName)		local success, recipes = pcall(mw.loadData, "Module:" .. dictName)

Evospace at 10:04, 2 August 2025

2025-08-02T10:04:48Z

← Older revision		Revision as of 10:04, 2 August 2025
Line 77:		Line 77:

	local function renderRecipeInput(recipe)		local function renderRecipeInput(recipe)
	local inputs = ~~normalizeArray(~~recipe.input)		local inputs = recipe.input
	local tableNode = mw.html.create("table")		local tableNode = mw.html.create("table")
	:addClass("recipe-table")		:addClass("recipe-table")

Evospace at 10:03, 2 August 2025

2025-08-02T10:03:36Z

← Older revision		Revision as of 10:03, 2 August 2025
Line 124:		Line 124:

	table.insert(out, '\|-')		table.insert(out, '\|-')
	table.insert(out, '\| colspan="2" style="text-align:center;" \| ' .. renderRecipeInput(recipes[0]))		table.insert(out, '\| colspan="2" style="text-align:center;" \| ' .. renderRecipeInput(recipes[1]))
	table.insert(out, '\|}')		table.insert(out, '\|}')

Evospace at 10:01, 2 August 2025

2025-08-02T10:01:54Z

@@ Line 76: / Line 76: @@
 end
-function p.show_open(frame)
+local function renderRecipeInput(recipe)
      local itemModule = frame.args[1]
      if not itemModule or itemModule == "" then
@@ Line 84: / Line 99: @@
      local data = safeLoadData(itemModule)
      if not data then
          return ""
      end
@@ Line 98: / Line 120: @@
          string.format('[[File:%s|64px|link=%s]] [[%s]]',
              imageName, pageName, pageName))
      return table.concat(out, '\n')