Module:Random portal component/sandbox - Revision history

Certes: Check subpage being presented exists. Reduce checks that subpages not being presented exist, to bring Portal:San Francisco Bay Area below 500 expensive functions

2020-10-01T15:17:46Z

Check subpage being presented exists. Reduce checks that subpages not being presented exist, to bring Portal:San Francisco Bay Area below 500 expensive functions

← Previous revision		Revision as of 15:17, 1 October 2020
Line 10:		Line 10:
	local function subPageTrackingCategories(pages, max, header)		local function subPageTrackingCategories(pages, max, header)
	local retval = "";		local retval = "";
⚫	~~local~~ availableSubPageCount = 0;
⚫	local i;
	local thispagetitle = mw.title.getCurrentTitle().text		local thispagetitle = mw.title.getCurrentTitle().text

Line 23:		Line 21:
	end		end

	-- no tracking if this is a subpage		-- no tracking if this is a subpage
	if ((mw.ustring.match(thispagetitle, "/") ~= nil) and (thispagetitle ~= "AC/DC")) then		if ((mw.ustring.match(thispagetitle, "/") ~= nil) and (thispagetitle ~= "AC/DC")) then
	return retval		return retval
	end		end

		⚫	local maxNum = tonumber(max)
	-- limit checking to prevent Lua overload
	local ~~myMaxCheck~~ = 60		local availableSubPageCount = maxNum

	if tonumber(max) < myMaxCheck then
			-- Check for missing subpages at end of alleged number range
⚫	~~myMaxCheck~~ = tonumber(max)
			while availableSubPageCount > 0 and not mw.title.new(pages.subpage .. '/' .. tostring(availableSubPageCount)).exists do
		⚫	availableSubPageCount = availableSubPageCount - 1
	end		end
		⚫	if availableSubPageCount < maxNum then
	for i=1,myMaxCheck do
		⚫	retval = retval .. "[[Category:Random portal component with fewer available subpages than specified max]]"
⚫	~~local aSubPage =~~ mw.title.new(pages.subpage .. '/' .. i)
			else
	if (aSubPage.exists) then
			-- Check for spurious subpages beyond end of alleged number range
⚫	availableSubPageCount = availableSubPageCount + 1;
		⚫	while mw.title.new(pages.subpage .. '/' .. tostring(availableSubPageCount + 1)).exists do
			availableSubPageCount = availableSubPageCount + 1
	end		end
		⚫	if availableSubPageCount > maxNum then
	end
	if myMaxCheck >= tonumber(max) then
⚫	if (availableSubPageCount < ~~tonumber(max))~~ then
⚫	retval = retval .. "[[Category:Random portal component with fewer available subpages than specified max]]"
	elseif (availableSubPageCount > tonumber(max)) then
	retval = retval .. "[[Category:Random portal component with more available subpages than specified max]]"		retval = retval .. "[[Category:Random portal component with more available subpages than specified max]]"
	end		end
	end		end

	-- before categorising, check what type of subpage we are categorising, and if detected, categorise images separately		-- before categorising, check what type of subpage we are categorising, and if detected, categorise images separately
	local subpageType = "subpages" -- generic type		local subpageType = "subpages" -- generic type
Line 100:		Line 99:
	pages.root = args.rootpage or currentTitle.prefixedText		pages.root = args.rootpage or currentTitle.prefixedText
	pages.subpage = pages.root .. '/' .. expandArg(args, 'subpage')		pages.subpage = pages.root .. '/' .. expandArg(args, 'subpage')
		⚫	local tries = 10
⚫	pages.random = pages.subpage .. '/' .. getRandomNumber(args.max)
			repeat
		⚫	pages.random = pages.subpage .. '/' .. getRandomNumber(args.max)
			tries = tries - 1
			until tries < 1 or mw.title.new(pages.random).exists
	pages.footer = 'Template:Box-footer'		pages.footer = 'Template:Box-footer'
	return pages		return pages

Certes: sync

2020-10-01T14:57:57Z

sync

Show changes

Mr. Stradivarius: don't throw an error if no "header" argument is provided

2019-05-02T09:30:25Z

