#1417: Simplify code

- use forEach instead of map (because return value was ignored)
- use Promise.all instead of parallel, because tasks are already Promise based. Fewer callbacks.
This commit is contained in:
Borewit
2018-06-09 14:54:24 +02:00
parent b010dc28d2
commit 5cdb3d059c

View File

@@ -113,7 +113,6 @@ function setupStateSaved (cb) {
const cpFile = require('cp-file') const cpFile = require('cp-file')
const fs = require('fs') const fs = require('fs')
const parseTorrent = require('parse-torrent') const parseTorrent = require('parse-torrent')
const parallel = require('run-parallel')
const saved = { const saved = {
prefs: { prefs: {
@@ -133,26 +132,25 @@ function setupStateSaved (cb) {
const tasks = [] const tasks = []
config.DEFAULT_TORRENTS.map((t, i) => { config.DEFAULT_TORRENTS.forEach((t, i) => {
const infoHash = saved.torrents[i].infoHash const infoHash = saved.torrents[i].infoHash
tasks.push(cb => { tasks.push(
cpFile( cpFile(
path.join(config.STATIC_PATH, t.posterFileName), path.join(config.STATIC_PATH, t.posterFileName),
path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName)) path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
).then(() => cb()).catch(cb) )
}) )
tasks.push(cb => { tasks.push(
cpFile( cpFile(
path.join(config.STATIC_PATH, t.torrentFileName), path.join(config.STATIC_PATH, t.torrentFileName),
path.join(config.TORRENT_PATH, infoHash + '.torrent') path.join(config.TORRENT_PATH, infoHash + '.torrent')
).then(() => cb()).catch(cb) )
}) )
}) })
parallel(tasks, function (err) { Promise.all(tasks)
if (err) return cb(err) .then(() => cb(null, saved))
cb(null, saved) .catch(err => cb(err))
})
function createTorrentObject (t) { function createTorrentObject (t) {
// TODO: Doing several fs.readFileSync calls during first startup is not ideal // TODO: Doing several fs.readFileSync calls during first startup is not ideal