Module:Random slideshow/sandbox - Revision history

Aidan9382: enable ignoreOnlyincludes

2024-08-18T11:07:29Z

enable ignoreOnlyincludes

← Previous revision		Revision as of 11:07, 18 August 2024
Line 172:		Line 172:
	content = excerptModule.getSection(content, args['section'..i]) or ''		content = excerptModule.getSection(content, args['section'..i]) or ''
	end		end
	content = excerptModule.cleanupText(content, {keepSubsections=true}) -- true means keep subsections		content = excerptModule.cleanupText(content, {keepSubsections=true, ignoreOnlyincludes=true}) -- true means keep subsections

	local galleryFiles = extractGalleryFiles(content)		local galleryFiles = extractGalleryFiles(content)

Aidan9382: remove unused require

2023-05-12T12:23:29Z

remove unused require

← Previous revision		Revision as of 12:23, 12 May 2023
Line 3:		Line 3:
	local excerptModule = require('Module:Excerpt/portals/sandbox')		local excerptModule = require('Module:Excerpt/portals/sandbox')
	local randomModule = require('Module:Random')		local randomModule = require('Module:Random')
	local redirectModule = require('Module:Redirect')

	function cleanupArgs(argsTable)		function cleanupArgs(argsTable)

Aidan9382: sync to live

2023-02-09T17:52:28Z

sync to live

← Previous revision		Revision as of 17:52, 9 February 2023
Line 114:		Line 114:
	file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
	-- remove spaces prior to captions (which cause pre-formatted text)		-- remove spaces prior to captions (which cause pre-formatted text)
	file = mw.ustring.gsub(file, '\|%s*', '\|')		file = mw.ustring.gsub(file, '\|%s*', '\|')

Aidan9382: +position keyword

2023-01-23T18:41:14Z

+position keyword

← Previous revision		Revision as of 18:41, 23 January 2023
Line 101:		Line 101:
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')

Aidan9382: Fix pipe removal logic to avoid incorrectly placing the temporary wikilink pipe break between 2 different wikilinks in rare edgecases (E.g. Baseball, File:JackieRobinson1945.jpg)

2022-11-28T12:01:27Z

Fix pipe removal logic to avoid incorrectly placing the temporary wikilink pipe break between 2 different wikilinks in rare edgecases (E.g. Baseball, File:JackieRobinson1945.jpg)

← Previous revision		Revision as of 12:01, 28 November 2022
Line 132:		Line 132:
	-- disable pipes in wikilinks		-- disable pipes in wikilinks
	file = file:gsub(		file = file:gsub(
	"%[%[(.-)\|(.-)]]",		"%[%[([^%]]-)\|(.-)]]",
	"[[%1__PIPE__%2]]")		"[[%1__PIPE__%2]]")
	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error		-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error

Aidan9382: Fix the fix (bracket stuff)

2022-11-04T16:56:35Z

Fix the fix (bracket stuff)

← Previous revision		Revision as of 16:56, 4 November 2022
Line 180:		Line 180:
	local isOkay = excerptModule.checkImage(filename)		local isOkay = excerptModule.checkImage(filename)
	if isOkay then		if isOkay then
	table.insert(lines, doubleCheck(f).." (from '''[["..pagename.."]]''')")		table.insert(lines, doubleCheck(f.." (from '''[["..pagename.."]]''')"))
	end		end
	end		end
Line 190:		Line 190:
	for _, f in pairs(extractRegularFiles(otherFiles)) do		for _, f in pairs(extractRegularFiles(otherFiles)) do
	if f and f ~= '' and mw.ustring.sub(f, 1, 5) == 'File:' and hasCaption(f) then		if f and f ~= '' and mw.ustring.sub(f, 1, 5) == 'File:' and hasCaption(f) then
	table.insert(lines, doubleCheck(f).." (from '''[["..pagename.."]]''')")		table.insert(lines, doubleCheck(f.." (from '''[["..pagename.."]]''')"))
	end		end
	end		end

Aidan9382: Testing in moving alt safety function to another place

2022-11-04T16:55:07Z

Testing in moving alt safety function to another place

