fix(downloading): fix recheck progress indication on start and finish

DEgITx · Jun 27, 2018 · 048c0f6 · 048c0f6
1 parent 125ce95
commit 048c0f6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/app/torrent.js b/src/app/torrent.js
@@ -311,7 +311,7 @@ export default class Torrent extends Component {
                   </div>
   							}
   							{
-  								this.state.downloading
+  								(this.state.downloading || this.state.downloaded)
                                     &&
                                     <div className='row w100p inline text-nowrap' style={{maxWidth: 580}}>
                                     	<div style={{marginRight: 5, color: 'rgb(0, 188, 212)'}}>{__('downloading')}: </div>

diff --git a/src/background/api.js b/src/background/api.js
@@ -591,29 +591,35 @@ module.exports = async ({
 		torrentClientHashMap[torrent.infoHash] = magnet
 		torrent.torrentObject = torrentObject
 
+		const progress = (bytes) => {
+			send('downloadProgress', torrent.infoHash, {
+				received: bytes,
+				downloaded: torrent.downloaded,
+				downloadSpeed: torrent.downloadSpeed,
+				progress: torrent.progress,
+				timeRemaining: torrent.timeRemaining
+			})
+		}
+
 		torrent.on('ready', () => {
 			console.log('start downloading', torrent.infoHash, 'to', torrent.path)
 			send('downloading', torrent.infoHash)
 		})
 
 		torrent.on('done', () => { 
 			console.log('download done', torrent.infoHash)
+			progress(0) // update progress
 			send('downloadDone', torrent.infoHash)
 		})
 
 		let now = Date.now()
+		progress(0) // immediately display progress
 		torrent.on('download', (bytes) => {
 			if(Date.now() - now < 100)
 				return
 			now = Date.now()
 
-			send('downloadProgress', torrent.infoHash, {
-				received: bytes,
-				downloaded: torrent.downloaded,
-				downloadSpeed: torrent.downloadSpeed,
-				progress: torrent.progress,
-				timeRemaining: torrent.timeRemaining
-			})
+			progress(bytes)
 		})
 
 		if(callback)