Merge pull request #13 from NKjoep/string-cleaning

Clean up path and title
This commit is contained in:
Vladimir Carrer 2018-12-06 11:31:47 +01:00 committed by GitHub
commit 236b260a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions

View File

@ -20,7 +20,7 @@ program
if (program.url) urlvalue = program.url
else process.exit(console.log("Please add --url parameter. Something like this: $ screenshoteer --url http:www.example.com"));
!program.fullpage ? fullPage = true : fullPage = JSON.parse(program.fullpage);
!program.fullpage ? fullPage = true : fullPage = JSON.parse(program.fullpage);
console.log(urlvalue);
console.log(fullPage);
@ -37,28 +37,22 @@ console.log(fullPage);
async function execute() {
const browser = await puppeteer.launch()
const page = await browser.newPage()
const d = new Date()
const timestamp = new Date().getTime()
if (program.w && program.h) await page.setViewport({width: Number(program.w), height: Number(program.h)})
if (program.emulate) await page.emulate(devices[program.emulate]);
await page.goto(urlvalue)
const title = await page.title()
const t = title.replace(/[/\\?%*:|"<>]/g, '-')
const title = (await page.title()).replace(/[/\\?%*:|"<>]/g, '-')
if (program.waitfor) await page.waitFor(Number(program.waitfor))
if (program.el) {
const el = await page.$(program.el);
await el.screenshot({
path: `${t} ${program.emulate} ${program.el} ${d.getTime()}.png`
});
await el.screenshot({path: `${title} ${program.emulate} ${program.el} ${timestamp}.png`});
} else {
await page.screenshot({path: t + " " + program.emulate + " " + d.getTime() + '.png', fullPage: fullPage})
await page.screenshot({path: `${title} ${program.emulate} ${timestamp}.png`, fullPage: fullPage})
}
await page.emulateMedia('screen')
if (program.pdf) await page.pdf({ path: t + " " + program.emulate + " " + d.getTime() + '.pdf' })
console.log(t)
if (program.pdf) await page.pdf({path: `${title} ${program.emulate} ${timestamp}.pdf`})
console.log(title)
await browser.close()
}
})()