status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

more linting and add condition in case of no hash

This commit is contained in:
Jonathan Rainville 2018-05-01 10:20:27 -04:00
parent 2ad852667e
commit 3bf5093f1b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/modules/swarm/embarkjs.js
View File

@ -11,7 +11,7 @@ __embarkSwarm.setProvider = function (options) {
this.connectError = new Error(`Cannot connect to Swarm node on ${this.connectUrl}`); this.connectError = new Error(`Cannot connect to Swarm node on ${this.connectUrl}`);
this._getUrl = options.getUrl || `${this.connectUrl}/bzzr:/`; this._getUrl = options.getUrl || `${this.connectUrl}/bzzr:/`;
var promise = new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
if (!this.bzz.currentProvider) { if (!this.bzz.currentProvider) {
this.bzz.setProvider(`${options.protocol}://${options.host}:${options.port}`); this.bzz.setProvider(`${options.protocol}://${options.host}:${options.port}`);
@ -22,7 +22,6 @@ __embarkSwarm.setProvider = function (options) {
reject(this.connectError); reject(this.connectError);
} }
}); });
return promise;
}; };
__embarkSwarm.isAvailable = function () { __embarkSwarm.isAvailable = function () {
@ -72,9 +71,9 @@ __embarkSwarm.uploadFile = function (inputSelector) {
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var reader = new FileReader(); const reader = new FileReader();
reader.onloadend = (event) => { reader.onloadend = (event) => {
var fileContent = new Uint8Array(event.target.result); const fileContent = new Uint8Array(event.target.result);
this.isAvailable().then((isAvailable) => { this.isAvailable().then((isAvailable) => {
if (!isAvailable) { if (!isAvailable) {
return reject(this.connectError); return reject(this.connectError);

7
lib/modules/swarm/upload.js
View File

@ -28,6 +28,9 @@ class Swarm {
.catch(callback); .catch(callback);
}, },
function printUrls(dir_hash, callback) { function printUrls(dir_hash, callback) {
if (!dir_hash) {
return callback('No directory hash was returned');
}
console.log((`=== DApp available at ${self.storageConfig.getUrl}${dir_hash}/`).green); console.log((`=== DApp available at ${self.storageConfig.getUrl}${dir_hash}/`).green);
callback(); callback();
@ -36,9 +39,9 @@ class Swarm {
if (err) { if (err) {
console.log("error uploading to swarm".red); console.log("error uploading to swarm".red);
console.log(err); console.log(err);
reject(err); return reject(err);
} }
else resolve('successfully uploaded to swarm'); resolve('successfully uploaded to swarm');
}); });
}); });
} }