Make error tips more readable for png to apng converter

iSparta · Aug 26, 2017 · 69415fe · 69415fe
1 parent d8ca883
commit 69415fe
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/src/app/assets/js/iSparta.apng.js b/src/app/assets/js/iSparta.apng.js
@@ -269,9 +269,10 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ } else {
+ resolve();
  }
- resolve();
  });
  });
  }
@@ -284,9 +285,10 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ } else {
+ resolve();
  }
- resolve();
  });
  });
  };
@@ -299,9 +301,10 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ } else {
+ resolve();
  }
- resolve();
  });
  });
  };
@@ -313,11 +316,12 @@
  // return new Promise(function(resolve, reject) {
  // child_process.exec(apngoptcomd, {timeout: 1000000}, function(err, stdout, stderr) {
  // if (err) {
- // console.log('stdout: ' + stdout);
- // console.log('stderr: ' + stderr);
- // throw err;
+ // console.log('stdout: ' + stdout);
+ // console.log('stderr: ' + stderr);
+ // reject(err);
+ // } else {
+ // resolve();
  // }
- // resolve();
  // });
  // });
  // };

diff --git a/src/app/assets/js/iSparta.apng2webp.js b/src/app/assets/js/iSparta.apng2webp.js
@@ -229,9 +229,10 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ } else {
+ resolve();
  }
- resolve();
  });
  });
  };
@@ -242,9 +243,10 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ } else {
+ resolve();
  }
- resolve();
  });
  });
  };
@@ -262,7 +264,8 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ return;
  }
  var delay = Math.round((frame['delay_num']) / (frame['delay_den']) * 1000);
  if (delay === 0) { // The specs say zero is allowed, but should be treated as 10 ms.
@@ -300,9 +303,10 @@
  if (err) {
  console.log('stdout: ' + stdout);
  console.log('stderr: ' + stderr);
- throw err;
+ reject(err);
+ } else {
+ resolve();
  }
- resolve();
  });
  });
  };