← Previous revision		Revision as of 16:55, 4 November 2022
Line 40:		Line 40:
	local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)		local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)
	for i = 1, #sortedLines do		for i = 1, #sortedLines do
	local currentLine = sortedLines[i]
⚫	-- disable pipes in wikilinks
	currentLine = currentLine:gsub(
⚫	"%[%[(.-)\|(.-)]]",
⚫	"[[%1__PIPE__%2]]")
⚫	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error
	currentLine = currentLine:gsub(
⚫	"^(.+)(\|alt=[^\|])(.)$",
⚫	"%1%3%2")
⚫	-- bring back pipes in wikilinks
	currentLine = currentLine:gsub(
⚫	"%[%[(.-)__PIPE__(.-)]]",
⚫	"[[%1\|%2]]")
	-- insert a switcher-label span just after the first pipe, which should ideally be the caption		-- insert a switcher-label span just after the first pipe, which should ideally be the caption
	~~currentLine~~ = ~~currentLine~~:gsub(		sortedLines[i] = sortedLines[i]:gsub(
	"\|",		"\|",
	'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',		'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',
	1)		1)
	sortedLines[i] = currentLine
	end		end
	local galleryContent = table.concat(sortedLines, '\n')		local galleryContent = table.concat(sortedLines, '\n')
Line 140:		Line 126:
	end		end
	return files		return files
			end

			--Central function for fixing issues that could occur in both gallery-fetched and file-fetched files
			local function doubleCheck(file)
		⚫	-- disable pipes in wikilinks
			file = file:gsub(
		⚫	"%[%[(.-)\|(.-)]]",
		⚫	"[[%1__PIPE__%2]]")
		⚫	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error
			file = file:gsub(
		⚫	"^(.+)(\|alt=[^\|])(.)$",
		⚫	"%1%3%2")
		⚫	-- bring back pipes in wikilinks
			file = file:gsub(
		⚫	"%[%[(.-)__PIPE__(.-)]]",
		⚫	"[[%1\|%2]]")
			return file
	end		end

Line 177:		Line 180:
	local isOkay = excerptModule.checkImage(filename)		local isOkay = excerptModule.checkImage(filename)
	if isOkay then		if isOkay then
	table.insert(lines, f.." (from '''[["..pagename.."]]''')")		table.insert(lines, doubleCheck(f).." (from '''[["..pagename.."]]''')")
	end		end
	end		end
Line 187:		Line 190:
	for _, f in pairs(extractRegularFiles(otherFiles)) do		for _, f in pairs(extractRegularFiles(otherFiles)) do
	if f and f ~= '' and mw.ustring.sub(f, 1, 5) == 'File:' and hasCaption(f) then		if f and f ~= '' and mw.ustring.sub(f, 1, 5) == 'File:' and hasCaption(f) then
	table.insert(lines, f.." (from '''[["..pagename.."]]''')")		table.insert(lines, doubleCheck(f).." (from '''[["..pagename.."]]''')")
	end		end
	end		end

Aidan9382: improve alt param position check by temporarily removing pipes in wikilinks during processing

2022-11-04T13:26:31Z

improve alt param position check by temporarily removing pipes in wikilinks during processing

← Previous revision		Revision as of 13:26, 4 November 2022
Line 40:		Line 40:
	local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)		local sortedLines = nonRandom and galleryLines or randomModule.main('array', randomiseArgs)
	for i = 1, #sortedLines do		for i = 1, #sortedLines do
		⚫	local currentLine = sortedLines[i]
