Module:DPLlua - Revision history

Cronos: 6 revisions imported

2026-08-25T17:12:50Z

6 revisions imported

← Older revision		Revision as of 17:12, 25 August 2026
(No difference)

osrsw>Cook Me Plox: zunky tunky

2023-06-14T08:36:15Z

zunky tunky

← Older revision		Revision as of 08:36, 14 June 2023
Line 422:		Line 422:
	-- namespace = '',		-- namespace = '',
	-- ignorecase = 'true',		-- ignorecase = 'true',
	-- uses = 'Template:~~Databox~~ Recipe',		-- uses = 'Template:Infobox Recipe',
	-- count = 50,		-- count = 50,
	-- include = '{~~Databox~~ Recipe},{Infobox Item}',		-- include = '{Infobox Recipe},{Infobox Item}',
	-- allowcachedresults = false		-- allowcachedresults = false
	-- })		-- })
Line 432:		Line 432:
	-- local a = dpl.ask{		-- local a = dpl.ask{
	-- namespace = '',		-- namespace = '',
	-- uses = 'Template:~~Databox~~ Recipe',		-- uses = 'Template:Infobox Recipe',
	-- include = '{~~Databox~~ Recipe}:skill:name,{Infobox Item}:update,{Infobox Item\|test}',		-- include = '{Infobox Recipe}:skill:name,{Infobox Item}:update,{Infobox Item\|test}',
	-- count = 50,		-- count = 50,
	-- ordermethod = 'title',		-- ordermethod = 'title',

osrsw>CephHunter: Sync with rsw

2022-10-28T22:47:05Z

Sync with rsw

Diff

osrsw>Habblet: merge changes from rsw:Module:DPLlua

2020-08-31T16:18:20Z

merge changes from rsw:Module:DPLlua

← Older revision		Revision as of 16:18, 31 August 2020
Line 12:		Line 12:
	local function split( str, pattern, plain )		local function split( str, pattern, plain )
	local res = {}		local res = {}
	continue = true		local continue = true
	local startIndex = 1		local startIndex = 1

Line 36:		Line 36:
	local escapeChars = {		local escapeChars = {
	['{'] = '{',		['{'] = '{',
	['~~\180~~'] = '{', -- Wtf dpl...		['❴'] = '{', -- Wtf dpl...
	['}'] = '}',		['}'] = '}',
	['~~\181~~'] = '&#125~~;',~~		['❵'] = '}',
	~~['\147'] = '&ndash~~;',
	['['] = '[',		['['] = '[',
	[']'] = ']',		[']'] = ']',
	['\|'] = '\|',		['\|'] = '\|',
	['-'] = '‐',		['-'] = '‐'
	~~['\226'] = '',~~
	~~['\157'] = '',~~
	~~['\128'] = '~~'
	}		}
	local function escape( str )		local function escape( str )
	-- the \226\157\180\181 are used to match ❴ (U+2774) and ❵ (U+2775) wich are 3 bytes long (UTF-8) so		-- the \226\157\180\181 are used to match ❴ (U+2774) and ❵ (U+2775) wich are 3 bytes long (UTF-8) so
	-- we can't use them directly inside [] patterns. Ustring would fix this but it's way too slow.		-- we can't use them directly inside [] patterns. Ustring would fix this but it's way too slow.
	~~-- \226\128\147 used to match – (U+2013)~~		str = string.gsub( str, '[{}%[%]\|%-]', escapeChars ):gsub( '\226\157[\180\181]', escapeChars )
	str = string.gsub( str, '[{}%[%]\|%-\226\157~~\128~~\180\181~~\147~~]', escapeChars )
	return str		return str
	end		end
Line 221:		Line 216:
	query = query:gsub( '<p>Extension:DynamicPageList .-</p>', function(item) res.error = item; return '' end )		query = query:gsub( '<p>Extension:DynamicPageList .-</p>', function(item) res.error = item; return '' end )

	if query:~~match~~( '^@@' ) then -- @@ is used when no result is found		if query:find( '^@@' ) then -- @@ is used when no result is found
	return res		return res
	end		end
Line 239:		Line 234:

	for _, v in ipairs( query ) do		for _, v in ipairs( query ) do
	if v:~~match~~( '%S' ) then		if v:find( '%S' ) and not v:find( '^@@' ) then
	v = trim( v )		v = trim( v )
	local title = v:match( '^\|%[%[(.-)\|' )		local title = v:match( '^\|%[%[(.-)\|' )
Line 269:		Line 264:

	if dataItem ~= '' then		if dataItem ~= '' then
	dataItem = split( dataItem, '\n%s*§' )		dataItem = split( dataItem:sub( 3 ), '§' ) -- The sub(3) removes the first § at the start. § is 2 bytes wide so start at index 3

	for i, item in ipairs( dataItem ) do		for i, item in ipairs( dataItem ) do
	~~if i == 1 then -- First item doesn't start with a \n so it still has § in front of it~~
	~~item = item:sub( 3 )~~
	~~end~~

	if item:find( '=' ) then -- Check if the parameter is named or unnamed		if item:find( '=' ) then -- Check if the parameter is named or unnamed
	local param, value = item:match( '^%s(.-)%s=%s(.-)%s$' )		local param, value = item:match( '^%s(.-)%s=%s(.-)%s$' )

osrsw>CephHunter at 15:20, 18 April 2020

2020-04-18T15:20:18Z

Diff

osrsw>CephHunter at 12:48, 15 March 2020

2020-03-15T12:48:09Z

← Older revision		Revision as of 12:48, 15 March 2020
Line 1:		Line 1:
	-- <nowiki>		-- <nowiki>
	local dpl = {}		local dpl = {}
			local checkType = require( 'libraryUtil' ).checkType

	dpl.pipe = '¦'		dpl.pipe = '¦'
Line 197:		Line 198:
	local _usesInclude = table.remove( usesInclude, 1 )		local _usesInclude = table.remove( usesInclude, 1 )
	local res = {}		local res = {}

			query = query:gsub( '<p>Extension:DynamicPageList .-</p>', function(item) res.error = item; return '' end)

	if not query:match( '^@@' ) then -- @@ is used when no result is found		if not query:match( '^@@' ) then -- @@ is used when no result is found
	if _usesInclude then		if _usesInclude then
			query = query:gsub( '\127\'"`UNIQ%-%-nowiki%-%x+%-QINU`"\'\127', function(item) return '<nowiki>' .. item .. '</nowiki>' end ) -- Unstrip nowiki so we can clean their content
			query = mw.text.unstripNoWiki( query )
	query = query:gsub( dataContentMarker..'(.-)'..dataContentMarker, escape )		query = query:gsub( dataContentMarker..'(.-)'..dataContentMarker, escape )
	query = query:gsub( '{\|.-\|%-', '') -- Remove the header of the table		query = query:gsub( '{\|.-\|%-', '') -- Remove the header of the table
Line 206:		Line 211:
	query = query:gsub( '\|}', '\|-' )		query = query:gsub( '\|}', '\|-' )
	end		end

	query = trim( query )		query = trim( query )
	query = split( query, '\|-', true ) -- Results of the returned pages are separated by \|-		query = split( query, '\|-', true ) -- Results of the returned pages are separated by \|-

	for _, v in ipairs( query ) do		for _, v in ipairs( query ) do
	if v:match( '%S' ) then		if v:match( '%S' ) then
Line 215:		Line 220:
	local title = v:match( '^\|%[%[(.-)\|' )		local title = v:match( '^\|%[%[(.-)\|' )
	local dataList = v:match( '^\|.-\|.-\|(.*)' ) -- This is everything after the title		local dataList = v:match( '^\|.-\|.-\|(.*)' ) -- This is everything after the title

	if not _usesInclude then		if not _usesInclude then
	if title and title ~= '' then		if title and title ~= '' then
Line 224:		Line 229:
	dataList = split( dataList, '\|', true )		dataList = split( dataList, '\|', true )
	local _dataList = {}		local _dataList = {}

	for _, dataItem in ipairs( dataList ) do		for _, dataItem in ipairs( dataList ) do
	dataItem = unEscape( dataItem )		dataItem = unEscape( dataItem )
Line 234:		Line 239:
	dataItem = dataItem:gsub( '%b{}', function(x) return x:gsub( '§', '\|' ) end ) -- Restore pipe characters inside links and templates		dataItem = dataItem:gsub( '%b{}', function(x) return x:gsub( '§', '\|' ) end ) -- Restore pipe characters inside links and templates
	dataItem = dataItem:gsub( '%b[]', function(x) return x:gsub( '§', '\|' ) end )		dataItem = dataItem:gsub( '%b[]', function(x) return x:gsub( '§', '\|' ) end )
			dataItem = dataItem:gsub( '<nowiki>(.-)</nowiki>', function(x) return mw.getCurrentFrame():extensionTag( 'nowiki', x ) end ) -- Restrip nowiki
	dataItem = trim( dataItem )		dataItem = trim( dataItem )

	if dataItem:match( '§' ) then -- Check if we included a template		if dataItem:match( '^§' ) then -- Check if we included a full template
	dataItem = split( dataItem, '§', true )		dataItem = split( dataItem, '\n§', true )
	local _dataItem = {}		local _dataItem = {}

	for i, item in ipairs( dataItem ) do		for i, item in ipairs( dataItem ) do
	if i ~= 1 then -- ~~skip first~~ item ~~as it is a false empty string created by splitting on § when the string started~~ with a §		if i == 1 then -- First item doesn't start with a \n so it still has § in front of it
	if item:find( '=' ) then -- Check if the parameter is named or unnamed		item = item:sub( 3 )
	local param, value = item:match( '^%s(.-)%s=%s(.-)%s$' )		end
	_dataItem[ param ] = value
	else		if item:find( '=' ) then -- Check if the parameter is named or unnamed
	table.insert( _dataItem, trim( item ) )		local param, value = item:match( '^%s(.-)%s=%s(.-)%s$' )
	~~end~~		_dataItem[ param ] = value
			else
			table.insert( _dataItem, trim( item ) )
	end		end
	end		end

	dataItem = _dataItem		dataItem = _dataItem
	end		end

	table.insert( _dataList, dataItem )		table.insert( _dataList, dataItem )
	end		end

	if title and title ~= '' then		if title and title ~= '' then
	table.insert( res, { title=title, include=_dataList } )		table.insert( res, { title=title, include=_dataList } )
Line 274:		Line 282:

	for i = 1, #queries do		for i = 1, #queries do
			checkType( 'Module:DPLlua.ask', i, queries[i], 'table' )
	removeFormattingSettings( queries[i] )		removeFormattingSettings( queries[i] )
	queries[i] = formatDpl( queries[i] )		queries[i] = formatDpl( queries[i] )

osrsw>CephHunter: Created page with "-- local dpl = {} dpl.pipe = '¦' local dataContentMarker = '`#@@#`' local usesInclude = {} -- Custom function for splitting a string because mw.text.split() is waa..."

2020-03-08T02:25:28Z

Created page with "-- <nowiki> local dpl = {} dpl.pipe = '¦' local dataContentMarker = '`#@@#`' local usesInclude = {} -- Custom function for splitting a string because mw.text.split() is waa..."

New page

-- <nowiki>
local dpl = {}

dpl.pipe = '¦'
local dataContentMarker = '`#@@#`'
local usesInclude = {}

-- Custom function for splitting a string because mw.text.split() is waaay too slow
local function split( str, pattern, plain )
local res = {}
continue = true
local startIndex = 1

while continue do
local i, j = string.find( str, pattern, startIndex, plain )
if i then
table.insert( res, string.sub( str, startIndex, i-1 ) )
startIndex = j + 1
else
table.insert( res, string.sub( str, startIndex ) )
continue = false
end
end

return res
end

-- Also custom function for speed
local function trim( str )
return string.match( str, '^%s*(.-)%s*$' )
end

local escapeChars = {
['{'] = '{',
['\180'] = '{', -- Wtf dpl...
['}'] = '}',
['\181'] = '}',
['['] = '[',
[']'] = ']',
['|'] = '|',
['-'] = '‐',
['\226'] = '',
['\157'] = '',
}
local function escape( str )
-- the \226\157\180\181 are used to match ❴ (U+E29DB4) and ❵ (U+E29DB5) wich are 3 bytes long so
-- we can't use them directly inside [] patterns. Ustring would fix this but it's way too slow.
str = string.gsub( str, '[{}%[%]|%-\226\157\180\181]', escapeChars )
return str
end

local unEscapeChars = {
['{'] = '{',
['}'] = '}',
['['] = '[',
[']'] = ']',
['|'] = '|',
['‐'] = '-'
}
local function unEscape( str )
str = string.gsub( str, '&#%d+;', unEscapeChars )
return str
end

local function removeFormattingSettings( query )
local toRemove = {
'mode',
'table',
'tablerow',
'tablesortcol',
'headingmode',
'headingcount',
'listattr',
'itemattr',
'hlistattr',
'hitemattr',
'userdateformat',
'shownamespace',
'escapelinks',
'titlemaxlength',
'replaceintitle',
'columns',
'rows',
'rowsize',
'rowcolformat',
'resultsheader',
'resultsfooter',
'oneresultheader',
'oneresultfooter',
'noresultsheader',
'suppresserrors',
'noresultsfooter',
'format'
}

for _, k in ipairs( toRemove ) do
query[k] = nil
end
end

local function formatInclude( query )
query = split( query, ',', true )
local count = #query

for i = 1, #query do
if query[i]:match( '%b{}' ) then -- Check if we are including a template
local templateName, params = query[i]:match( '{(.-)[¦|}]([^,]*)' )
if params:find( '%S' ) then
params:gsub( '^:%-', '' )
query[i] = string.format( '{%s}%s', templateName, params )
for _ in params:gmatch( ':' ) do
count = count + 1
end
else
query[i] = string.format( '{%s¦DPLlua helper}', templateName ) -- Use a helper template to get all the parameters of our included template
end
end
end

return table.concat( query, ',' ), count
end

local function formatDpl( query )
local queries = {}
local count = query.count or 500
local offset = query.offset or 0
local _usesInclude = false
query.count = nil
query.offset = nil

-- We use table format when the include parameter is used to make sure we can
-- differentiate between the results in case more than one item is included
local dplStringInclude =
[=[
{{#dpl:
|noresultsheader = @@
|count=%s
|offset=%s
|%s
|table=,
|tablerow=%s
}}]=]

-- Table format requires an include statement so we use format instead.
-- This is also a lot faster than adding an empty include statement
local dplStringNoInclude =
[=[
{{#dpl:
|noresultsheader = @@
|count=%s
|offset=%s
|%s
|format=,¦-¦[[%%PAGE%%¦]],,
}}]=]

-- Auto generate more than one dpl if count > 500
-- The results of these are later combined
for i = 1, math.ceil( count / 500 ) do
local params = {}
local includeCount = 0

for k, v in pairs( query ) do
if k == 'include' then
v, includeCount = formatInclude( v )
_usesInclude = true
end
table.insert( params, k .. '=' .. tostring( v ):gsub( '|', '¦' ) )
end

if _usesInclude then
table.insert( queries, string.format(
dplStringInclude,
count > 500 and 500 or count,
offset,
table.concat( params, '\n|' ),
string.rep( dataContentMarker..'%%'..dataContentMarker..',', includeCount )
) )
else
table.insert( queries, string.format(
dplStringNoInclude,
count > 500 and 500 or count,
offset,
table.concat( params, '\n|' )
) )
end

count = count - 500
offset = offset + 500
end

table.insert( usesInclude, _usesInclude )

return table.concat( queries )
end

local function toTable( query )
local _usesInclude = table.remove( usesInclude, 1 )
local res = {}

if not query:match( '^@@' ) then -- @@ is used when no result is found
if _usesInclude then
query = query:gsub( dataContentMarker..'(.-)'..dataContentMarker, escape )
query = query:gsub( '{|.-|%-', '') -- Remove the header of the table
-- Replace the footer of the table width a row indicator. This effectively
-- combines the output of multiple dpl queries when count > 500
query = query:gsub( '|}', '|-' )
end

query = trim( query )
query = split( query, '|-', true ) -- Results of the returned pages are separated by |-

for _, v in ipairs( query ) do
if v:match( '%S' ) then
v = trim( v )
local title = v:match( '^|%[%[(.-)|' )
local dataList = v:match( '^|.-|.-|(.*)' ) -- This is everything after the title

if not _usesInclude then
if title and title ~= '' then
table.insert( res, title )
end
else
-- When multiple includes are used (e.g. include={Template1},{Template2}) its results are separated by a pipe
dataList = split( dataList, '|', true )
local _dataList = {}

for _, dataItem in ipairs( dataList ) do
dataItem = unEscape( dataItem )
-- When we include an entire template we use the %ARGS% parameter supplied by dpl.
-- However all | characters are repaced with §, e.g.:
-- §nameLessParam
-- §param = text [[wowee§link text]]
-- §param2 = text {{something§something else}}
dataItem = dataItem:gsub( '%b{}', function(x) return x:gsub( '§', '|' ) end ) -- Restore pipe characters inside links and templates
dataItem = dataItem:gsub( '%b[]', function(x) return x:gsub( '§', '|' ) end )
dataItem = trim( dataItem )

if dataItem:match( '§' ) then -- Check if we included a template
dataItem = split( dataItem, '§', true )
local _dataItem = {}

for i, item in ipairs( dataItem ) do
if i ~= 1 then -- skip first item as it is a false empty string created by splitting on § when the string started with a §
if item:find( '=' ) then -- Check if the parameter is named or unnamed
local param, value = item:match( '^%s*(.-)%s*=%s*(.-)%s*$' )
_dataItem[ param ] = value
else
table.insert( _dataItem, trim( item ) )
end
end
end

dataItem = _dataItem
end

table.insert( _dataList, dataItem )
end

if title and title ~= '' then
table.insert( res, { title=title, include=_dataList } )
end
end
end
end
end

return res
end

-- Accepts a series of tables each containig the settings for a dpl query.
-- Combinig multiple dpl queries yields better performance than doing them sequentially
function dpl.ask( ... )
local queries = { ... }

for i = 1, #queries do
removeFormattingSettings( queries[i] )
queries[i] = formatDpl( queries[i] )
end

queries = table.concat( queries, '$@µ@$' )
local time = os.clock()
queries = mw.getCurrentFrame():preprocess( queries )
time = os.clock() - time
queries = split( queries, '$@µ@$', true )

for i = 1, #queries do
queries[i] = toTable( queries[i] )
queries[i].time = time
end

return unpack( queries )
end

return dpl
-- </nowiki>