don't throw an error if no "header" argument is provided

← Previous revision		Revision as of 09:30, 2 May 2019
Line 14:		Line 14:
	-- The "'*" part of the pattern checks for italic or bold text, like		-- The "'*" part of the pattern checks for italic or bold text, like
	-- ''Selected'' or '''Selected'''.		-- ''Selected'' or '''Selected'''.
	return string.find(header, "^'*[sS]elected") ~= nil		if header then
			return string.find(header, "^'*[sS]elected") ~= nil
			else
			return false
			end
	end		end

Mr. Stradivarius: only check the boundary pages to find out which subpage tracking category a portal should be placed in; this reduces the maximum number of expensive function calls to 13, and removes the need for the "max" argument

2019-05-02T09:27:09Z

only check the boundary pages to find out which subpage tracking category a portal should be placed in; this reduces the maximum number of expensive function calls to 13, and removes the need for the "max" argument

@@ Line 36: / Line 36: @@
 end
-local function subPageTrackingCategories(pages, max, header)
+local function makeCategoryLink(category)
 	-- Only track root portal pages that have "Selected x" sections.
@@ Line 46: / Line 59: @@
 	end
-		local aSubPage = mw.title.new(pages.subpage .. '/' .. i)
+		local subpageName = pages.subpage .. '/' .. tostring(subpageNumber)
 		end
 	end
 end
@@ Line 170: / Line 163: @@
 	end
-	return table.concat(ret, '\n') .. subPageTrackingCategories(pages, args.max, args.header)
+	return table.concat(ret, '\n') .. renderSubpageTrackingCategory(pages, args.header)
 end
@@ Line 187: / Line 180: @@
 	))
-	return table.concat(ret, '\n') .. subPageTrackingCategories(pages, args.max, args.header)
+	return table.concat(ret, '\n') .. renderSubpageTrackingCategory(pages, args.header)
 end

Mr. Stradivarius: fix isRootPortalTitle arg

2019-05-02T08:41:33Z

fix isRootPortalTitle arg

← Previous revision		Revision as of 08:41, 2 May 2019
Line 42:		Line 42:

	-- Only track root portal pages that have "Selected x" sections.		-- Only track root portal pages that have "Selected x" sections.
	if not isSelectedHeader(header) or not isRootPortalTitle(~~title~~) then		if not isSelectedHeader(header) or not isRootPortalTitle(currentTitle) then
	return ""		return ""
	end		end

Mr. Stradivarius: rename isSelectedPage() to isSelectedHeader(), as we are not dealing with actual page titles; and make a new isRootPortalTitle() function to use in all category checks (this excludes subpages from :Category:Portals needing attention)

2019-05-02T05:50:02Z

rename isSelectedPage() to isSelectedHeader(), as we are not dealing with actual page titles; and make a new isRootPortalTitle() function to use in all category checks (this excludes subpages from Category:Portals needing attention)

← Previous revision		Revision as of 05:50, 2 May 2019
Line 10:		Line 10:
	}		}

	local function ~~isSelectedPage~~(header)		local function isSelectedHeader(header)
	-- Whether a page is selected (a selected article, selected list, etc.)		-- Whether a page is selected (a selected article, selected list, etc.).
			-- The "'*" part of the pattern checks for italic or bold text, like
			-- ''Selected'' or '''Selected'''.
	return string.find(header, "^'*[sS]elected") ~= nil		return string.find(header, "^'*[sS]elected") ~= nil
	end		end
Line 27:		Line 29:
	and not portalNamesContainingSlashes[title.text]		and not portalNamesContainingSlashes[title.text]
	)		)
		⚫	end

			local function isRootPortalTitle(title)
			-- Whether a title object is for a root portal page.
			return isInPortalNamespace(title) and not isPortalSubpage(title)
	end		end

Line 34:		Line 41:
	local i;		local i;

	-- ~~don't~~ track ~~DYK~~ ~~etc,~~ ~~only~~ ~~selected~~ ~~articles~~ ~~etc~~		-- Only track root portal pages that have "Selected x" sections.
	if not ~~isSelectedPage~~(header) then		if not isSelectedHeader(header) or not isRootPortalTitle(title) then
	return ""
