Changed electron fs-job to invoke, for simplefying storage (#1106)
* Changed electron fs-job to invoke, for simplefying storage (And it helps for the modloader) * Reverted some unneeded chages * Uploaded wrong file * Removed uneeded promise
This commit is contained in:
parent
7f2132d763
commit
22b8777aa0
|
@ -1,9 +1,8 @@
|
||||||
/* eslint-disable quotes,no-undef */
|
/* eslint-disable quotes,no-undef */
|
||||||
|
|
||||||
const { app, BrowserWindow, Menu, MenuItem, session } = require("electron");
|
const { app, BrowserWindow, Menu, MenuItem, ipcMain, shell } = require("electron");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const url = require("url");
|
const url = require("url");
|
||||||
const { ipcMain, shell } = require("electron");
|
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const steam = require("./steam");
|
const steam = require("./steam");
|
||||||
const asyncLock = require("async-lock");
|
const asyncLock = require("async-lock");
|
||||||
|
@ -287,10 +286,7 @@ async function performFsJob(job) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ipcMain.on("fs-job", async (event, arg) => {
|
ipcMain.handle("fs-job", (event, arg) => performFsJob(arg));
|
||||||
const result = await performFsJob(arg);
|
|
||||||
event.reply("fs-response", { id: arg.id, result });
|
|
||||||
});
|
|
||||||
|
|
||||||
steam.init(isDev);
|
steam.init(isDev);
|
||||||
steam.listen();
|
steam.listen();
|
||||||
|
|
|
@ -7,24 +7,6 @@ const logger = createLogger("electron-storage");
|
||||||
export class StorageImplElectron extends StorageInterface {
|
export class StorageImplElectron extends StorageInterface {
|
||||||
constructor(app) {
|
constructor(app) {
|
||||||
super(app);
|
super(app);
|
||||||
|
|
||||||
/** @type {Object.<number, {resolve:Function, reject: Function}>} */
|
|
||||||
this.jobs = {};
|
|
||||||
this.jobId = 0;
|
|
||||||
|
|
||||||
getIPCRenderer().on("fs-response", (event, arg) => {
|
|
||||||
const id = arg.id;
|
|
||||||
if (!this.jobs[id]) {
|
|
||||||
logger.warn("Got unhandled FS response, job not known:", id);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const { resolve, reject } = this.jobs[id];
|
|
||||||
if (arg.result.success) {
|
|
||||||
resolve(arg.result.data);
|
|
||||||
} else {
|
|
||||||
reject(arg.result.error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
initialize() {
|
initialize() {
|
||||||
|
@ -33,42 +15,52 @@ export class StorageImplElectron extends StorageInterface {
|
||||||
|
|
||||||
writeFileAsync(filename, contents) {
|
writeFileAsync(filename, contents) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
// ipcMain
|
getIPCRenderer()
|
||||||
const jobId = ++this.jobId;
|
.invoke("fs-job", {
|
||||||
this.jobs[jobId] = { resolve, reject };
|
|
||||||
|
|
||||||
getIPCRenderer().send("fs-job", {
|
|
||||||
type: "write",
|
type: "write",
|
||||||
filename,
|
filename,
|
||||||
contents,
|
contents,
|
||||||
id: jobId,
|
})
|
||||||
|
.then(result => {
|
||||||
|
if (result.success) {
|
||||||
|
resolve(result.data);
|
||||||
|
} else {
|
||||||
|
reject(result.error);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
readFileAsync(filename) {
|
readFileAsync(filename) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
// ipcMain
|
getIPCRenderer()
|
||||||
const jobId = ++this.jobId;
|
.invoke("fs-job", {
|
||||||
this.jobs[jobId] = { resolve, reject };
|
|
||||||
|
|
||||||
getIPCRenderer().send("fs-job", {
|
|
||||||
type: "read",
|
type: "read",
|
||||||
filename,
|
filename,
|
||||||
id: jobId,
|
})
|
||||||
|
.then(result => {
|
||||||
|
if (result.success) {
|
||||||
|
resolve(result.data);
|
||||||
|
} else {
|
||||||
|
reject(result.error);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteFileAsync(filename) {
|
deleteFileAsync(filename) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
// ipcMain
|
getIPCRenderer()
|
||||||
const jobId = ++this.jobId;
|
.invoke("fs-job", {
|
||||||
this.jobs[jobId] = { resolve, reject };
|
|
||||||
getIPCRenderer().send("fs-job", {
|
|
||||||
type: "delete",
|
type: "delete",
|
||||||
filename,
|
filename,
|
||||||
id: jobId,
|
})
|
||||||
|
.then(result => {
|
||||||
|
if (result.success) {
|
||||||
|
resolve(result.data);
|
||||||
|
} else {
|
||||||
|
reject(result.error);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue