mirror of
https://github.com/LBRYFoundation/lbry-desktop.git
synced 2025-08-30 00:41:24 +00:00
FileTile improvements and refactoring
- Now accepts a single metadata object for all metadata fields so the surrounding components don't have to break out the individual fields into props. - Now tracks whether the file was published by the user, and if there's a copy on their machine (will look up using API calls if needed) - Use the new "state" prop for DownloadLink - General refactoring and cleanup
This commit is contained in:
parent
bcaad75df4
commit
182ec6064d
1 changed files with 62 additions and 19 deletions
|
@ -8,16 +8,18 @@ let FileTile = React.createClass({
|
||||||
_statusCheckInterval: 5000,
|
_statusCheckInterval: 5000,
|
||||||
|
|
||||||
propTypes: {
|
propTypes: {
|
||||||
name: React.PropTypes.string.isRequired,
|
metadata: React.PropTypes.object.isRequired,
|
||||||
mediaType: React.PropTypes.string.isRequired,
|
name: React.PropTypes.string,
|
||||||
title: React.PropTypes.string.isRequired,
|
sdHash: React.PropTypes.string,
|
||||||
description: React.PropTypes.string,
|
available: React.PropTypes.bool,
|
||||||
compact: React.PropTypes.boolean,
|
isMine: React.PropTypes.bool,
|
||||||
|
local: React.PropTypes.bool,
|
||||||
|
path: React.PropTypes.string,
|
||||||
cost: React.PropTypes.number,
|
cost: React.PropTypes.number,
|
||||||
costIncludesData: React.PropTypes.boolean,
|
costIncludesData: React.PropTypes.bool,
|
||||||
},
|
},
|
||||||
updateFileInfo: function(progress=null) {
|
updateFileInfo: function(progress=null) {
|
||||||
const updateStatusCallback = ((result) => {
|
const updateStatusCallback = ((fileInfo) => {
|
||||||
if (!this._isMounted || 'fileInfo' in this.props) {
|
if (!this._isMounted || 'fileInfo' in this.props) {
|
||||||
/**
|
/**
|
||||||
* The component was unmounted, or a file info data structure has now been provided by the
|
* The component was unmounted, or a file info data structure has now been provided by the
|
||||||
|
@ -27,7 +29,8 @@ let FileTile = React.createClass({
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
fileInfo: result || null,
|
fileInfo: fileInfo || null,
|
||||||
|
local: !!fileInfo,
|
||||||
});
|
});
|
||||||
|
|
||||||
setTimeout(() => { this.updateFileInfo() }, this._statusCheckInterval);
|
setTimeout(() => { this.updateFileInfo() }, this._statusCheckInterval);
|
||||||
|
@ -35,12 +38,38 @@ let FileTile = React.createClass({
|
||||||
|
|
||||||
if ('sdHash' in this.props) {
|
if ('sdHash' in this.props) {
|
||||||
lbry.getFileInfoBySdHash(this.props.sdHash, updateStatusCallback);
|
lbry.getFileInfoBySdHash(this.props.sdHash, updateStatusCallback);
|
||||||
|
this.getIsMineIfNeeded(this.props.sdHash);
|
||||||
} else if ('name' in this.props) {
|
} else if ('name' in this.props) {
|
||||||
lbry.getFileInfoByName(this.props.name, updateStatusCallback);
|
lbry.getFileInfoByName(this.props.name, (fileInfo) => {
|
||||||
|
this.getIsMineIfNeeded(fileInfo.sd_hash);
|
||||||
|
|
||||||
|
updateStatusCallback(fileInfo);
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
throw new Error("No progress, stream name or sd hash passed to FileTile");
|
throw new Error("No progress, stream name or sd hash passed to FileTile");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
getIsMineIfNeeded: function(sdHash) {
|
||||||
|
if (this.state.isMine !== null) {
|
||||||
|
// The info was already provided by this.props.isMine
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
lbry.getMyClaims((claimsInfo) => {
|
||||||
|
for (let {value} of claimsInfo) {
|
||||||
|
if (JSON.parse(value).sources.lbry_sd_hash == sdHash) {
|
||||||
|
this.setState({
|
||||||
|
isMine: true,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
isMine: false,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
getInitialState: function() {
|
getInitialState: function() {
|
||||||
return {
|
return {
|
||||||
downloading: false,
|
downloading: false,
|
||||||
|
@ -48,6 +77,8 @@ let FileTile = React.createClass({
|
||||||
cost: null,
|
cost: null,
|
||||||
costIncludesData: null,
|
costIncludesData: null,
|
||||||
fileInfo: 'fileInfo' in this.props ? this.props.fileInfo : null,
|
fileInfo: 'fileInfo' in this.props ? this.props.fileInfo : null,
|
||||||
|
isMine: 'isMine' in this.props ? this.props.isMine : null,
|
||||||
|
local: 'local' in this.props ? this.props.local : null,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getDefaultProps: function() {
|
getDefaultProps: function() {
|
||||||
|
@ -66,6 +97,8 @@ let FileTile = React.createClass({
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
componentWillMount: function() {
|
componentWillMount: function() {
|
||||||
|
this.updateFileInfo();
|
||||||
|
|
||||||
if ('cost' in this.props) {
|
if ('cost' in this.props) {
|
||||||
this.setState({
|
this.setState({
|
||||||
cost: this.props.cost,
|
cost: this.props.cost,
|
||||||
|
@ -82,29 +115,39 @@ let FileTile = React.createClass({
|
||||||
},
|
},
|
||||||
componentDidMount: function() {
|
componentDidMount: function() {
|
||||||
this._isMounted = true;
|
this._isMounted = true;
|
||||||
this.updateFileInfo();
|
|
||||||
},
|
},
|
||||||
componentWillUnmount: function() {
|
componentWillUnmount: function() {
|
||||||
this._isMounted = false;
|
this._isMounted = false;
|
||||||
},
|
},
|
||||||
render: function() {
|
render: function() {
|
||||||
|
if (this.state.isMine === null || this.state.local === null) {
|
||||||
|
// Can't render until we know whether we own the file and if we have a local copy
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
const obscureNsfw = !lbry.getClientSetting('showNsfw') && this.props.nsfw;
|
const obscureNsfw = !lbry.getClientSetting('showNsfw') && this.props.nsfw;
|
||||||
|
|
||||||
let downloadLinkExtraProps = {};
|
let downloadLinkExtraProps = {};
|
||||||
if (this.state.fileInfo !== null) {
|
if (this.state.fileInfo === null) {
|
||||||
const {written_bytes, total_bytes, completed} = this.state.fileInfo;
|
downloadLinkExtraProps.state = 'not-started';
|
||||||
downloadLinkExtraProps['progress'] = written_bytes / total_bytes;
|
} else if (!this.state.fileInfo.completed) {
|
||||||
downloadLinkExtraProps['downloading'] = !completed;
|
downloadLinkExtraProps.state = 'downloading';
|
||||||
|
|
||||||
|
const {written_bytes, total_bytes, path} = this.state.fileInfo;
|
||||||
|
downloadLinkExtraProps.progress = written_bytes / total_bytes;
|
||||||
|
} else {
|
||||||
|
downloadLinkExtraProps.state = 'done';
|
||||||
|
downloadLinkExtraProps.path = this.state.fileInfo.download_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className={ 'file-tile card ' + (obscureNsfw ? 'card-obscured ' : '') + (this.props.compact ? 'file-tile--compact' : '')} onMouseEnter={this.handleMouseOver} onMouseLeave={this.handleMouseOut}>
|
<section className={ 'file-tile card ' + (obscureNsfw ? 'card-obscured ' : '') + (this.props.compact ? 'file-tile--compact' : '')} onMouseEnter={this.handleMouseOver} onMouseLeave={this.handleMouseOut}>
|
||||||
<div className="row-fluid card-content file-tile__row">
|
<div className="row-fluid card-content file-tile__row">
|
||||||
<div className="span3">
|
<div className="span3">
|
||||||
<a href={'/?show=' + this.props.name}><Thumbnail className="file-tile__thumbnail" src={this.props.imgUrl} alt={'Photo for ' + (this.props.title || this.props.name)} /></a>
|
<a href={'/?show=' + this.props.name}><Thumbnail className="file-tile__thumbnail" src={this.props.metadata.thumbnail} alt={'Photo for ' + (this.props.metadata.title || this.props.name)} /></a>
|
||||||
</div>
|
</div>
|
||||||
<div className="span9">
|
<div className="span9">
|
||||||
{this.state.cost !== null
|
{this.state.cost !== null && !this.state.local
|
||||||
? <span className="file-tile__cost">
|
? <span className="file-tile__cost">
|
||||||
<CreditAmount amount={this.state.cost} isEstimate={!this.state.costIncludesData}/>
|
<CreditAmount amount={this.state.cost} isEstimate={!this.state.costIncludesData}/>
|
||||||
</span>
|
</span>
|
||||||
|
@ -113,19 +156,19 @@ let FileTile = React.createClass({
|
||||||
<h3 className={'file-tile__title ' + (this.props.compact ? 'file-tile__title--compact' : '')}>
|
<h3 className={'file-tile__title ' + (this.props.compact ? 'file-tile__title--compact' : '')}>
|
||||||
<a href={'/?show=' + this.props.name}>
|
<a href={'/?show=' + this.props.name}>
|
||||||
<TruncatedText lines={3}>
|
<TruncatedText lines={3}>
|
||||||
{this.props.title}
|
{this.props.metadata.title}
|
||||||
</TruncatedText>
|
</TruncatedText>
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h3>
|
||||||
<div>
|
<div>
|
||||||
{this.props.mediaType == 'video' ? <WatchLink streamName={this.props.name} button="primary" /> : null}
|
{this.props.metadata.content_type.startsWith('video/') ? <WatchLink streamName={this.props.name} button="primary" /> : null}
|
||||||
{!this.props.isMine
|
{!this.props.isMine
|
||||||
? <DownloadLink streamName={this.props.name} button="text" {... downloadLinkExtraProps}/>
|
? <DownloadLink streamName={this.props.name} button="text" {... downloadLinkExtraProps}/>
|
||||||
: null}
|
: null}
|
||||||
</div>
|
</div>
|
||||||
<p className="file-tile__description">
|
<p className="file-tile__description">
|
||||||
<TruncatedText lines={3}>
|
<TruncatedText lines={3}>
|
||||||
{this.props.description}
|
{this.props.metadata.description}
|
||||||
</TruncatedText>
|
</TruncatedText>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Reference in a new issue