evan/rats-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(downloading): removing after download ability

Browse Source
This commit is contained in:
Alexey Kasyanchuk
2018-06-27 21:36:52 +03:00
parent 1a23973ba2
commit d1d816ed03
3 changed files with 182 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
src/background/api.js
View File

@ -29,6 +29,48 @@ module.exports = async ({
topCache = {};
}, 24 * 60 * 60 * 1000);
const mergeTorrentsWithDownloads = (torrents) => {
if(!torrents)
return torrents
const mergeTorrent = (torrent) => {
const id = torrentClientHashMap[torrent.hash]
if(id)
{
const download = torrentClient.get(id)
torrent.download = {
received: download.received,
downloaded: download.downloaded,
progress: download.progress,
downloadSpeed: download.downloadSpeed,
removeOnDone: download.removeOnDone
}
}
}
if(Array.isArray(torrents))
{
for(const torrent of torrents)
{
mergeTorrent(torrent)
}
}
else
{
mergeTorrent(torrents)
}
return torrents
}
const mergeTorrentsWithDownloadsFn = (Fn) => (...args) => {
const callback = args[args.length - 1]
const rest = args.slice(0, -1)
Fn(...rest, (data) => callback(mergeTorrentsWithDownloads(data)))
}
recive('recentTorrents', function(callback)
{
if(typeof callback != 'function')
@ -128,15 +170,6 @@ module.exports = async ({
callback(baseRowData(torrent))
}
if(torrentClientHashMap[hash])
{
const torrent = torrentClient.get(torrentClientHashMap[hash])
if(torrent)
{
send('downloading', torrent.infoHash)
}
}
// get votes
const {good, bad, selfVote} = await getVotes(hash)
send('votes', {
@ -152,7 +185,7 @@ module.exports = async ({
});
}
recive('torrent', onTorrent);
recive('torrent', mergeTorrentsWithDownloadsFn(onTorrent));
p2p.on('torrent', ({hash, options} = {}, callback) => {
if(!hash)
return;
@ -287,7 +320,7 @@ module.exports = async ({
});
}
recive('searchTorrent', (text, navigation, callback) => {
recive('searchTorrent', mergeTorrentsWithDownloadsFn((text, navigation, callback) => {
searchTorrentCall(text, navigation, callback)
p2p.emit('searchTorrent', {text, navigation}, (remote, socketObject) => {
console.log('remote search results', remote && remote.length)
@ -297,9 +330,9 @@ module.exports = async ({
const peer = { address: socket.remoteAddress, port: socket.remotePort }
remote = remote.map(torrent => Object.assign(torrent, {peer}))
}
send('remoteSearchTorrent', remote)
send('remoteSearchTorrent', mergeTorrentsWithDownloads(remote))
})
});
}));
p2p.on('searchTorrent', ({text, navigation} = {}, callback) => {
if(!text)
@ -410,7 +443,7 @@ module.exports = async ({
});
}
recive('searchFiles', (text, navigation, callback) => {
recive('searchFiles', mergeTorrentsWithDownloadsFn((text, navigation, callback) => {
searchFilesCall(text, navigation, callback)
p2p.emit('searchFiles', {text, navigation}, (remote, socketObject) => {
console.log('remote search files results', remote && remote.length)
@ -420,9 +453,9 @@ module.exports = async ({
const peer = { address: socket.remoteAddress, port: socket.remotePort }
remote = remote.map(torrent => Object.assign(torrent, {peer}))
}
send('remoteSearchFiles', remote)
send('remoteSearchFiles', mergeTorrentsWithDownloads(remote))
})
});
}));
p2p.on('searchFiles', ({text, navigation} = {}, callback) => {
if(!text)
@ -485,7 +518,7 @@ module.exports = async ({
});
}
recive('topTorrents', (type, navigation, callback) =>
recive('topTorrents', mergeTorrentsWithDownloadsFn((type, navigation, callback) =>
{
topTorrentsCall(type, navigation, callback)
p2p.emit('topTorrents', {type, navigation}, (remote, socketObject) => {
@ -498,7 +531,7 @@ module.exports = async ({
}
send('remoteTopTorrents', {torrents: remote, type, time: navigation && navigation.time})
})
});
}));
p2p.on('topTorrents', ({type, navigation} = {}, callback) => {
topTorrentsCall(type, navigation, (data) => callback(data))
@ -604,16 +637,33 @@ module.exports = async ({
torrent.on('ready', () => {
console.log('start downloading', torrent.infoHash, 'to', torrent.path)
send('downloading', torrent.infoHash)
progress(0) // immediately display progress
})
torrent.on('done', () => {
console.log('download done', torrent.infoHash)
progress(0) // update progress
send('downloadDone', torrent.infoHash)
// remove torrent if marked
if(torrent.removeOnDone)
{
torrentClient.remove(magnet, (err) => {
if(err)
{
console.log('download removing error', err)
return
}
delete torrentClientHashMap[torrent.infoHash]
send('downloadDone', torrent.infoHash)
})
}
else
{
send('downloadDone', torrent.infoHash)
}
})
let now = Date.now()
progress(0) // immediately display progress
torrent.on('download', (bytes) => {
if(Date.now() - now < 100)
return
@ -624,10 +674,37 @@ module.exports = async ({
if(callback)
callback(true)
return torrent
}
recive('download', torrentClient._add);
recive('downloadUpdate', (hash, options) =>
{
const id = torrentClientHashMap[hash]
if(!id)
{
console.log('cant find torrent for removing', hash)
return
}
const torrent = torrentClient.get(id)
if(!torrent) {
console.log('no torrent for update founded')
return
}
if(options.removeOnDone)
{
torrent.removeOnDone = options.removeOnDone == 'switch' ? !torrent.removeOnDone : options.removeOnDone
}
send('downloadUpdate', torrent.infoHash, {
removeOnDone: torrent.removeOnDone
})
})
recive('downloadCancel', (hash, callback) =>
{
const id = torrentClientHashMap[hash]
@ -663,7 +740,9 @@ module.exports = async ({
received: torrent.received,
downloaded: torrent.downloaded,
progress: torrent.progress,
downloadSpeed: torrent.downloadSpeed
downloadSpeed: torrent.downloadSpeed,
removeOnDone: torrent.removeOnDone
})))
})
@ -788,7 +867,7 @@ module.exports = async ({
{
callback(feed.feed)
}
recive('feed', feedCall);
recive('feed', mergeTorrentsWithDownloadsFn(feedCall));
p2p.on('feed', ({}, callback) => {
feedCall((data) => callback(data))

14
src/background/torrentClient.js
View File

@ -7,7 +7,9 @@ torrentClient.saveSession = (sessionFile) => {
torrents: torrentClient.torrents.map(torrent => ({
infoHash: torrent.infoHash,
path: torrent.path,
torrent: torrent.torrentObject
torrent: torrent.torrentObject,
removeOnDone: torrent.removeOnDone,
}))
}, null, 4), 'utf8');
}
@ -31,14 +33,20 @@ torrentClient.loadSession = (sessionFile) => {
return
}
const {torrents} = obj
torrents.forEach(({torrent, infoHash, path}) => {
torrents.forEach(({torrent, infoHash, path, removeOnDone}) => {
if(!torrent || !infoHash || !path)
{
console.log('no info for starting download this torrent')
return
}
console.log('restore download session:', torrent.name)
torrentClient._add(torrent, path)
const download = torrentClient._add(torrent, path)
if(download)
{
console.log('restore options')
// restore options
download.removeOnDone = removeOnDone
}
})
}
module.exports = torrentClient