From 904aa80fa134c47ebc1290884872b0c57ef61366 Mon Sep 17 00:00:00 2001 From: Vladimir Carrer Date: Wed, 5 Dec 2018 00:12:02 +0100 Subject: [PATCH] Windows safe filename regex --- index.js | 10 ++++++---- package.json | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index aeb67eb..e622121 100755 --- a/index.js +++ b/index.js @@ -35,17 +35,19 @@ console.log(fullPage); 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, '-') if (program.waitfor) await page.waitFor(Number(program.waitfor)) if (program.el) { const el = await page.$(program.el); await el.screenshot({ - path: `${await page.title()} ${program.emulate} ${program.el} ${d.getTime()}.png` + path: `${t} ${program.emulate} ${program.el} ${d.getTime()}.png` }); } else { - await page.screenshot({path: await page.title() + " " + program.emulate + " " + d.getTime() + '.png', fullPage: fullPage}) + await page.screenshot({path: t + " " + program.emulate + " " + d.getTime() + '.png', fullPage: fullPage}) } await page.emulateMedia('screen') - if (program.pdf) await page.pdf({ path: await page.title() + " " + program.emulate + " " + d.getTime() + '.pdf' }) - console.log(await page.title()) + if (program.pdf) await page.pdf({ path: t + " " + program.emulate + " " + d.getTime() + '.pdf' }) + console.log(t) await browser.close() })() diff --git a/package.json b/package.json index f419f21..68e484f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "screenshoteer", - "version": "1.0.2", + "version": "1.0.3", "description": "Make screenshots and device emulations form your terminal", "main": "index.js", "scripts": {