[AsarUpdate] Clean up unneeded logging

main
Oj 2 years ago
parent c9d2d435fe
commit 39eaf6c589

@ -5,31 +5,24 @@ const electron = require('electron');
const { join } = require('path'); const { join } = require('path');
const asarPath = join(require.main.filename, '..'); const asarPath = join(require.main.filename, '..');
log('AsarUpdate', 'Asar Path:', asarPath);
const downloadPath = join(require.main.filename, '..', '..', 'app.asar.download'); const downloadPath = join(require.main.filename, '..', '..', 'app.asar.download');
log('AsarUpdate', 'Download Path:', downloadPath);
const downloadUrls = { const downloadUrls = {
nightly: 'https://github.com/GooseMod/OpenAsar/releases/download/nightly/app.asar' nightly: 'https://github.com/GooseMod/OpenAsar/releases/download/nightly/app.asar'
}; };
const channel = 'nightly'; // Have prod, etc. once stable / 1.0 const channel = 'nightly';
const getAsarHash = () => crypto.createHash('sha512').update(fs.readFileSync(asarPath)).digest('hex'); const getAsarHash = () => crypto.createHash('sha512').update(fs.readFileSync(asarPath)).digest('hex');
module.exports = async () => { // (Try) update asar module.exports = async () => { // (Try) update asar
log('AsarUpdate', 'Updating...'); log('AsarUpdate', 'Updating...');
if (!oaVersion.startsWith('nightly-')) { if (!oaVersion.startsWith('nightly-')) return log('AsarUpdate', 'Non-standard version');
return log('AsarUpdate', 'Found non-standard version, not updating');
}
const asarUrl = downloadUrls[channel]; const asarUrl = downloadUrls[channel];
log('AsarUpdate', 'Release Channel:', channel, 'Download URL:', asarUrl);
const originalHash = getAsarHash(); const originalHash = getAsarHash();
log('AsarUpdate', 'Original Hash:', originalHash);
const downloadSuccess = await new Promise((res) => { const downloadSuccess = await new Promise((res) => {
const file = fs.createWriteStream(downloadPath); const file = fs.createWriteStream(downloadPath);
@ -43,14 +36,11 @@ module.exports = async () => { // (Try) update asar
res(false); res(false);
}); });
log('AsarUpdate', 'Opened write stream to download asar');
const req = request.get(asarUrl); const req = request.get(asarUrl);
req.on('response', (res) => { req.on('response', (res) => {
if (writeError) return; if (writeError) return;
log('AsarUpdate', 'Piping download response to stream');
res.pipe(file); res.pipe(file);
}); });
@ -61,12 +51,10 @@ module.exports = async () => { // (Try) update asar
}); });
if (!downloadSuccess) { if (!downloadSuccess) {
log('AsarUpdate', 'Aborting rest of update due to download error'); log('AsarUpdate', 'Download error');
return; return;
} }
log('AsarUpdate', 'Completed download, copying over');
const copySuccess = await new Promise((res) => { const copySuccess = await new Promise((res) => {
try { try {
fs.copyFileSync(downloadPath, asarPath); // Overwrite actual app.asar fs.copyFileSync(downloadPath, asarPath); // Overwrite actual app.asar
@ -78,18 +66,14 @@ module.exports = async () => { // (Try) update asar
} }
}); });
if (!copySuccess) { if (!copySuccess) return;
log('AsarUpdate', 'Aborting rest of update due to copy error');
return;
}
const newHash = getAsarHash(); const newHash = getAsarHash();
const changed = originalHash !== newHash; const changed = originalHash !== newHash;
log('AsarUpdate', `Hash Comparison: log('AsarUpdate', `Hash Comparison:
Original Hash: ${originalHash} Original: ${originalHash}
New Hash: ${newHash} New: ${newHash}`);
Changed: ${changed}`);
if (changed && oaConfig.updatePrompt === true) { if (changed && oaConfig.updatePrompt === true) {
const { response } = await electron.dialog.showMessageBox(null, { const { response } = await electron.dialog.showMessageBox(null, {
@ -99,11 +83,7 @@ Changed: ${changed}`);
defaultId: 0 defaultId: 0
}); });
log('AsarUpdate', 'Modal response', response);
if (response === 0) { if (response === 0) {
log('AsarUpdate', 'Restarting');
electron.app.relaunch(); electron.app.relaunch();
electron.app.exit(); electron.app.exit();
} }

Loading…
Cancel
Save