Module:Flagg/sandbox2 - Revision history

Uzume: convert unnecessary global variables to local variables

2020-07-02T11:20:03Z

convert unnecessary global variables to local variables

← Previous revision		Revision as of 11:20, 2 July 2020
Line 140:		Line 140:

	function p.luaMain(frame,args)		function p.luaMain(frame,args)
	function emp2nil(x)		local function emp2nil(x)
	if x=="" then return nil else return x end		if x=="" then return nil else return x end
	end		end
	function space2emp(x)		local function space2emp(x)
	if string.find(x,"^%s*$") then return "" else return x end		if string.find(x,"^%s*$") then return "" else return x end
	end		end
	function nopx(x)		local function nopx(x)
	if x~=nil and (string.find(x,"^%d+$") or string.find(x,"^%d+px$")) then return string.gsub(x,"^(.*)px","%1") else return nil end		if x~=nil and (string.find(x,"^%d+$") or string.find(x,"^%d+px$")) then return string.gsub(x,"^(.*)px","%1") else return nil end
	end		end

Uzume: simplify removing dependency on Module:Redirect

2020-07-02T11:15:57Z

simplify removing dependency on Module:Redirect

← Previous revision		Revision as of 11:15, 2 July 2020
Line 278:		Line 278:
	text = preflink..namelink..sufflink		text = preflink..namelink..sufflink
	elseif mn=="d" then --data template		elseif mn=="d" then --data template
		⚫	local title = mw.title.new("Template:Country data "..country)
	--check if redirect		--check if redirect
			if title.isRedirect then
⚫	if ~~require('Module:Redirect')~~.~~luaIsRedirect~~("Template:Country data "..country) ~~then~~
	text = "<span class=\"plainlinks\">[".~~.mw~~.title~~.new("Template:Country data "..country)~~:fullUrl("redirect=no").." "..name.."]</span>"		text = "<span class=\"plainlinks\">["..title:fullUrl("redirect=no").." "..name.."]</span>"
	else		else
	text = "[[~~Template:Country data~~ "..~~country~~.."\|"..name.."]]"		text = "[["..title.fullText.."\|"..name.."]]"
	end		end
	elseif mn=="u" then --unlinked		elseif mn=="u" then --unlinked
Line 306:		Line 307:
	ilink = "\|link="..flink..(flink=="" and "" or fsec)		ilink = "\|link="..flink..(flink=="" and "" or fsec)
	elseif mi=="d" then --data template		elseif mi=="d" then --data template
		⚫	local title = mw.title.new("Template:Country data "..country)
	--check if redirect		--check if redirect
			if title.isRedirect then
⚫	if ~~require('Module:Redirect')~~.~~luaIsRedirect~~("Template:Country data "..country) ~~then~~
	ilink = "\|link=".~~.mw~~.title~~.new("Template:Country data "..country)~~:fullUrl("redirect=no")		ilink = "\|link="..title:fullUrl("redirect=no")
	else		else
	ilink = "\|link=~~Template:Country data~~ "..~~country~~		ilink = "\|link="..title.fullText
	end		end
	else --unlinked (default)		else --unlinked (default)

SiBr4 at 15:06, 26 June 2020

2020-06-26T15:06:24Z

← Previous revision		Revision as of 15:06, 26 June 2020
Line 56:		Line 56:


	local function getvar(data,key,~~fallBack~~,lastDefault)		local function getvar(data,key,variant,lastDefault)
	if key and #key > 0 then		if key and #key > 0 then
	if type(data) == "table" then		if type(data) == "table" then
		⚫	local subkey = ""
⚫	if ~~fallBack and~~ data['#default'] ~= nil then
	--remember default in case higher-level tables don't have one
