LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

cuts staging from master #918

Merged
jessopb merged 15 commits from master into staging 2019-02-16 22:31:54 +01:00
Conversation 0 Commits 15 Files changed 23 +27 -23
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2ff0728db4 - Show all commits

42
cli/configure.js
View file

@ -13,7 +13,8 @@ let thumbnailChannelDefault = '@thumbnails';
let thumbnailChannel = ''; let thumbnailChannel = '';
let thumbnailChannelId = ''; let thumbnailChannelId = '';
const createConfigFile = (fileName, configObject, topSecret) => { // siteConfig.json , siteConfig const createConfigFile = (fileName, configObject, topSecret) => {
// siteConfig.json , siteConfig
const fileLocation = topSecret const fileLocation = topSecret
? Path.resolve(__dirname, `../site/private/${fileName}`) ? Path.resolve(__dirname, `../site/private/${fileName}`)
: Path.resolve(__dirname, `../site/config/${fileName}`); : Path.resolve(__dirname, `../site/config/${fileName}`);
@ -39,15 +40,8 @@ try {
siteConfig = require('./defaults/siteConfig.json'); siteConfig = require('./defaults/siteConfig.json');
} }
const { const {
details: { details: { port, title, host },
port, publishing: { uploadDirectory, channelClaimBidAmount: channelBid },
title,
host,
},
publishing: {
uploadDirectory,
channelClaimBidAmount: channelBid,
},
} = siteConfig; } = siteConfig;
let lbryConfig; let lbryConfig;
@ -111,7 +105,7 @@ inquirer
console.log('\nRetrieving your primary claim address from LBRY...'); console.log('\nRetrieving your primary claim address from LBRY...');
return axios return axios
.post('http://localhost:5279', { .post('http://localhost:5279', {
method: 'wallet_list', method: 'address_list',
}) })
.then(response => { .then(response => {
if (response.data) { if (response.data) {
@ -125,7 +119,8 @@ inquirer
return; return;
} }
throw new Error('No data received from lbrynet'); throw new Error('No data received from lbrynet');
}).catch(error => { })
.catch(error => {
throw error; throw error;
}); });
}) })
@ -159,7 +154,10 @@ inquirer
} }
console.log('name:', foundChannel.name); console.log('name:', foundChannel.name);
console.log('claim_id:', foundChannel.claim_id); console.log('claim_id:', foundChannel.claim_id);
if (foundChannel.name === thumbnailChannel && foundChannel.claim_id === thumbnailChannelId) { if (
foundChannel.name === thumbnailChannel &&
foundChannel.claim_id === thumbnailChannelId
) {
console.log('No update to existing thumbnail config required\n'); console.log('No update to existing thumbnail config required\n');
} else { } else {
console.log(`Replacing thumbnail channel in config...`); console.log(`Replacing thumbnail channel in config...`);
@ -174,11 +172,12 @@ inquirer
return false; return false;
} }
throw new Error('No data received from lbrynet'); throw new Error('No data received from lbrynet');
}).catch(error => { })
.catch(error => {
throw error; throw error;
}); });
}) })
.then((thumbnailChannelAlreadyExists) => { .then(thumbnailChannelAlreadyExists => {
// exit if a channel already exists, skip this step // exit if a channel already exists, skip this step
if (thumbnailChannelAlreadyExists) { if (thumbnailChannelAlreadyExists) {
return; return;
@ -207,7 +206,8 @@ inquirer
return; return;
} }
throw new Error('No data received from lbrynet'); throw new Error('No data received from lbrynet');
}).catch(error => { })
.catch(error => {
throw error; throw error;
}); });
}) })
@ -232,11 +232,15 @@ inquirer
createConfigFile('authConfig.json', authConfig, true); createConfigFile('authConfig.json', authConfig, true);
}) })
.then(() => { .then(() => {
console.log('\nYou\'re all done!'); console.log("\nYou're all done!");
console.log('\nIt\'s a good idea to BACK UP YOUR MASTER PASSWORD \nin "/site/private/authConfig.json" so that you don\'t lose \ncontrol of your channel.'); console.log(
'\nIt\'s a good idea to BACK UP YOUR MASTER PASSWORD \nin "/site/private/authConfig.json" so that you don\'t lose \ncontrol of your channel.'
);
console.log('\nNext step: run "npm run start" to build and start your server!'); console.log('\nNext step: run "npm run start" to build and start your server!');
console.log('If you want to change any settings, you can edit the files in the "/site" folder.'); console.log(
'If you want to change any settings, you can edit the files in the "/site" folder.'
);
process.exit(0); process.exit(0);
}) })
.catch(error => { .catch(error => {