Module:SpriteFile: Difference between revisions

← Older edit Newer edit →

@@ Line 1: / Line 1: @@
--- Please forgive any dust, I've never touched Lua or anything related before
 local p = {}
-local function isExternalLink(str)
-	return str:find('://', 1, true) ~= nil
-end
 function p.sprite( f )
 	local args = f
 	if f == mw.getCurrentFrame() then
-		args = require("Module:ProcessArgs").merge( true )
+		args = require( 'Module:ProcessArgs' ).merge( true )
 	else
 		f = mw.getCurrentFrame()
@@ Line 19: / Line 13: @@
 		scale = 1,
 		size = 16,
-		align = "text-top",
+		align = 'text-top'
-		ext = "png",
-		modid = "minecraft"
 	}
-	local id = mw.text.trim(tostring(args[1] or ""))
+	local id = mw.text.trim( tostring( args[1] or '' ) )
-	local ext = (args.ext or default.ext):gsub("^%.", "")
+	if not args.keepcase then
-	local name = args.modid or default.modid
+		id = mw.ustring.lower( id ):gsub( '[%s%+]', '-' )
-	local file = (id == "" and "Grid Unknown.png") or (name .. " " .. id .. "." .. ext)
-	if name == "minecraft" then
-		file = ("Invicon " .. id .. "." .. ext)
 	end
-	local link = ( args.link or "")
+	local link = ( args.link or '' )
-	local modPrefix = args.modid or default.modid
+	if mw.ustring.lower( link ) == 'none' then
+		link = ''
-	if link ~= "" and not isExternalLink(link) then
+	elseif link ~= '' then
-		link = modPrefix .. ":" .. link
+		local linkPrefix = ( not link:find( '//' ) and args.linkprefix ) or ''
+		link = linkPrefix .. link
 	end
 	local scale = args.scale or default.scale
 	local height = ( args.height or args.size or default.size ) * scale
 	local width = ( args.width or args.size or default.size ) * scale
-	local size = width .. "x" .. height .. "px"
+	local size = width .. 'x' .. height .. 'px'
 	local styles = {}
 	if height ~= default.size then
-		styles[#styles + 1] = "height:" .. height .. "px"
+		styles[#styles + 1] = 'height:' .. height .. 'px'
 	end
 	if width ~= default.size then
-		styles[#styles + 1] = "width:" .. width .. "px"
+		styles[#styles + 1] = 'width:' .. width .. 'px'
+	end
+	local name = args.name or ''
+	if name == 'InvSprite' then
+		name = 'Invicon'
+	end
+	local file = name .. ' ' .. id .. '.png'
+	local altText = ''
+	if link == '' then
+		altText = file .. ': Sprite image for ' .. id .. ' in Minecraft'
+	end
+	if id == '' then
+		file = 'Grid Unknown.png'
+		altText = 'Unknown sprite image'
 	end
+	local sprite = mw.html.create( 'span' ):addClass( 'sprite-file' )
+	local img = '[[File:' .. file .. '|' .. size .. '|link=' .. link .. '|alt=' .. altText .. '|class=pixel-image|' .. ( args.title or '' ) .. ']]'
+	sprite:node( img )
-	local altText = file .. ": Sprite image for " .. id
-	if link ~= '' then altText = altText .. " linking to " .. link end
-	if id == '' then altText = "Unknown sprite image" end
-	local sprite = mw.html.create("span"):addClass("sprite-file")
-	local img    = string.format("[[File:%s|%s|link=%s|alt=%s|class=pixel-image|%s]]",
-		file, size, link, altText, args.title or '')
-	sprite:node(img)
 	local align = args.align or default.align
-	if align ~= default.align then styles[#styles+1] = "--vertical-align:" .. align end
+	if align ~= default.align then
-	if args.css then styles[#styles+1] = args.css end
+		styles[#styles + 1] = '--vertical-align:' .. align
-	sprite:cssText(table.concat(styles, ";"))
+	end
+	styles[#styles + 1] = args.css
-	local root = mw.html.create("")
+	sprite:cssText( table.concat( styles, ';' ) )
-	local haveText = args.text or args["wrap"] == nil
-	local spriteText = nil
-	if haveText then
+	local root
-		spriteText = mw.html.create("span"):addClass("sprite-text"):wikitext(args.text or "")
+	local spriteText
-		if args.title then spriteText:attr("title", args.title) end
+	if args.text then
+		if not args['wrap'] then
-		if link ~= "" then
+			root = mw.html.create( 'span' ):addClass( 'nowrap' )
-			if isExternalLink(link) then
+		end
-				spriteText = "[" .. link .. " " .. tostring(spriteText) .. "]"
+		spriteText = mw.html.create( 'span' ):addClass( 'sprite-text' ):wikitext( args.text )
+		if args.title then
+			spriteText:attr( 'title', args.title )
+		end
+		if link ~= '' then
+			-- External link
+			if link:find( '//' ) then
+				spriteText = '[' .. link .. ' ' .. tostring( spriteText ) .. ']'
 			else
-				spriteText = "[[" .. link .. "|" .. tostring(spriteText) .. "]]"
+				spriteText = '[[' .. link .. '|' .. tostring( spriteText ) .. ']]'
 			end
 		end
 	end
-	root:node(sprite)
+	if not root then
-	if spriteText then root:node(spriteText) end
+		root = mw.html.create( '' )
+	end
-	return tostring(root)
+	root:node( sprite )
+	if spriteText then
+		root:node( spriteText )
+	end
+	return tostring( root )
 end
-function p.link(f)
+function p.link( f )
 	local args = f
 	if f == mw.getCurrentFrame() then
-		args = require("Module:ProcessArgs").merge(true)
+		args = require( 'Module:ProcessArgs' ).merge( true )
+	end
+	local link = args[1]
+	if args[1] and not args.id then
+		link = args[1]:match( '^(.-)%+' ) or args[1]
 	end
+	local text
-	local raw = args[1] or ""
 	if not args.notext then
-		args.text = args.text or args[2] or raw
+		text = args.text or args[2] or link
 	end
-	args[1]  = args.id or raw
+	args[1] = args.id or args[1]
-	args.link = args.link or raw
+	args.link = args.link or link
-	return p.sprite(args)
+	args.text = text
+	return p.sprite( args )
 end
 return p