⚫	end

	-- no tracking unless we are in Portal namespace
	if not isInPortalNamespace(currentTitle) then
	return ""
	end

	-- no tracking if this is a subpage
	if isPortalSubpage(currentTitle) then
	return ""		return ""
	end		end
Line 126:		Line 123:
	title		title
	)		)
	if ~~isInPortalNamespace~~(currentTitle) then		if isRootPortalTitle(currentTitle) then
	msg = msg .. '[[Category:Portals needing attention]]'		msg = msg .. '[[Category:Portals needing attention]]'
	end		end

Mr. Stradivarius: split the "selected page" check out into an isSelectedPage function

2019-05-02T03:36:36Z

split the "selected page" check out into an isSelectedPage function

← Previous revision		Revision as of 03:36, 2 May 2019
Line 9:		Line 9:
	["AC/DC"] = true,		["AC/DC"] = true,
	}		}

			local function isSelectedPage(header)
			-- Whether a page is selected (a selected article, selected list, etc.)
			return string.find(header, "^'*[sS]elected") ~= nil
			end

	local function isInPortalNamespace(title)		local function isInPortalNamespace(title)
Line 30:		Line 35:

	-- don't track DYK etc, only selected articles etc		-- don't track DYK etc, only selected articles etc
	if ~~(string.find~~(header~~, "^'*[sS]elected") ~= 1~~) then		if not isSelectedPage(header) then
	return ""		return ""
	end		end

	-- no tracking unless we are in Portal namespace		-- no tracking unless we are in Portal namespace
	if not isInPortalNamespace(currentTitle) then		if not isInPortalNamespace(currentTitle) then

Mr. Stradivarius: add a namespace check to the isPortalSubpage function in case it gets reused anywhere else

2019-05-02T02:34:40Z

add a namespace check to the isPortalSubpage function in case it gets reused anywhere else

← Previous revision		Revision as of 02:34, 2 May 2019
Line 16:		Line 16:

	local function isPortalSubpage(title)		local function isPortalSubpage(title)
			-- Whether a title object is a portal subpage
⚫	~~return title.isSubpage~~ and not portalNamesContainingSlashes[title.text]
			return (
			isInPortalNamespace(title)
			and title.isSubpage
		⚫	and not portalNamesContainingSlashes[title.text]
			)
	end		end

Mr. Stradivarius: split both subpage checks out into an "isPortalSubpage" function

2019-05-02T02:30:02Z

split both subpage checks out into an "isPortalSubpage" function

← Previous revision		Revision as of 02:30, 2 May 2019
Line 13:		Line 13:
	-- Whether a title object is in the portal namespace.		-- Whether a title object is in the portal namespace.
	return title.namespace == 100		return title.namespace == 100
			end

			local function isPortalSubpage(title)
		⚫	return title.isSubpage and not portalNamesContainingSlashes[title.text]
	end		end

Line 30:		Line 34:

	-- no tracking if this is a subpage		-- no tracking if this is a subpage
	if currentTitle~~.isSubpage~~		if isPortalSubpage(currentTitle) then
⚫	and not portalNamesContainingSlashes[~~currentTitle~~.text]
	then
	return ""		return ""
	end		end

Mr. Stradivarius: use the title.isSubpage property instead of rolling our own function

2019-05-02T02:25:15Z

use the title.isSubpage property instead of rolling our own function

← Previous revision		Revision as of 02:25, 2 May 2019
Line 19:		Line 19:
	local availableSubPageCount = 0;		local availableSubPageCount = 0;
	local i;		local i;
	local thispagetitle = currentTitle.text

	-- don't track DYK etc, only selected articles etc		-- don't track DYK etc, only selected articles etc
Line 31:		Line 30:

	-- no tracking if this is a subpage		-- no tracking if this is a subpage
			if currentTitle.isSubpage
	if (mw.ustring.match(thispagetitle, "/") ~= nil)
	and not portalNamesContainingSlashes[~~thispagetitle~~]		and not portalNamesContainingSlashes[currentTitle.text]
	then		then
	return ""		return ""