Issue/7152 #7214

Closed
billycolon wants to merge 9 commits from issue/7152 into master
4 changed files with 18 additions and 13 deletions
Showing only changes of commit 5dfc247685 - Show all commits

View file

@ -2,13 +2,25 @@ import { connect } from 'react-redux';
import DownloadProgress from './view';
import { doSetPlayingUri, doStopDownload, doUpdateDownloadingStatus } from 'redux/actions/content';
import { selectFileInfosByOutpoint } from 'lbry-redux';
import { selectPrimaryUri, selectPlayingUri } from 'redux/selectors/content';
const select = (state) => {
const byOutpoint = selectFileInfosByOutpoint(state);
const runningByOutpoint = [];
jessopb commented 2021-10-01 22:58:12 +02:00 (Migrated from github.com)
Review

I think I'd prefer to use the selector for consistency
4c72a563da/ui/redux/selectors/file_info.js (L6)

return { downloadList: selectFileInfosByOutpoint(state) }

I think I'd prefer to use the selector for consistency https://github.com/lbryio/lbry-desktop/blob/4c72a563daf15502787bbada67958ab72f63db59/ui/redux/selectors/file_info.js#L6 return { downloadList: selectFileInfosByOutpoint(state) }
const primaryUri = selectPrimaryUri(state);
const playingUri = selectPlayingUri(state);
const uri = playingUri ? playingUri.uri : null;
for (const key in byOutpoint) {
if (byOutpoint[key] && byOutpoint[key].status === 'running') runningByOutpoint.push(byOutpoint[key]);
const item = byOutpoint[key];
if (item && item.status === 'running') {
if (
(!primaryUri || !primaryUri.includes(`/${item.claim_name}`)) &&
(!uri || !uri.includes(`/${item.claim_name}`))
) {
runningByOutpoint.push(item);
}
}
}
return {

View file

@ -73,17 +73,9 @@ function FileDownloadLink(props: Props) {
if (fileInfo && fileInfo.written_bytes > 0) {
const progress = (fileInfo.written_bytes / fileInfo.total_bytes) * 100;
return (
<span className="download-text" style={{ backgroundColor: '#FFF' }}>
{__('%percent%% downloaded', { percent: progress.toFixed(0) })}
</span>
);
return <span className="download-text">{__('%percent%% downloaded', { percent: progress.toFixed(0) })}</span>;
} else {
return (
<span className="download-text" style={{ backgroundColor: '#FFF' }}>
{__('Connecting...')}
</span>
);
return <span className="download-text">{__('Connecting...')}</span>;
}
}
// @endif

View file

@ -720,6 +720,7 @@
margin: 0 0;
padding: var(--spacing-xxs) var(--spacing-xxs);
height: unset;
background-color: var(--color-header-background);
// label (with 'Add' text) hidden by default
.button__label {