⚫	lastDefault = data['#default']
⚫	end
⚫	local ~~subvar~~ = ""
	--check for key in data (with literal hyphens)		--check for key in data (with literal hyphens)
	while ~~key and~~ #key > 0 and data[key] == nil do		while #key > 0 and data[key] == nil do
	--remove last section of key and retry		--remove last section of key and retry
	key, trail = string.match(key,"^(.-)(%-?[^%-]*)$")		key, trail = string.match(key,"^(.-)(%-?[^%-]*)$")
			subkey = trail..subkey
		⚫	end
			if #key > 0 then --data[key] exists
			--return it or look for subkey in nested table
			return getvar(data[key],string.gsub(subkey,"^%-",""),variant,lastDefault)
			else --key not found
			return nil
			end
			else --no subtable
			return nil
			end
			elseif variant and #variant > 0 then --no key; look for variant
			if type(data) == "table" then
			--remember default to fall back to
		⚫	if data['#default'] ~= nil then
		⚫	lastDefault = data['#default']
			end
			local subvar = ""
			--check for variant in data (with literal hyphens)
			while #variant > 0 and data[variant] == nil do
			--remove last section of variant and retry
			variant, trail = string.match(variant,"^(.-)(%-?[^%-]*)$")
	subvar = trail..subvar		subvar = trail..subvar
	end		end
	if ~~key and~~ #~~key~~ > 0 then --data[~~key~~] exists		if #variant > 0 then --data[variant] exists
	--return it or look for subvar in nested table		--return it or look for subvar in nested table
	return getvar(data[~~key~~],string.gsub(subvar,"^%-","")~~,fallBack~~,lastDefault)		return getvar(data[variant],nil,string.gsub(subvar,"^%-",""),lastDefault)
	else --~~key~~ not found		else --variant not found
	return ~~ternary(fallBack,~~lastDefault~~,nil)~~		return lastDefault
	end		end
	else --value or nil		else --value or nil
	return ~~ternary(fallBack,~~data~~,nil)~~		return data
	end		end
	else --base case (no key); return data		else --base case (no key or variant); return data
	if type(data) == "table" then		if type(data) == "table" then
	return firstNonNil(data["#default"], ~~ternary(fallBack,~~lastDefault~~,nil)~~)		return firstNonNil(data["#default"], lastDefault)
	else --value or nil		else --value or nil
	return data		return data
Line 98:		Line 116:
	return "<span class='error'>"..data.error.."<span>"		return "<span class='error'>"..data.error.."<span>"
	end		end
	local value ~~= getvar(data,key,fallBack)~~		local value
			if fallBack then
			value = getvar(data,nil,key)
			else
			value = getvar(data,key,nil)
			end
	return value==nil and "nil" or value		return value==nil and "nil" or value
	end		end
Line 152:		Line 175:
	local age = args["age"] and "under-"..args["age"] or amap[avar].age or ""		local age = args["age"] and "under-"..args["age"] or amap[avar].age or ""
	asuf = amap[avar].altlink		asuf = amap[avar].altlink
	alink = getvar(data["link alias"],amap[avar].altvar) or (clink or data["shortname alias"] or data.alias or country).." "..asuf		alink = getvar(data,"link alias",amap[avar].altvar) or (clink or data["shortname alias"] or data.alias or country).." "..asuf
	alink = fillParams(alink,{age=age,mw=amap[avar].mw})		alink = fillParams(alink,{age=age,mw=amap[avar].mw})
	else		else
Line 187:		Line 210:
	local name = args["name"]		local name = args["name"]
	if not name then		if not name then
	local cname = string.find(me,"e") and (getvar(data["name alias"],amap[avar].altvar)		local cname = string.find(me,"e") and (getvar(data,"name alias",amap[avar].altvar)
	or data["shortname alias"] or data.alias) or country		or data["shortname alias"] or data.alias) or country
	if mn == "f" then		if mn == "f" then
