ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Compare commits

base: ODWRTW:ae7c752e43ae672797835d62cae5db6a507fce8e
Branches Tags
ODWRTW:master
ODWRTW:lint
ODWRTW:updatePolochon
ODWRTW:refreshShow
...
compare: ODWRTW:93e427fc73fecb88967b2450d9364d9bde6e0502
Branches Tags
ODWRTW:lint
ODWRTW:master
ODWRTW:updatePolochon
ODWRTW:refreshShow

2 Commits
ae7c752e43 ... 93e427fc73

Author SHA1 Message Date
Grégoire Delattre
93e427fc73 Fix downloaded size in the torrent list
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details 
The downloaded size should never be more than the total size.
 2020-04-15 17:16:26 +02:00
Grégoire Delattre
135ddd0c93 Update the torrent state only if new data is provided 2020-04-15 12:48:29 +02:00
2 changed files with 8 additions and 3 deletions
Show Stats Expand all files Collapse all files

5
frontend/js/components/torrents/list/progress.js
View File

@ -16,8 +16,11 @@ export const Progress = ({ torrent }) => {
} }
// Pretty sizes // Pretty sizes
const downloadedSize = prettySize(torrent.status.downloaded_size);
const totalSize = prettySize(torrent.status.total_size); const totalSize = prettySize(torrent.status.total_size);
const downloadedSize =
torrent.status.downloaded_size >= torrent.status.total_size
? totalSize
: prettySize(torrent.status.downloaded_size);
const downloadRate = prettySize(torrent.status.download_rate) + "/s"; const downloadRate = prettySize(torrent.status.download_rate) + "/s";
return ( return (
<div> <div>

6
frontend/js/reducers/torrents.js
View File

@ -48,8 +48,10 @@ export default (state = defaultState, action) =>
case "TORRENTS_FETCH_FULFILLED": case "TORRENTS_FETCH_FULFILLED":
draft.fetching = false; draft.fetching = false;
draft.torrents = formatTorrents(action.payload.response.data); if (action.payload.response.data) {
draft.count = action.payload.response.data.length; draft.torrents = formatTorrents(action.payload.response.data);
draft.count = action.payload.response.data.length;
}
break; break;
case "TORRENTS_SEARCH_PENDING": case "TORRENTS_SEARCH_PENDING":