From ddcae88b2770af5b90c1f7c1a9775e80280b1549 Mon Sep 17 00:00:00 2001 From: DC Date: Mon, 28 Mar 2016 21:23:52 -0700 Subject: [PATCH] Loading spinner: show download speed --- renderer/index.css | 2 +- renderer/views/player.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/renderer/index.css b/renderer/index.css index 67b7ea28..0f7618e4 100644 --- a/renderer/index.css +++ b/renderer/index.css @@ -727,7 +727,7 @@ body.drag .torrent-placeholder span { .media-stalled .loading-spinner { width: 40px; height: 40px; - margin: 0 auto; + margin: 40px auto; } .audio-metadata .audio-title { diff --git a/renderer/views/player.js b/renderer/views/player.js index 285b9538..c404c497 100644 --- a/renderer/views/player.js +++ b/renderer/views/player.js @@ -4,6 +4,8 @@ var h = require('virtual-dom/h') var hyperx = require('hyperx') var hx = hyperx(h) +var prettyBytes = require('prettier-bytes') + var util = require('../util') var {dispatch, dispatcher} = require('../lib/dispatcher') @@ -145,12 +147,21 @@ function renderLoadingSpinner (state) { if (state.playing.isPaused) return var isProbablyStalled = state.playing.isStalled || (new Date().getTime() - state.playing.lastTimeUpdate > 2000) - console.log("STALLED? " + isProbablyStalled) if (!isProbablyStalled) return + var torrentSummary = getPlayingTorrentSummary(state) + var torrent = state.client.get(torrentSummary.infoHash) + var file = torrentSummary.files[state.playing.fileIndex] + var progress = Math.floor(100 * file.numPiecesPresent / file.numPieces) + return hx`
 
+
+ ${progress}% downloaded, + ↓ ${prettyBytes(torrent.downloadSpeed || 0)}/s + ↑ ${prettyBytes(torrent.uploadSpeed || 0)}/s +
` }