⚫	-- move ~~the~~ alt parameter to the end of the ~~file~~ ~~should~~ it ~~exist~~ to ~~fix~~ linter ~~errors~~
			-- disable pipes in wikilinks
	-- make sure the parameter isnt perhaps being confused by a wikilink inside it
	~~local altParam~~ = ~~sortedLines[i]~~:gsub(		currentLine = currentLine:gsub(
			"%[%[(.-)\|(.-)]]",
			"[[%1__PIPE__%2]]")
		⚫	-- move any alt parameter to the end to avoid putting the switcher in too early and causing a linter error
			currentLine = currentLine:gsub(
	"^(.+)(\|alt=[^\|])(.)$",		"^(.+)(\|alt=[^\|])(.)$",
	"%2")		"%1%3%2")
			-- bring back pipes in wikilinks
	if not string.find(altParam,"%[%[") then
	~~sortedLines[i]~~ = ~~sortedLines[i]~~:gsub(		currentLine = currentLine:gsub(
	"^(.+)(\|alt=[^\|])(.)$",		"%[%[(.-)__PIPE__(.-)]]",
	"%1%3%2")		"[[%1\|%2]]")
		⚫	-- insert a switcher-label span just after the first pipe, which should ideally be the caption
	end
			currentLine = currentLine:gsub(
⚫	-- insert a switcher-label span just after the first pipe
⚫	~~sortedLines[i]~~ = sortedLines[i]~~:gsub(~~
	"\|",		"\|",
	'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',		'\|<span class="switcher-label" style="display:none"><span class="randomSlideshow-sr-only">Image ' .. tostring(i) .. '</span></span>',
	1)		1)
	~~mw.log("Workin with",~~sortedLines[i])		sortedLines[i] = currentLine
	end		end
	local galleryContent = table.concat(sortedLines, '\n')		local galleryContent = table.concat(sortedLines, '\n')

Aidan9382: Fully turn all {{!}} into | now that tag is processed using functions rather than preprocessed text that needs escaping

2022-11-04T11:54:18Z

Fully turn all {{!}} into | now that tag is processed using functions rather than preprocessed text that needs escaping

