sudacode/metrics
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Accept both absolute and relative values for config padding (#308)

Browse Source
This commit is contained in:
Simon Lecoq
2021-05-17 22:19:12 +02:00
committed by GitHub
parent 09cf9cbdf2
commit d8b4279495
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/app/metrics/utils.mjs
View File

@@ -283,13 +283,20 @@ export const svg = {
console.debug(`metrics/svg/resize > started ${await svg.resize.browser.version()}`)
}
//Format padding
const [pw = 1, ph] = (Array.isArray(paddings) ? paddings : `${paddings}`.split(",").map(x => x.trim())).map(padding => `${padding}`.substring(0, padding.length - 1)).map(value => 1 + Number(value) / 100)
const padding = {width:pw, height:(ph ?? pw)}
if (!Number.isFinite(padding.width))
padding.width = 1
if (!Number.isFinite(padding.height))
padding.height = 1
console.debug(`metrics/svg/resize > padding width*${padding.width}, height*${padding.height}`)
const padding = {width:1, height:1, absolute:{width:0, height:0}}
paddings = Array.isArray(paddings) ? paddings : `${paddings}`.split(",").map(x => x.trim())
for (const [i, dimension] of [[0, "width"], [1, "height"]]) {
let operands = (paddings?.[i] ?? paddings[0])
let {relative} = operands.match(/(?<relative>[+-]?[\d.]+)%$/)?.groups ?? {}
operands = operands.replace(relative, "").trim()
let {absolute} = operands.match(/^(?<absolute>[+-]?[\d.]+)/)?.groups ?? {}
operands = operands.replace(absolute, "").trim()
if (Number.isFinite(Number(absolute)))
padding.absolute[dimension] = Number(absolute)
if (Number.isFinite(Number(relative)))
padding[dimension] = 1 + Number(relative/100)
}
console.debug(`metrics/svg/resize > padding width*${padding.width}+${padding.absolute.width}, height*${padding.height}+${padding.absolute.height}`)
//Render through browser and resize height
console.debug("metrics/svg/resize > loading svg")
const page = await svg.resize.browser.newPage()
@@ -311,9 +318,9 @@ export const svg = {
//Get bounds and resize
let {y:height, width} = document.querySelector("svg #metrics-end").getBoundingClientRect()
console.debug(`bounds width=${width}, height=${height}`)
height = Math.ceil(height * padding.height)
width = Math.ceil(width * padding.width)
console.debug(`bounds after applying padding width=${width} (*${padding.width}), height=${height} (*${padding.height})`)
height = Math.ceil(height * padding.height + padding.absolute.height)
width = Math.ceil(width * padding.width + padding.absolute.width)
console.debug(`bounds after applying padding width=${width} (*${padding.width}+${padding.absolute.width}), height=${height} (*${padding.height}+${padding.absolute.height})`)
//Resize svg
document.querySelector("svg").setAttribute("height", height)
//Enable animations

6
source/plugins/core/README.md
View File

@@ -161,7 +161,9 @@ As it can depend on fonts and operating system, it is possible that final result
You can adjust padding by using `config_padding` option.
Specify a single value to apply it to both height and with, and two values to use the first one for width and the second for height. Both positive and negative values are accepted, but you must specify a percentage.
Specify a single value to apply it to both height and with, and two values to use the first one for width and the second for height. Both positive and negative values are accepted.
The allowed format is `(absolute padding) + (relative padding)%` (each operand is optional).
#### ℹ️ Examples workflows
@@ -169,7 +171,7 @@ Specify a single value to apply it to both height and with, and two values to us
- uses: lowlighter/metrics@latest
with:
# ... other options
config_padding: 6%, 15% # 6% width padding, 15% height padding
config_padding: 16, 32 + 8% # 16px width padding, 32px + 8% height padding
```
### 🧶 Using commits, pull requests, manual reviews or gists to handle metrics output

2
source/plugins/core/metadata.yml
View File

@@ -180,7 +180,7 @@ inputs:
description: Image padding
type: array
format: comma-separated
default: 6%, 15%
default: 16, 32 + 8%
# Metrics output format
config_output: