Skip to content

feat: screenshot improvements #1689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidel merged 2 commits into from
Oct 9, 2020
Merged

feat: screenshot improvements #1689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa6e636
feat: take screenshot improvements
lidel Oct 9, 2020
bbf556d
fix: screenshot name
lidel Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/take-screenshot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ async function makeScreenshotDir (ipfs) {
}
}

async function onSucess (ipfs, launchWebUI, path, img) {
const stats = await ipfs.files.stat(path)
const url = `https://share.ipfs.io/#/${stats.hash}`
async function onSuccess (ipfs, launchWebUI, path, img) {
// preserve filename if single file is shared
const filename = path.endsWith('.png') ? `?filename=${encodeURIComponent(path.split('/').pop())}` : ''
const { cid } = await ipfs.files.stat(path)
const url = `https://dweb.link/ipfs/${cid}${filename}`
clipboard.writeText(url)

notify({
Expand Down Expand Up @@ -65,14 +67,15 @@ function handleScreenshot (ctx) {
try {
await makeScreenshotDir(ipfs)
const isDir = output.length > 1
const rawDate = new Date()
const date = `${rawDate.getFullYear()}-${rawDate.getMonth()}-${rawDate.getDate()}`
const time = `${rawDate.getHours()}.${rawDate.getMinutes()}.${rawDate.getMilliseconds()}`
let baseName = `/screenshots/${date} ${time}`
const d = new Date()
const pad = n => String(n).padStart(2, '0')
const date = `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
const time = `${pad(d.getHours())}${pad(d.getMinutes())}${pad(d.getMilliseconds())}`
let baseName = `/screenshots/${date}_${time}`

if (isDir) {
baseName += '/'
await ipfs.files.mkdir(baseName)
await ipfs.files.mkdir(baseName, { parents: true })
} else {
baseName += '.png'
}
Expand All @@ -83,12 +86,13 @@ function handleScreenshot (ctx) {
for (const { name, image } of output) {
const img = nativeImage.createFromDataURL(image)
const path = isDir ? `${baseName}${name}.png` : baseName
await ipfs.files.write(path, img.toPNG(), { create: true })
const { cid } = await ipfs.add(img.toPNG(), { pin: false }) // no low level pin, presence in MFS will be enough to keep it around
await ipfs.files.cp(cid, path)
lastImage = img
}

logger.info(`[screenshot] completed: writing screenshots to ${baseName}`)
onSucess(ipfs, launchWebUI, baseName, lastImage)
onSuccess(ipfs, launchWebUI, baseName, lastImage)
} catch (e) {
onError(e)
}
Expand Down