Line 222:		Line 245:
	if yn_map[border]==0 then border = "" else border = "\|border" end		if yn_map[border]==0 then border = "" else border = "\|border" end
	else		else
	iname = getvar(data["flag alias"],amap[avar].altvar.."-"..variant~~,false~~)		iname = getvar(data,"flag alias-"..amap[avar].altvar.."-"..variant)
	or getvar(data["flag alias"],variant~~,true~~) ~~or placeholder -- order to be fixed~~		or getvar(data,"flag alias-"..variant)
			or getvar(data,"flag alias",amap[avar].altvar) or placeholder
	size = size or emp2nil(data.size) or "23x15px"		size = size or emp2nil(data.size) or "23x15px"
	if border then		if border then
	if yn_map[border]==0 then border = "" else border = "\|border" end		if yn_map[border]==0 then border = "" else border = "\|border" end
	else		else
	local autoborder = firstNonNil(getvar(data["border"],variant),		local autoborder = firstNonNil(getvar(data,"border-"..amap[avar].altvar.."-"..variant),
	getvar(data["border"~~],amap[avar]~~.~~altvar~~)~~) -- order to be fixed~~		getvar(data,"border-"..variant),
			getvar(data,"border",amap[avar].altvar))
	if autoborder == false then border = "" else border = "\|border" end		if autoborder == false then border = "" else border = "\|border" end
	end		end

SiBr4 at 20:53, 22 June 2020

2020-06-22T20:53:54Z

← Previous revision		Revision as of 20:53, 22 June 2020
Line 104:		Line 104:

	local function fillParams(str,values)		local function fillParams(str,values)
	return string.gsub(str, "%{%{%{([^%{%}%\|]+)(%\|?[^%{%}]-)%}%}%}", function(param,default)		return string.gsub(str, "%{%{%{([^%{%}%\|]+)(%\|?)([^%{%}]-)%}%}%}", function(param,pipe,default)
	if values[param] then		if values[param] then
	return values[param]		return values[param]
			elseif pipe ~= "" then
		⚫	return default
	else		else
		⚫	return "{{{"..param.."}}}"
	if #default == 0 then
⚫	return "{{{"..param.."}}}"
	else
⚫	return ~~string.gsub(~~default~~,"^%\|","")~~
	end
	end		end
	end		end)
	)
	end		end

Line 190:		Line 187:
	local name = args["name"]		local name = args["name"]
	if not name then		if not name then
	local cname = string.find(me,"e") and (getvar(data["name alias"],amap[avar].altvar) or data["shortname alias"] or data.alias) or country		local cname = string.find(me,"e") and (getvar(data["name alias"],amap[avar].altvar)
			or data["shortname alias"] or data.alias) or country
	if mn == "f" then		if mn == "f" then
	name = cname=="" and "" or space2emp((pref or "").." ")..nthe..cname..space2emp(" "..(suff or ""))		name = cname=="" and "" or space2emp((pref or "").." ")..nthe..cname..space2emp(" "..(suff or ""))

SiBr4: Catch non-existing data module

2020-06-22T15:03:19Z

Catch non-existing data module

← Previous revision		Revision as of 15:03, 22 June 2020
Line 31:		Line 31:
	country = redirs[country]		country = redirs[country]
	end		end
	~~return~~ mw.loadData("Module:Sandbox/Ahecht/flag/"..country)~~[country]~~		success, data = pcall(mw.loadData,"Module:Sandbox/Ahecht/flag/"..country)
			if success then
			return data[country]
			else --doesn't exist, return error message
			return {error=data}
			end
	end		end
	end		end
Line 90:		Line 95:
	local fallBack = require('Module:Yesno')(args[3])		local fallBack = require('Module:Yesno')(args[3])
	local data = loadCountryData(country)		local data = loadCountryData(country)
			if data.error then
			return "<span class='error'>"..data.error.."<span>"
			end
	local value = getvar(data,key,fallBack)		local value = getvar(data,key,fallBack)
	return value==nil and "nil" or value		return value==nil and "nil" or value
Line 135:		Line 143:
	--Get country data & altvar data		--Get country data & altvar data
	local data = args["nodata"] and {} or loadCountryData(country)		local data = args["nodata"] and {} or loadCountryData(country)
			if data.error then
			return "<span class='error'>"..data.error.."<span>"
			end
	local alink, amap, asuf		local alink, amap, asuf
	if avar then		if avar then

