LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-08-23 17:47:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "check if daemon is already installed before installing again"

Browse source
This commit is contained in:
Sean Yesmunt 2018-07-21 05:22:28 -04:00 • committed by GitHub
parent 2d7cf51630
commit 814162f1e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,8 +1,7 @@
/node_modules /node_modules
/dist /dist
/static/daemon/lbrynet-daemon* /static/daemon/lbrynet*
/static/locales /static/locales
yarn-error.log yarn-error.log
package-lock.json package-lock.json
.idea/ .idea/
/build/daemon.ver

50
build/downloadDaemon.js
View file

@ -1,6 +1,6 @@
/* eslint-disable no-console,import/no-extraneous-dependencies,import/no-commonjs */ /* eslint-disable no-console,import/no-extraneous-dependencies,import/no-commonjs */
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs-path');
const packageJSON = require('../package.json'); const packageJSON = require('../package.json');
const axios = require('axios'); const axios = require('axios');
const decompress = require('decompress'); const decompress = require('decompress');
@ -11,38 +11,20 @@ const downloadDaemon = targetPlatform =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
const daemonURLTemplate = packageJSON.lbrySettings.lbrynetDaemonUrlTemplate; const daemonURLTemplate = packageJSON.lbrySettings.lbrynetDaemonUrlTemplate;
const daemonVersion = packageJSON.lbrySettings.lbrynetDaemonVersion; const daemonVersion = packageJSON.lbrySettings.lbrynetDaemonVersion;
const daemonDir = path.join(__dirname,'..',packageJSON.lbrySettings.lbrynetDaemonDir); const daemonDir = packageJSON.lbrySettings.lbrynetDaemonDir;
let daemonFileName = packageJSON.lbrySettings.lbrynetDaemonFileName; const daemonFileName = packageJSON.lbrySettings.lbrynetDaemonFileName;
let currentPlatform = os.platform(); let currentPlatform = os.platform();
if (currentPlatform === 'darwin') currentPlatform = 'macos'; if (currentPlatform === 'darwin') currentPlatform = 'macos';
if (currentPlatform === 'win32') { if (currentPlatform === 'win32') currentPlatform = 'windows';
currentPlatform = 'windows';
daemonFileName = daemonFileName + '.exe';
}
const daemonFilePath = path.join(daemonDir, daemonFileName);
const daemonVersionPath = path.join(__dirname, 'daemon.ver');
const daemonPlatform = targetPlatform || currentPlatform; const daemonPlatform = targetPlatform || currentPlatform;
const tmpZipPath = path.join(__dirname, '../','dist','daemon.zip');
const daemonURL = daemonURLTemplate const daemonURL = daemonURLTemplate
.replace(/DAEMONVER/g, daemonVersion) .replace(/DAEMONVER/g, daemonVersion)
.replace(/OSNAME/g, daemonPlatform); .replace(/OSNAME/g, daemonPlatform);
const tmpZipPath = 'dist/daemon.zip';
// If a daemon and daemon.ver exists, check to see if it matches the current daemon version
const hasDaemonDownloaded = fs.existsSync(daemonFilePath);
const hasDaemonVersion = fs.existsSync(daemonVersionPath);
let downloadedDaemonVersion;
if (hasDaemonVersion) {
downloadedDaemonVersion = fs.readFileSync(daemonVersionPath, "utf8");
}
if (hasDaemonDownloaded && hasDaemonVersion && downloadedDaemonVersion === daemonVersion) {
console.log('\x1b[34minfo\x1b[0m Daemon already downloaded');
resolve('Done');
return;
} else {
console.log('\x1b[34minfo\x1b[0m Downloading daemon...'); console.log('\x1b[34minfo\x1b[0m Downloading daemon...');
axios axios
.request({ .request({
@ -57,26 +39,21 @@ const downloadDaemon = targetPlatform =>
result => result =>
new Promise((newResolve, newReject) => { new Promise((newResolve, newReject) => {
fs.writeFile(tmpZipPath, result.data, error => { fs.writeFile(tmpZipPath, result.data, error => {
if (error) return newReject(error); if (error) return newReject(error);
return newResolve(); return newResolve();
}); });
}) })
) )
.then(() => del(`${daemonFilePath}*`)) .then(() => del(`${daemonDir}/${daemonFileName}*`))
.then(() => decompress(tmpZipPath, daemonDir, { .then(() =>
decompress(tmpZipPath, daemonDir, {
filter: file => filter: file =>
path.basename(file.path) === daemonFileName, path.basename(file.path).replace(path.extname(file.path), '') === daemonFileName,
})) })
.then(() => del(`${tmpZipPath }*`)) )
.then(() => { .then(() => {
console.log('\x1b[32msuccess\x1b[0m Daemon downloaded!'); console.log('\x1b[32msuccess\x1b[0m Daemon downloaded!');
if (hasDaemonVersion) { resolve(true);
del(daemonVersionPath);
}
fs.writeFileSync(daemonVersionPath, daemonVersion, "utf8")
resolve('Done');
}) })
.catch(error => { .catch(error => {
console.error( console.error(
@ -84,7 +61,6 @@ const downloadDaemon = targetPlatform =>
); );
reject(error); reject(error);
}); });
}
}); });
module.exports = downloadDaemon; module.exports = downloadDaemon;