kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1419 from Borewit/fix/issue-1417

Browse Source 
Fix startup problems (fix for #1417)
This commit is contained in:
Alberto Miranda
2018-06-10 18:47:33 -03:00
committed by GitHub
parent 91fc7cab7c 5cdb3d059c
commit a1cfe8730b
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/renderer/lib/state.js
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(function (t, i) { config.DEFAULT_TORRENTS.forEach((t, i) => {
const infoHash = saved.torrents[i].infoHash const infoHash = saved.torrents[i].infoHash
tasks.push(function (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(function (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