SiBr4: Redirects

2020-06-22T14:49:48Z

Redirects

@@ Line 20: / Line 20: @@
 	--Call main function
 	return p.luaMain(frame,args)
 end
@@ Line 76: / Line 89: @@
 	local key = args[2]
 	local fallBack = require('Module:Yesno')(args[3])
-	local data
+	local data = loadCountryData(country)
 	local value = getvar(data,key,fallBack)
 	return value==nil and "nil" or value
@@ Line 126: / Line 134: @@
 	--Get country data & altvar data
 	local alink, amap, asuf
 	if avar then

SiBr4 at 11:44, 20 June 2020

2020-06-20T11:44:34Z

← Previous revision		Revision as of 11:44, 20 June 2020
Line 134:		Line 134:
	local alink, amap, asuf		local alink, amap, asuf
	if avar then		if avar then
	local ~~age~~ = ~~args[~~"~~age"]~~ ~~or "~~"		local altData = mw.loadData("Module:Flagg/Altvar data/sandbox")
			amap = altData.map
	local aalias
	amap, aalias = require("Module:Flagg/Altvar data").alttable(age)
	avar = string.gsub(string.lower(avar or ""),"[ \-]","")		avar = string.gsub(string.lower(avar or ""),"[ \-]","")
	avar = ~~aalias~~[avar] or avar		avar = altData.aliases[avar] or avar
	if not amap[avar] then error("Unknown avar") end		if not amap[avar] then error("Unknown avar") end
			local age = args["age"] and "under-"..args["age"] or amap[avar].age or ""
	asuf = amap[avar].altlink		asuf = amap[avar].altlink
	alink = getvar(data["link alias"],amap[avar].altvar) or (clink or data["shortname alias"] or data.alias or country).." "..asuf		alink = getvar(data["link alias"],amap[avar].altvar) or (clink or data["shortname alias"] or data.alias or country).." "..asuf

SiBr4 at 11:22, 20 June 2020

2020-06-20T11:22:27Z

← Previous revision		Revision as of 11:22, 20 June 2020
Line 142:		Line 142:
	asuf = amap[avar].altlink		asuf = amap[avar].altlink
	alink = getvar(data["link alias"],amap[avar].altvar) or (clink or data["shortname alias"] or data.alias or country).." "..asuf		alink = getvar(data["link alias"],amap[avar].altvar) or (clink or data["shortname alias"] or data.alias or country).." "..asuf
	alink = fillParams(alink,{age=age})		alink = fillParams(alink,{age=age,mw=amap[avar].mw})
	else		else
	avar = ""		avar = ""

SiBr4 at 11:18, 20 June 2020

2020-06-20T11:18:16Z

← Previous revision		Revision as of 11:18, 20 June 2020
Line 88:		Line 88:

	local function fillParams(str,values)		local function fillParams(str,values)
	return string.gsub(str, "%{%{%{([^%{%}%\|]+)(\\|?[^%{%}]-)%}%}%}", function(param,default)		return string.gsub(str, "%{%{%{([^%{%}%\|]+)(%\|?[^%{%}]-)%}%}%}", function(param,default)
	if values[param] then		if values[param] then
	return values[param]		return values[param]

SiBr4 at 11:15, 20 June 2020

2020-06-20T11:15:02Z

← Previous revision		Revision as of 11:15, 20 June 2020
Line 90:		Line 90:
	return string.gsub(str, "%{%{%{([^%{%}%\|]+)(\\|?[^%{%}]-)%}%}%}", function(param,default)		return string.gsub(str, "%{%{%{([^%{%}%\|]+)(\\|?[^%{%}]-)%}%}%}", function(param,default)
	if values[param] then		if values[param] then
	return param		return values[param]
	else		else
	if #default == 0 then		if #default == 0 then