diff --git a/libresapi/src/api/TransfersHandler.cpp b/libresapi/src/api/TransfersHandler.cpp index a255b30f0..2368cb67d 100644 --- a/libresapi/src/api/TransfersHandler.cpp +++ b/libresapi/src/api/TransfersHandler.cpp @@ -126,7 +126,8 @@ void TransfersHandler::handleDownloads(Request &req, Response &resp) double size = fi.size; double transfered = fi.transfered; stream << makeKeyValueReference("size", size) - << makeKeyValueReference("transfered", transfered); + << makeKeyValueReference("transfered", transfered) + << makeKeyValue("transfer_rate", fi.tfRate); std::string dl_status; /* diff --git a/libresapi/src/webfiles/gui.jsx b/libresapi/src/webfiles/gui.jsx index bf9aacf0a..0227c28d5 100644 --- a/libresapi/src/webfiles/gui.jsx +++ b/libresapi/src/webfiles/gui.jsx @@ -457,7 +457,7 @@ function makeFriendlyUnit(bytes) { if(bytes < 1e3) return bytes.toFixed(1) + "B"; - if(bytes < 1e3) + if(bytes < 1e6) return (bytes/1e3).toFixed(1) + "kB"; if(bytes < 1e9) return (bytes/1e6).toFixed(1) + "MB"; @@ -532,6 +532,7 @@ var DownloadsWidget = React.createClass({ {this.props.data.name} {makeFriendlyUnit(this.props.data.size)} + {makeFriendlyUnit(this.props.data.transfer_rate*1e3)}/s {this.props.data.download_status} {ctrlBtn}
cancel
{playBtn} ); @@ -543,6 +544,7 @@ var DownloadsWidget = React.createClass({ name size completed + transfer rate download status actions diff --git a/libresapi/src/webui/gui.jsx b/libresapi/src/webui/gui.jsx index bf9aacf0a..0227c28d5 100644 --- a/libresapi/src/webui/gui.jsx +++ b/libresapi/src/webui/gui.jsx @@ -457,7 +457,7 @@ function makeFriendlyUnit(bytes) { if(bytes < 1e3) return bytes.toFixed(1) + "B"; - if(bytes < 1e3) + if(bytes < 1e6) return (bytes/1e3).toFixed(1) + "kB"; if(bytes < 1e9) return (bytes/1e6).toFixed(1) + "MB"; @@ -532,6 +532,7 @@ var DownloadsWidget = React.createClass({ {this.props.data.name} {makeFriendlyUnit(this.props.data.size)} + {makeFriendlyUnit(this.props.data.transfer_rate*1e3)}/s {this.props.data.download_status} {ctrlBtn}
cancel
{playBtn} ); @@ -543,6 +544,7 @@ var DownloadsWidget = React.createClass({ name size completed + transfer rate download status actions