Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Keeping track of multiple downloads in torrent plugin

Browse source
This commit is contained in:
Fabio Manganiello 2018-10-22 15:24:09 +00:00
parent 9974583038
commit ce6baa453c
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
platypush/plugins/torrent.py
View file

@ -167,19 +167,19 @@ class TorrentPlugin(Plugin):
status = transfer.status() status = transfer.status()
files = [] files = []
self.torrent_state = { self.torrent_state[torrent] = {
'url': info['url'] or magnet or torrent_file, 'url': torrent,
'title': info['name'], 'title': info['name'],
'trackers': info['trackers'], 'trackers': info['trackers'],
'save_path': info['save_path'], 'save_path': info['save_path'],
} }
bus.post(TorrentDownloadStartEvent(**self.torrent_state)) bus.post(TorrentDownloadStartEvent(**self.torrent_state[torrent]))
last_status = None last_status = None
while (not status.is_seeding): while (not status.is_seeding):
if not last_status: if not last_status:
bus.post(TorrentSeedingStartEvent(**self.torrent_state)) bus.post(TorrentSeedingStartEvent(**self.torrent_state[torrent]))
status = transfer.status() status = transfer.status()
torrent_file = transfer.torrent_file() torrent_file = transfer.torrent_file()
@ -190,17 +190,17 @@ class TorrentPlugin(Plugin):
for i in range(0, torrent_file.files().num_files()) for i in range(0, torrent_file.files().num_files())
] ]
self.torrent_state['progress'] = 100 * status.progress self.torrent_state[torrent]['progress'] = 100 * status.progress
self.torrent_state['download_rate'] = status.download_rate self.torrent_state[torrent]['download_rate'] = status.download_rate
self.torrent_state['upload_rate'] = status.upload_rate self.torrent_state[torrent]['upload_rate'] = status.upload_rate
self.torrent_state['num_peers'] = status.num_peers self.torrent_state[torrent]['num_peers'] = status.num_peers
self.torrent_state['state'] = status.state self.torrent_state[torrent]['state'] = status.state
if last_status and status.progress != last_status.progress: if last_status and status.progress != last_status.progress:
bus.post(TorrentDownloadProgressEvent(**self.torrent_state)) bus.post(TorrentDownloadProgressEvent(**self.torrent_state[torrent]))
if not last_status or status.state != last_status.state: if not last_status or status.state != last_status.state:
bus.post(TorrentStateChangeEvent(**self.torrent_state)) bus.post(TorrentStateChangeEvent(**self.torrent_state[torrent]))
self.logger.info(('Torrent download: {:.2f}% complete (down: {:.1f} kb/s ' + self.logger.info(('Torrent download: {:.2f}% complete (down: {:.1f} kb/s ' +
'up: {:.1f} kB/s peers: {} state: {})') 'up: {:.1f} kB/s peers: {} state: {})')
@ -216,7 +216,8 @@ class TorrentPlugin(Plugin):
try: os.unlink(torrent_file) try: os.unlink(torrent_file)
except: pass except: pass
bus.post(TorrentStateChangeEvent(**self.torrent_state, files=files)) bus.post(TorrentStateChangeEvent(**self.torrent_state[torrent], files=files))
del self.torrent_state[torrent]
return files return files