Add remove bulk torrents with files

Plus minor fix to bitrate
This commit is contained in:
Drew DeVault 2017-12-29 14:26:29 -05:00
parent 62f474ef95
commit 9be338c9dc
2 changed files with 21 additions and 16 deletions

View File

@ -26,17 +26,22 @@ export function convertedRate(bitrate) {
} }
} }
export function formatBitrate(bitrate) { function places(n) {
const [rate, unit] = convertedRate(bitrate);
let places = 2; let places = 2;
if (rate >= 100) { if (n >= 100) {
places = 0; places = 0;
} else if (rate >= 10) { } else if (n >= 10) {
places = 1; places = 1;
} else if (rate == 0) { }
if (n.toFixed(places) === (0).toFixed(places)) {
places = 0; places = 0;
} }
return `${rate.toFixed(places)} ${unit}`; return places;
}
export function formatBitrate(bitrate) {
const [rate, unit] = convertedRate(bitrate);
return `${rate.toFixed(places(rate))} ${unit}`;
} }
export function formatAmount(amount) { export function formatAmount(amount) {
@ -47,13 +52,5 @@ export function formatAmount(amount) {
"B/s": "bytes" "B/s": "bytes"
}; };
const [rate, unit] = convertedRate(amount); const [rate, unit] = convertedRate(amount);
let places = 2; return `${rate.toFixed(places(rate))} ${units[unit]}`;
if (rate >= 100) {
places = 0;
} else if (rate >= 10) {
places = 1;
} else if (rate == 0) {
places = 0;
}
return `${rate.toFixed(places)} ${units[unit]}`;
} }

View File

@ -332,7 +332,15 @@ class TorrentDetails extends Component {
selection.forEach(id => ws_send("REMOVE_RESOURCE", { id })); selection.forEach(id => ws_send("REMOVE_RESOURCE", { id }));
}} }}
>Remove selected torrents</DropdownItem> >Remove selected torrents</DropdownItem>
<DropdownItem>Remove selected torrents and delete files</DropdownItem> <DropdownItem
onClick={() => {
dispatch(selectTorrent(selection, SUBTRACT));
selection.forEach(id => ws_send("REMOVE_RESOURCE", {
id,
artifacts: true
}));
}}
>Remove selected torrents and delete files</DropdownItem>
</DropdownMenu> </DropdownMenu>
</ButtonDropdown> </ButtonDropdown>
</div> </div>