Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lua/spec/array_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,18 @@ describe('array', function()
end)
end)

describe('ParseMultiSelect', function()
it('check', function()
local a = {'test1', 'test2', 'test3'}
assert.are_same(a, Array.parseMultiSelect('test1, test2,test3'))
assert.are_same(a, Array.parseMultiSelect('test1 - test2-test3', '-'))
assert.are_same(a, Array.parseMultiSelect('["test1", "test2", "test3"]'))
assert.error(function ()
return Array.parseMultiSelect('{"a":"test1","b":"test2","c":"test3"}')
end)
end)
end)

describe('Interleave', function ()
it('works', function()
assert.are_same({'a', ' ', 'b', ' ', 'c'}, Array.interleave({'a', 'b', 'c'}, ' '))
Expand Down
18 changes: 18 additions & 0 deletions lua/wikis/commons/Array.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
-- Please see https://github.com/Liquipedia/Lua-Modules to contribute
--

local Json = require('Module:Json')
local Logic = require('Module:Logic')
local Set = require('Module:Set')
local String = require('Module:StringUtils')
Expand Down Expand Up @@ -791,4 +792,21 @@ function Array.interleave(elements, x)
return ret
end

---@param inputString string?
---@param sep string?
---@return string[]
---@nodiscard
function Array.parseMultiSelect(inputString, sep)
local parsed = Json.parseIfTable(inputString)

if not parsed then
return Array.parseCommaSeparatedString(inputString, sep)
end

-- validate it actually is an array
assert(Array.isArray(parsed), '"inputString" could not be parsed to an array')

return parsed
end

return Array
2 changes: 1 addition & 1 deletion lua/wikis/commons/MatchTable.lua
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ function MatchTable:buildAdditionalConditions()
local getOrCondition = function(lpdbKey, input)
if Logic.isEmpty(input) then return end

conditions:add(ConditionUtil.anyOf(ColumnName(lpdbKey), Array.parseCommaSeparatedString(input)))
conditions:add(ConditionUtil.anyOf(ColumnName(lpdbKey), Array.parseMultiSelect(input)))
end

getOrCondition('liquipediatier', args.tier)
Expand Down
2 changes: 1 addition & 1 deletion lua/wikis/commons/ResultsTable/Base.lua
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ function BaseResultsTable:buildBaseConditions()

if args.tier then
conditions:add(
ConditionUtil.anyOf(ColumnName('liquipediatier'), Array.parseCommaSeparatedString(args.tier))
ConditionUtil.anyOf(ColumnName('liquipediatier'), Array.parseMultiSelect(args.tier))
)
end

Expand Down
Loading