Modul:File link: Unterschied zwischen den Versionen
fix read-only behaviour and remove the test function
(add type checks and write the render function; read-only code not working yet) |
(fix read-only behaviour and remove the test function) |
||
| Zeile 14: | Zeile 14: | ||
checkSelf(self, 'name') | checkSelf(self, 'name') | ||
checkType('name', 1, s, 'string') | checkType('name', 1, s, 'string') | ||
data.theName = s | |||
end | end | ||
| Zeile 29: | Zeile 29: | ||
} | } | ||
if validFormats[s] then | if validFormats[s] then | ||
data.theFormat = s | |||
data.theFormatFilename = filename | |||
else | else | ||
error('invalid format') | error('invalid format') | ||
| Zeile 39: | Zeile 39: | ||
checkSelf(self, 'width') | checkSelf(self, 'width') | ||
checkType('width', 1, px, 'number') | checkType('width', 1, px, 'number') | ||
data.theWidth = px | |||
end | end | ||
| Zeile 45: | Zeile 45: | ||
checkSelf(self, 'height') | checkSelf(self, 'height') | ||
checkType('height', 1, px, 'number') | checkType('height', 1, px, 'number') | ||
data.theHeight = px | |||
end | end | ||
| Zeile 51: | Zeile 51: | ||
checkSelf(self, 'upright') | checkSelf(self, 'upright') | ||
checkType('upright', 1, factor, 'number', true) | checkType('upright', 1, factor, 'number', true) | ||
data.isUpright = true | |||
data.uprightFactor = factor | |||
end | end | ||
| Zeile 58: | Zeile 58: | ||
checkSelf(self, 'resetSize') | checkSelf(self, 'resetSize') | ||
for i, field in ipairs{'theWidth', 'theHeight', 'isUpright', 'uprightFactor'} do | for i, field in ipairs{'theWidth', 'theHeight', 'isUpright', 'uprightFactor'} do | ||
data[field] = nil | |||
end | end | ||
end | end | ||
| Zeile 72: | Zeile 72: | ||
} | } | ||
if validLocations[s] then | if validLocations[s] then | ||
data.theLocation = s | |||
else | else | ||
error(string.format( | error(string.format( | ||
"bad argument #1 to ' | "bad argument #1 to 'location' ('%s' is not a valid location)", | ||
s | s | ||
)) | )) | ||
| Zeile 95: | Zeile 95: | ||
} | } | ||
if validAlignments[s] then | if validAlignments[s] then | ||
data.theAlignment = s | |||
else | else | ||
error(string.format( | error(string.format( | ||
"bad argument #1 to ' | "bad argument #1 to 'alignment' ('%s' is not a valid alignment)" | ||
)) | )) | ||
end | end | ||
| Zeile 105: | Zeile 105: | ||
function data:border() | function data:border() | ||
checkSelf(self, 'border') | checkSelf(self, 'border') | ||
data.hasBorder = true | |||
end | end | ||
| Zeile 111: | Zeile 111: | ||
checkSelf(self, 'link') | checkSelf(self, 'link') | ||
checkType('link', 1, s, 'string') | checkType('link', 1, s, 'string') | ||
data.theLink = s | |||
end | end | ||
| Zeile 117: | Zeile 117: | ||
checkSelf(self, 'alt') | checkSelf(self, 'alt') | ||
checkType('alt', 1, s, 'string') | checkType('alt', 1, s, 'string') | ||
data.theAlt = s | |||
end | end | ||
| Zeile 123: | Zeile 123: | ||
checkSelf(self, 'caption') | checkSelf(self, 'caption') | ||
checkType('caption', 1, s, 'string') | checkType('caption', 1, s, 'string') | ||
data.theCaption = s | |||
end | end | ||
function data:render() | function data:render() | ||
checkSelf(self, 'render') | checkSelf(self, 'render') | ||
local ret = {} | local ret = {} | ||
-- Image name. | -- Image name. | ||
if not | if not data.theName then | ||
error('image:render: no image name was found') | error('image:render: no image name was found') | ||
end | end | ||
ret[#ret + 1] = 'File:' .. | ret[#ret + 1] = 'File:' .. data.theName | ||
-- Image format | -- Image format | ||
if | if data.theFormat and data.theFormatFilename then | ||
ret[#ret + 1] = | ret[#ret + 1] = data.theFormat .. '=' .. data.theFormatFilename | ||
elseif | elseif data.theFormat then | ||
ret[#ret + 1] = | ret[#ret + 1] = data.theFormat | ||
end | end | ||
-- Border | -- Border | ||
if | if data.hasBorder then | ||
ret[#ret + 1] = 'border' | ret[#ret + 1] = 'border' | ||
end | end | ||
-- Location | -- Location | ||
ret[#ret + 1] = | ret[#ret + 1] = data.theLocation | ||
-- Alignment | -- Alignment | ||
ret[#ret + 1] = | ret[#ret + 1] = data.theAlignment | ||
-- Size | -- Size | ||
if | if data.isUpright and (data.theWidth or data.theHeight) then | ||
error("duplicate size value detected in 'render' (height/width cannot be used at the same time as 'upright')") | error("duplicate size value detected in 'render' (height/width cannot be used at the same time as 'upright')") | ||
elseif | elseif data.isUpright and data.uprightFactor then | ||
ret[#ret + 1] = 'upright=' .. tostring( | ret[#ret + 1] = 'upright=' .. tostring(data.uprightFactor) | ||
elseif | elseif data.isUpright then | ||
ret[#ret + 1] = 'upright' | ret[#ret + 1] = 'upright' | ||
elseif | elseif data.theWidth and data.theHeight then | ||
ret[#ret + 1] = string.format('%dx%dpx', | ret[#ret + 1] = string.format('%dx%dpx', data.theWidth, data.theHeight) | ||
elseif | elseif data.theWidth then | ||
ret[#ret + 1] = tostring( | ret[#ret + 1] = tostring(data.theWidth) .. 'px' | ||
elseif | elseif data.theHeight then | ||
ret[#ret + 1] = string.format('x%dpx', | ret[#ret + 1] = string.format('x%dpx', data.theHeight) | ||
end | end | ||
-- Link | -- Link | ||
if | if data.theLink then | ||
ret[#ret + 1] = 'link=' .. | ret[#ret + 1] = 'link=' .. data.theLink | ||
end | end | ||
-- Alt | -- Alt | ||
if | if data.theAlt then | ||
ret[#ret + 1] = 'alt=' .. | ret[#ret + 1] = 'alt=' .. data.theAlt | ||
end | end | ||
-- Caption | -- Caption | ||
ret[#ret + 1] = | ret[#ret + 1] = data.theCaption | ||
return string.format('[[%s]]', table.concat(ret, '|')) | return string.format('[[%s]]', table.concat(ret, '|')) | ||
| Zeile 225: | Zeile 224: | ||
end | end | ||
return image | |||