ui/js/actions/content.js

@@ -240,7 +240,11 @@ export function doLoadVideo() {
     })
 
     lbry.get({ uri }).then(streamInfo => {
-      if (streamInfo === null || typeof streamInfo !== 'object') {
+      const timeout = streamInfo === null ||
+        typeof streamInfo !== 'object' ||
+        streamInfo.error == 'Timeout'
+
+      if(timeout) {
         dispatch({
           type: types.LOADING_VIDEO_FAILED,
           data: { uri }

ui/js/component/fileActions/view.jsx

@@ -116,188 +116,6 @@ class FileActionsRow extends React.Component {
   }
 }
 
-// const FileActionsRow = React.createClass({
-//   _isMounted: false,
-//   _fileInfoSubscribeId: null,
-
-//   propTypes: {
-//     uri: React.PropTypes.string,
-//     outpoint: React.PropTypes.string.isRequired,
-//     metadata: React.PropTypes.oneOfType([React.PropTypes.object, React.PropTypes.string]),
-//     contentType: React.PropTypes.string.isRequired,
-//   },
-//   getInitialState: function() {
-//     return {
-//       fileInfo: null,
-//       modal: null,
-//       menuOpen: false,
-//       deleteChecked: false,
-//       attemptingDownload: false,
-//       attemptingRemove: false,
-//     }
-//   },
-//   onFileInfoUpdate: function(fileInfo) {
-//     if (this._isMounted) {
-//       this.setState({
-//         fileInfo: fileInfo ? fileInfo : false,
-//         attemptingDownload: fileInfo ? false : this.state.attemptingDownload
-//       });
-//     }
-//   },
-//   tryDownload: function() {
-//     this.setState({
-//       attemptingDownload: true,
-//       attemptingRemove: false
-//     });
-//     lbry.getCostInfo(this.props.uri).then(({cost}) => {
-//       lbry.getBalance((balance) => {
-//         if (cost > balance) {
-//           this.setState({
-//             modal: 'notEnoughCredits',
-//             attemptingDownload: false,
-//           });
-//         } else if (this.state.affirmedPurchase) {
-//           lbry.get({uri: this.props.uri}).then((streamInfo) => {
-//             if (streamInfo === null || typeof streamInfo !== 'object') {
-//               this.setState({
-//                 modal: 'timedOut',
-//                 attemptingDownload: false,
-//               });
-//             }
-//           });
-//         } else {
-//           this.setState({
-//             attemptingDownload: false,
-//             modal: 'affirmPurchase'
-//           })
-//         }
-//       });
-//     });
-//   },
-//   closeModal: function() {
-//     this.setState({
-//       modal: null,
-//     })
-//   },
-//   onDownloadClick: function() {
-//     if (!this.state.fileInfo && !this.state.attemptingDownload) {
-//       this.tryDownload();
-//     }
-//   },
-//   onOpenClick: function() {
-//     if (this.state.fileInfo && this.state.fileInfo.download_path) {
-//       shell.openItem(this.state.fileInfo.download_path);
-//     }
-//   },
-//   handleDeleteCheckboxClicked: function(event) {
-//     this.setState({
-//       deleteChecked: event.target.checked,
-//     });
-//   },
-//   handleRevealClicked: function() {
-//     if (this.state.fileInfo && this.state.fileInfo.download_path) {
-//       shell.showItemInFolder(this.state.fileInfo.download_path);
-//     }
-//   },
-//   handleRemoveClicked: function() {
-//     this.setState({
-//       modal: 'confirmRemove',
-//     });
-//   },
-//   handleRemoveConfirmed: function() {
-//     lbry.removeFile(this.props.outpoint, this.state.deleteChecked);
-//     this.setState({
-//       modal: null,
-//       fileInfo: false,
-//       attemptingDownload: false
-//     });
-//   },
-//   onAffirmPurchase: function() {
-//     this.setState({
-//       affirmedPurchase: true,
-//       modal: null
-//     });
-//     this.tryDownload();
-//   },
-//   openMenu: function() {
-//     this.setState({
-//       menuOpen: !this.state.menuOpen,
-//     });
-//   },
-//   componentDidMount: function() {
-//     this._isMounted = true;
-//     this._fileInfoSubscribeId = lbry.fileInfoSubscribe(this.props.outpoint, this.onFileInfoUpdate);
-//   },
-//   componentWillUnmount: function() {
-//     this._isMounted = false;
-//     if (this._fileInfoSubscribeId) {
-//       lbry.fileInfoUnsubscribe(this.props.outpoint, this._fileInfoSubscribeId);
-//     }
-//   },
-//   render: function() {
-//     if (this.state.fileInfo === null)
-//     {
-//       return null;
-//     }
-
-//     const openInFolderMessage = window.navigator.platform.startsWith('Mac') ? 'Open in Finder' : 'Open in Folder',
-//       showMenu = !!this.state.fileInfo;
-
-//     let linkBlock;
-//     if (this.state.fileInfo === false && !this.state.attemptingDownload) {
-//       linkBlock = <Link button="text" label="Download" icon="icon-download" onClick={this.onDownloadClick} />;
-//     } else if (this.state.attemptingDownload || (!this.state.fileInfo.completed && !this.state.fileInfo.isMine)) {
-//       const
-//         progress = this.state.fileInfo ? this.state.fileInfo.written_bytes / this.state.fileInfo.total_bytes * 100 : 0,
-//         label = this.state.fileInfo ? progress.toFixed(0) + '% complete' : 'Connecting...',
-//         labelWithIcon = <span className="button__content"><Icon icon="icon-download" /><span>{label}</span></span>;
-
-//       linkBlock = (
-//         <div className="faux-button-block file-actions__download-status-bar button-set-item">
-//           <div className="faux-button-block file-actions__download-status-bar-overlay" style={{ width: progress + '%' }}>{labelWithIcon}</div>
-//           {labelWithIcon}
-//         </div>
-//       );
-//     } else {
-//       linkBlock = <Link label="Open" button="text" icon="icon-folder-open" onClick={this.onOpenClick} />;
-//     }
-
-//     const uri = lbryuri.normalize(this.props.uri);
-//     const title = this.props.metadata ? this.props.metadata.title : uri;
-//     return (
-//       <div>
-//         {this.state.fileInfo !== null || this.state.fileInfo.isMine
-//           ? linkBlock
-//           : null}
-//         { showMenu ?
-//           <DropDownMenu>
-//             <DropDownMenuItem key={0} onClick={this.handleRevealClicked} label={openInFolderMessage} />
-//             <DropDownMenuItem key={1} onClick={this.handleRemoveClicked} label="Remove..." />
-//           </DropDownMenu> : '' }
-//         <Modal type="confirm" isOpen={this.state.modal == 'affirmPurchase'}
-//                contentLabel="Confirm Purchase"  onConfirmed={this.onAffirmPurchase} onAborted={this.closeModal}>
-//           Are you sure you'd like to buy <strong>{title}</strong> for <strong><FilePrice uri={uri} look="plain" /></strong> credits?
-//         </Modal>
-//         <Modal isOpen={this.state.modal == 'notEnoughCredits'} contentLabel="Not enough credits"
-//                onConfirmed={this.closeModal}>
-//           You don't have enough LBRY credits to pay for this stream.
-//         </Modal>
-//         <Modal isOpen={this.state.modal == 'timedOut'} contentLabel="Download failed"
-//                onConfirmed={this.closeModal}>
-//           LBRY was unable to download the stream <strong>{uri}</strong>.
-//         </Modal>
-//         <Modal isOpen={this.state.modal == 'confirmRemove'} contentLabel="Not enough credits"
-//                type="confirm" confirmButtonLabel="Remove" onConfirmed={this.handleRemoveConfirmed}
-//                onAborted={this.closeModal}>
-//           <p>Are you sure you'd like to remove <cite>{title}</cite> from LBRY?</p>
-
-//           <label><FormField type="checkbox" checked={this.state.deleteChecked} onClick={this.handleDeleteCheckboxClicked} /> Delete this file from my computer</label>
-//         </Modal>
-//       </div>
-//     );
-//   }
-// });
-
 class FileActions extends React.Component {
   constructor(props) {
     super(props)