← Previous revision		Revision as of 11:54, 4 November 2022
Line 43:		Line 43:
	-- make sure the parameter isnt perhaps being confused by a wikilink inside it		-- make sure the parameter isnt perhaps being confused by a wikilink inside it
	local altParam = sortedLines[i]:gsub(		local altParam = sortedLines[i]:gsub(
	"^(.+)(~~%{%{!}}~~alt~~%{%{~~=}}[^{])(.)$",		"^(.+)(\|alt=[^\|])(.)$",
	"%2")		"%2")
	if not string.find(altParam,"%[%[") then		if not string.find(altParam,"%[%[") then
	sortedLines[i] = sortedLines[i]:gsub(		sortedLines[i] = sortedLines[i]:gsub(
	"^(.+)(~~%{%{!}}~~alt~~%{%{~~=}}[^{])(.)$",		"^(.+)(\|alt=[^\|])(.)$",
	"%1%3%2")		"%1%3%2")
	end		end
	-- insert a switcher-label span just after the first pipe ~~(which has already been escaped as {{!}} instead the \| character)~~		-- insert a switcher-label span just after the first pipe
	sortedLines[i] = sortedLines[i]:gsub(		sortedLines[i] = sortedLines[i]:gsub(
	"\|",		"\|",
Line 58:		Line 58:
	end		end
	local galleryContent = table.concat(sortedLines, '\n')		local galleryContent = table.concat(sortedLines, '\n')
	galleryContent = string.gsub(galleryContent,"%{%{!}}","\|")
	local output = '<div class="' .. containerClassName .. '" style="max-width:' .. normaliseCssMeasurement(maxWidth) .. '; margin:-4em auto;"><div class="nomobile"><!--intentionally empty on desktop, and is not present on mobile website (outside template namesapce)--></div>'		local output = '<div class="' .. containerClassName .. '" style="max-width:' .. normaliseCssMeasurement(maxWidth) .. '; margin:-4em auto;"><div class="nomobile"><!--intentionally empty on desktop, and is not present on mobile website (outside template namesapce)--></div>'
	.. mw.getCurrentFrame():extensionTag({name="gallery",content=galleryContent,args={mode="slideshow",class="switcher-container"}}) .. '</div>'		.. mw.getCurrentFrame():extensionTag({name="gallery",content=galleryContent,args={mode="slideshow",class="switcher-container"}}) .. '</div>'
Line 68:		Line 67:
	if not title		if not title
	then		then
	return "File:Blank.png~~{{!}}~~{{Error\|File [[:File:" .. file .. "]] does not exist.}}"		return "File:Blank.png\|{{Error\|File [[:File:" .. file .. "]] does not exist.}}"
	end		end
	local creditLine = ( credit and '<p><span style="font-size:88%">' .. credit .. '</span></p>' or '' )		local creditLine = ( credit and '<p><span style="font-size:88%">' .. credit .. '</span></p>' or '' )
	return title.prefixedText .. '~~{{!}}~~' .. ( caption or '' ) .. creditLine		return title.prefixedText .. '\|' .. ( caption or '' ) .. creditLine
	end		end

Line 85:		Line 84:

	function hasCaption(line)		function hasCaption(line)
	local caption = ~~mw.ustring.match(line, ".-{{!}}(.)") or~~ mw.ustring.match(line, ".-\|(.)")		local caption = mw.ustring.match(line, ".-\|(.*)")
	-- require caption to exist with more than 5 characters (avoids sizes etc being mistaken for captions)		-- require caption to exist with more than 5 characters (avoids sizes etc being mistaken for captions)
	return caption and #caption>5 and true or false		return caption and #caption>5 and true or false
Line 95:		Line 94:
	return false		return false
	end		end
	gallery = mw.ustring.gsub(gallery, '\|', '{{!}}')
	return mw.text.split(gallery, '%c')		return mw.text.split(gallery, '%c')
	end		end
Line 173:		Line 171:
	for _, f in pairs(galleryFiles) do		for _, f in pairs(galleryFiles) do
	if hasCaption(f) then		if hasCaption(f) then
	local filename = string.gsub(f, '~~{{!}}~~.*', '')		local filename = string.gsub(f, '\|.*', '')
	local isOkay = excerptModule.checkImage(filename)		local isOkay = excerptModule.checkImage(filename)
	if isOkay then		if isOkay then

Aidan9382: Remove unused log and unused lines from pipe modification

2022-11-04T09:07:26Z

Remove unused log and unused lines from pipe modification

← Previous revision		Revision as of 09:07, 4 November 2022
Line 130:		Line 130:
	-- remove sizes, which sometimes get mistaken for captions		-- remove sizes, which sometimes get mistaken for captions
	file = mw.ustring.gsub(file, '\|%s%dx?%d+%spx%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%s%dx?%d+%spx%s([\|%]])', '%1')
	-- expand templates
	-- file = mw.ustring.gsub(file, '{%b{}}', expand)
	-- remove loose closing braces which don't have matching opening braces
	-- file = mw.ustring.gsub(file, '}}', '')
	-- remove loose opening braces which don't have matching closing braces (and the subsequent content, which is probably just a template name)
	-- file = mw.ustring.gsub(file, '{{.-([\|%]])', '%1')
	-- replace pipes and equals (which would otherwise break the {{#tag:}} syntax)
	-- file = mw.ustring.gsub(file, '\|%salt%s=', '{{!}}alt=')
	-- file = mw.ustring.gsub(file, '\|', '{{!}}')
	-- file = mw.ustring.gsub(file, '=', '{{=}}')
	-- remove linebreaks		-- remove linebreaks
	file = mw.ustring.gsub(file, '\n\n', '<br>')		file = mw.ustring.gsub(file, '\n\n', '<br>')
Line 147:		Line 137:
	file = mw.ustring.gsub(file, '%]%]$', '')		file = mw.ustring.gsub(file, '%]%]$', '')
	table.insert(files, file)		table.insert(files, file)
	mw.log(file)
	end		end
	return files		return files

← Previous revision		Revision as of 17:52, 9 February 2023
Line 114:		Line 114:
	file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%supright%s=.-([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%slink%s=.-([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%slang%s=.-([\|%]])', '%1')
	-- remove spaces prior to captions (which cause pre-formatted text)		-- remove spaces prior to captions (which cause pre-formatted text)
	file = mw.ustring.gsub(file, '\|%s*', '\|')		file = mw.ustring.gsub(file, '\|%s*', '\|')

← Previous revision		Revision as of 18:41, 23 January 2023
Line 101:		Line 101:
	file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scenter%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%scentre%s([\|%]])', '%1')
			file = mw.ustring.gsub(file, '\|%snone%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%sbaseline%s([\|%]])', '%1')
	file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')		file = mw.ustring.gsub(file, '\|%ssub%s([\|%]])', '%1')