Merge pull request #1679 from webtorrent/then

Use promise then() instead of catch() with callbacks
webtorrent · Sep 10, 2019 · 4a10a2d · 4a10a2d
2 parents 992ab0b + dd13de5
commit 4a10a2d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/renderer/lib/state.js b/src/renderer/lib/state.js
@@ -151,8 +151,10 @@ function setupStateSaved (cb) {
   })
 
   Promise.all(tasks)
-    .then(() => cb(null, saved))
-    .catch(err => cb(err))
+    .then(
+      () => cb(null, saved),
+      err => cb(err)
+    )
 
   function createTorrentObject (t) {
     // TODO: Doing several fs.readFileSync calls during first startup is not ideal

diff --git a/src/renderer/webtorrent.js b/src/renderer/webtorrent.js
@@ -358,11 +358,15 @@ function getAudioMetadata (infoHash, index) {
     : mm.parseStream(file.createReadStream(), file.name, options)
 
   onMetaData
-    .then(() => {
-      console.log(`metadata for file='${file.name}' completed.`)
-    }).catch(function (err) {
-      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-    })
+    .then(
+      () => console.log(`metadata for file='${file.name}' completed.`),
+      err => {
+        console.log(
+          `error getting audio metadata for ${infoHash}:${index}`,
+          err
+        )
+      }
+    )
 }
 
 function selectFiles (torrentOrInfoHash, selections) {