Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-07-04 05:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wire up electron download progress to toasts

Browse source
This commit is contained in:
Michael Telatynski 2021-04-14 10:58:11 +01:00
parent cd93f29691
commit 0acb44d696
2 changed files with 62 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/preload.js
View file

@ -32,8 +32,7 @@ const CHANNELS = [
"seshatReply",
"setBadgeCount",
"update-downloaded",
"userDownloadCompleted",
"userDownloadOpen",
"userDownload",
];
contextBridge.exposeInMainWorld(
@ -46,6 +45,13 @@ contextBridge.exposeInMainWorld(
}
ipcRenderer.on(channel, listener);
},
removeListener(channel, listener) {
if (!CHANNELS.includes(channel)) {
console.error(`Unknown IPC channel ${channel} ignored`);
return;
}
ipcRenderer.removeListener(channel, listener);
},
send(channel, ...args) {
if (!CHANNELS.includes(channel)) {
console.error(`Unknown IPC channel ${channel} ignored`);

65
src/webcontents-handler.js
View file

@ -206,10 +206,6 @@ function onEditableContextMenu(ev, params) {
ev.preventDefault();
}
ipcMain.on('userDownloadOpen', function(ev, {path}) {
shell.openPath(path);
});
module.exports = (webContents) => {
webContents.on('new-window', onWindowOrNavigate);
webContents.on('will-navigate', (ev, target) => {
@ -228,13 +224,60 @@ module.exports = (webContents) => {
});
webContents.session.on('will-download', (event, item) => {
item.once('done', (event, state) => {
if (state === 'completed') {
const savePath = item.getSavePath();
webContents.send('userDownloadCompleted', {
path: savePath,
name: path.basename(savePath),
});
let started = false;
const ipcHandler = function(ev, {action, path}) {
if (path !== item.savePath) return;
switch (action) {
case "download":
shell.openPath(path);
ipcMain.off("userDownload", ipcHandler);
break;
case "pause":
item.pause();
break;
case "resume":
item.resume();
break;
case "cancel":
item.cancel();
ipcMain.off("userDownload", ipcHandler);
break;
case "done":
ipcMain.off("userDownload", ipcHandler);
break;
}
};
ipcMain.on("userDownload", ipcHandler);
item.on("updated", (event, state) => {
if (!item.savePath) return;
webContents.send("userDownload", {
state,
path: item.savePath,
name: path.basename(item.savePath),
totalBytes: item.getTotalBytes(),
receivedBytes: item.getReceivedBytes(),
begin: !started,
});
if (!started) started = true;
});
item.once("done", (event, state) => {
if (!item.savePath) return;
webContents.send("userDownload", {
state,
path: item.savePath,
name: path.basename(item.savePath),
totalBytes: item.getTotalBytes(),
receivedBytes: item.getReceivedBytes(),
terminal: true,
});
if (state === "interrupted") {
ipcMain.off("userDownload", ipcHandler);
}
});
});