Module:Storm categories/sandbox - Revision history

Chlod: ensure category1 is not nil

2023-04-23T09:02:43Z

ensure category1 is not nil

← Previous revision		Revision as of 09:02, 23 April 2023
Line 90:		Line 90:
	local _category1 = p._normalizeId(category1)		local _category1 = p._normalizeId(category1)
	local _category2 = p._normalizeId(category2)		local _category2 = p._normalizeId(category2)
	return _category1 == _category2 or		return (_category1 == _category2 and _category1 ~= nil) or
	cats[ _category1 ] == cats[ _category2 ] and		cats[ _category1 ] == cats[ _category2 ] and
	-- `false` if categories are undefined and not equal.		-- `false` if categories are undefined and not equal.

Chlod: undo

2023-04-23T09:01:01Z

undo

← Previous revision		Revision as of 09:01, 23 April 2023
Line 91:		Line 91:
	local _category2 = p._normalizeId(category2)		local _category2 = p._normalizeId(category2)
	return _category1 == _category2 or		return _category1 == _category2 or
	cats[ _category1 ] == cats[ _category2 ]		cats[ _category1 ] == cats[ _category2 ] and
			-- `false` if categories are undefined and not equal.
			cats[ _category1 ] ~= nil
	end		end

Chlod: rm weird case

2023-04-23T09:00:00Z

rm weird case

← Previous revision		Revision as of 09:00, 23 April 2023
Line 90:		Line 90:
	local _category1 = p._normalizeId(category1)		local _category1 = p._normalizeId(category1)
	local _category2 = p._normalizeId(category2)		local _category2 = p._normalizeId(category2)
	~~-- `cats[~~ _category1 ~~] ~~~= ~~nil` checks if both categories are undefined~~ ~~(since~~		return _category1 == _category2 or
		⚫	cats[ _category1 ] == cats[ _category2 ]
	-- it is assumed that both table accesses return the same value)
⚫	~~return~~ cats[ _category1 ] == cats[ _category2 ] ~~and cats[ _category1 ] ~= nil~~
	end		end

Chlod: fix nil check

2023-04-23T08:58:17Z

fix nil check

← Previous revision		Revision as of 08:58, 23 April 2023
Line 90:		Line 90:
	local _category1 = p._normalizeId(category1)		local _category1 = p._normalizeId(category1)
	local _category2 = p._normalizeId(category2)		local _category2 = p._normalizeId(category2)
	-- `_category1 ~= nil` checks if both categories are undefined (since		-- `cats[ _category1 ] ~= nil` checks if both categories are undefined (since
	-- it is assumed that both table accesses return the same value)		-- it is assumed that both table accesses return the same value)
	return cats[ _category1 ] == cats[ _category2 ] and _category1 ~= nil		return cats[ _category1 ] == cats[ _category2 ] and cats[ _category1 ] ~= nil
	end		end

Chlod: nullIfMissing to nilIfMissing; cosmetic change because 'null' does not exist in Lua

2023-04-23T08:51:55Z

nullIfMissing to nilIfMissing; cosmetic change because 'null' does not exist in Lua

← Previous revision		Revision as of 08:51, 23 April 2023
Line 39:		Line 39:
	end		end

	function p._color(category, ~~nullIfMissing~~)		function p._color(category, nilIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local color = p._normalizeId(category, defaultCategory)		local color = p._normalizeId(category, defaultCategory)

	return colors[color] or ((cats[color] or (		return colors[color] or ((cats[color] or (
			nilIfMissing
	nullIfMissing
	and { color = nil }		and { color = nil }
	or cats[defaultCategory]		or cats[defaultCategory]
Line 50:		Line 50:
	end		end

	function p._name(category, basin, ~~nullIfMissing~~)		function p._name(category, basin, nilIfMissing)
	local name_def = (cats[		local name_def = (cats[
	p._normalizeId(category, defaultCategory)		p._normalizeId(category, defaultCategory)
	] or (~~nullIfMissing~~ and { name = nil } or cats[defaultCategory])).name		] or (nilIfMissing and { name = nil } or cats[defaultCategory])).name
	return type(name_def) == "table" and		return type(name_def) == "table" and
	(		(
	name_def[string.lower(basin or "default")]		name_def[string.lower(basin or "default")]
	or name_def["default"]		or name_def["default"]
	or (not ~~nullIfMissing~~ and error("No default name for basin-based category name.") or nil)		or (not nilIfMissing and error("No default name for basin-based category name.") or nil)
	)		)
	or name_def		or name_def
	end		end

	function p._sortkey(category, ~~nullIfMissing~~)		function p._sortkey(category, nilIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	return (cats[		return (cats[
	p._normalizeId(category, defaultCategory)		p._normalizeId(category, defaultCategory)
	] or (~~nullIfMissing~~ and { sortkey = nil } or cats[defaultCategory])).sortkey		] or (nilIfMissing and { sortkey = nil } or cats[defaultCategory])).sortkey
	end		end

	function p._icon(category, ~~nullIfMissing~~)		function p._icon(category, nilIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local icon = p._normalizeId(category, defaultCategory)		local icon = p._normalizeId(category, defaultCategory)
Line 76:		Line 76:
	return icons[icon] or (cats[icon] ~= nil and (		return icons[icon] or (cats[icon] ~= nil and (
	cats[icon].icon or cats["tropicalcyclone"].icon		cats[icon].icon or cats["tropicalcyclone"].icon
	) or (not ~~nullIfMissing~~ and cats[defaultCategory].icon) or nil)		) or (not nilIfMissing and cats[defaultCategory].icon) or nil)
	end		end

Chlod: fix nullIfMissing for _name

2023-04-23T08:51:04Z

fix nullIfMissing for _name

← Previous revision		Revision as of 08:51, 23 April 2023
Line 53:		Line 53:
	local name_def = (cats[		local name_def = (cats[
	p._normalizeId(category, defaultCategory)		p._normalizeId(category, defaultCategory)
	] or cats[defaultCategory]).name		] or (nullIfMissing and { name = nil } or cats[defaultCategory])).name
	return type(name_def) == "table" and		return type(name_def) == "table" and
	(		(

Chlod: fix lua error

2023-04-23T08:45:39Z

fix lua error

← Previous revision		Revision as of 08:45, 23 April 2023
Line 88:		Line 88:
	-- `false` will be returned if at least one of the categories are nil or		-- `false` will be returned if at least one of the categories are nil or
	-- if the category is not defined.		-- if the category is not defined.
	_category1 = p._normalizeId(category1)		local _category1 = p._normalizeId(category1)
	_category2 = p._normalizeId(category2)		local _category2 = p._normalizeId(category2)
	-- `_category1 ~= nil` checks if both categories are undefined (since		-- `_category1 ~= nil` checks if both categories are undefined (since
	-- it is assumed that both table accesses return the same value)		-- it is assumed that both table accesses return the same value)

Chlod: bad find and replace

2023-04-23T08:02:30Z

bad find and replace

← Previous revision		Revision as of 08:02, 23 April 2023
Line 41:		Line 41:
	function p._color(category, nullIfMissing)		function p._color(category, nullIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local color = p.~~normalizeId~~(category, defaultCategory)		local color = p._normalizeId(category, defaultCategory)

	return colors[color] or ((cats[color] or (		return colors[color] or ((cats[color] or (
Line 52:		Line 52:
	function p._name(category, basin, nullIfMissing)		function p._name(category, basin, nullIfMissing)
	local name_def = (cats[		local name_def = (cats[
	p.~~normalizeId~~(category, defaultCategory)		p._normalizeId(category, defaultCategory)
	] or cats[defaultCategory]).name		] or cats[defaultCategory]).name
	return type(name_def) == "table" and		return type(name_def) == "table" and
Line 66:		Line 66:
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	return (cats[		return (cats[
	p.~~normalizeId~~(category, defaultCategory)		p._normalizeId(category, defaultCategory)
	] or (nullIfMissing and { sortkey = nil } or cats[defaultCategory])).sortkey		] or (nullIfMissing and { sortkey = nil } or cats[defaultCategory])).sortkey
	end		end
Line 72:		Line 72:
	function p._icon(category, nullIfMissing)		function p._icon(category, nullIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local icon = p.~~normalizeId~~(category, defaultCategory)		local icon = p._normalizeId(category, defaultCategory)

	return icons[icon] or (cats[icon] ~= nil and (		return icons[icon] or (cats[icon] ~= nil and (
Line 88:		Line 88:
	-- `false` will be returned if at least one of the categories are nil or		-- `false` will be returned if at least one of the categories are nil or
	-- if the category is not defined.		-- if the category is not defined.
	_category1 = p.~~normalizeId~~(category1)		_category1 = p._normalizeId(category1)
	_category2 = p.~~normalizeId~~(category2)		_category2 = p._normalizeId(category2)
	-- `_category1 ~= nil` checks if both categories are undefined (since		-- `_category1 ~= nil` checks if both categories are undefined (since
	-- it is assumed that both table accesses return the same value)		-- it is assumed that both table accesses return the same value)

Chlod: add single ID normalizer

2023-04-23T08:01:47Z

add single ID normalizer

← Previous revision		Revision as of 08:01, 23 April 2023
Line 33:		Line 33:
	end		end

	function p.~~_color~~(~~colorCode~~, ~~nullIfMissing~~)		function p._normalizeId(category, fallback)
			-- Normalize if normalizable, fall back to default if not.
		⚫	return (category ~= nil and string.len(category) ~= 0) and
		⚫	string.gsub(string.lower(category), "[^%w]", "") or fallback
			end

			function p._color(category, nullIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local color = ~~(colorCode ~= nil and string~~.~~len~~(~~colorCode)~~ ~~~= 0~~) ~~and~~		local color = p.normalizeId(category, defaultCategory)
	string.gsub(string.lower(colorCode), "[^%w]", "")
⚫	or defaultCategory

	return colors[color] or ((cats[color] or (		return colors[color] or ((cats[color] or (
Line 48:		Line 52:
	function p._name(category, basin, nullIfMissing)		function p._name(category, basin, nullIfMissing)
	local name_def = (cats[		local name_def = (cats[
		⚫	p.normalizeId(category, defaultCategory)
⚫	(category ~= nil and string.len(category) ~= 0) and
⚫	string.gsub(string.lower(category), "[^%w]", "")
⚫	or defaultCategory
	] or cats[defaultCategory]).name		] or cats[defaultCategory]).name
	return type(name_def) == "table" and		return type(name_def) == "table" and
Line 64:		Line 66:
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	return (cats[		return (cats[
		⚫	p.normalizeId(category, defaultCategory)
	(category ~= nil and string.len(category) ~= 0) and
	string.gsub(string.lower(category), "[^%w]", "")
	or defaultCategory
	] or (nullIfMissing and { sortkey = nil } or cats[defaultCategory])).sortkey		] or (nullIfMissing and { sortkey = nil } or cats[defaultCategory])).sortkey
	end		end

	function p._icon(~~iconCode~~, nullIfMissing)		function p._icon(category, nullIfMissing)
	-- This looks confusing, but it's actually nested ternaries (for nil checks)		-- This looks confusing, but it's actually nested ternaries (for nil checks)
	local icon = ~~(iconCode ~= nil and string~~.~~len~~(~~iconCode)~~ ~~~= 0~~) ~~and~~		local icon = p.normalizeId(category, defaultCategory)
	string.gsub(string.lower(iconCode), "[^%w]", "")
	or defaultCategory

	return icons[icon] or (cats[icon] ~= nil and (		return icons[icon] or (cats[icon] ~= nil and (
Line 81:		Line 79:
	end		end

	function p._isEqual(~~iconCode1~~, ~~iconCode2~~)		function p._isEqual(category1, category2)
	-- Checks if two IDs are equal.		-- Checks if two IDs are equal.
	-- An {{#ifeq}} check does not consider aliases. This function compares two		-- An {{#ifeq}} check does not consider aliases. This function compares two
Line 90:		Line 88:
	-- `false` will be returned if at least one of the categories are nil or		-- `false` will be returned if at least one of the categories are nil or
	-- if the category is not defined.		-- if the category is not defined.
			_category1 = p.normalizeId(category1)
⚫	return cats[~~iconCode1~~] == cats[~~iconCode2~~] and ~~cats[iconCode1]~~ ~= nil
			_category2 = p.normalizeId(category2)
			-- `_category1 ~= nil` checks if both categories are undefined (since
			-- it is assumed that both table accesses return the same value)
		⚫	return cats[ _category1 ] == cats[ _category2 ] and _category1 ~= nil
	end		end

Chlod: add isEqual function

2023-04-23T07:49:42Z

add isEqual function

@@ Line 24: / Line 24: @@
 function p.icon(frame)
 	return p._icon(frame.args[1] or frame:getParent().args[1], false)
 end
@@ Line 72: / Line 79: @@
 		cats[icon].icon or cats["tropicalcyclone"].icon
 	) or (not nullIfMissing and cats[defaultCategory].icon) or nil)
 end