fixed merge conflicts

2016-08-19 01:09:43 -03:00
parent c637878603 27e3c14f10
commit 5ffd4123a1
28 changed files with 493 additions and 203 deletions
--- a/src/renderer/views/create-torrent-error-page.js
+++ b/src/renderer/views/create-torrent-error-page.js
@@ -16,7 +16,7 @@ module.exports = class CreateTorrentErrorPage extends React.Component {
          </p>
        </p>
        <p className='float-right'>
-          <button className='button-flat light' onClick={dispatcher('back')}>
+          <button className='button-flat light' onClick={dispatcher('cancel')}>
            Cancel
          </button>
        </p>
--- a/src/renderer/views/create-torrent.js
+++ b/src/renderer/views/create-torrent.js
@@ -77,7 +77,7 @@ module.exports = class CreateTorrentPage extends React.Component {
          </div>
          <div key='trackers' className='torrent-attribute'>
            <label>Trackers:</label>
-            <textarea className='torrent-attribute torrent-trackers' value={trackers}></textarea>
+            <textarea className='torrent-attribute torrent-trackers' defaultValue={trackers}></textarea>
          </div>
          <div key='private' className='torrent-attribute'>
            <label>Private:</label>
@@ -89,7 +89,7 @@ module.exports = class CreateTorrentPage extends React.Component {
          </div>
        </div>
        <div key='buttons' className='float-right'>
-          <button key='cancel' className='button-flat light' onClick={dispatcher('back')}>Cancel</button>
+          <button key='cancel' className='button-flat light' onClick={dispatcher('cancel')}>Cancel</button>
          <button key='create' className='button-raised' onClick={handleOK}>Create Torrent</button>
        </div>
      </div>
--- a/src/renderer/views/preferences.js
+++ b/src/renderer/views/preferences.js
@@ -23,7 +23,8 @@ function renderGeneralSection (state) {
    description: '',
    icon: 'settings'
  }, [
-    renderDownloadDirSelector(state)
+    renderDownloadPathSelector(state),
+    renderFileHandlers(state)
  ])
 }

@@ -50,7 +51,7 @@ function renderPlayInVlcSelector (state) {
  })
 }

-function renderDownloadDirSelector (state) {
+function renderDownloadPathSelector (state) {
  return renderFileSelector({
    key: 'download-path',
    label: 'Download Path',
@@ -63,10 +64,33 @@ function renderDownloadDirSelector (state) {
  },
  state.unsaved.prefs.downloadPath,
  function (filePath) {
-    setStateValue('downloadPath', filePath)
+    dispatch('updatePreferences', 'downloadPath', filePath)
  })
 }

+function renderFileHandlers (state) {
+  var definition = {
+    key: 'file-handlers',
+    label: 'Handle Torrent Files'
+  }
+  var buttonText = state.unsaved.prefs.isFileHandler
+    ? 'Remove default app for torrent files'
+    : 'Make WebTorrent the default app for torrent files'
+  var controls = [(
+    <button key='toggle-handlers'
+      className='btn'
+      onClick={toggleFileHandlers}>
+      {buttonText}
+    </button>
+  )]
+  return renderControlGroup(definition, controls)
+
+  function toggleFileHandlers () {
+    var isFileHandler = state.unsaved.prefs.isFileHandler
+    dispatch('updatePreferences', 'isFileHandler', !isFileHandler)
+  }
+}
+
 // Renders a prefs section.
 // - definition should be {icon, title, description}
 // - controls should be an array of vdom elements
@@ -126,25 +150,24 @@ function renderCheckbox (definition, value, callback) {
 // - value should be the current pref, a file or folder path
 // - callback takes a new file or folder path
 function renderFileSelector (definition, value, callback) {
-  return (
-    <div key={definition.key} className='control-group'>
-      <div className='controls'>
-        <label className='control-label'>
-          <div className='preference-title'>{definition.label}</div>
-          <div className='preference-description'>{definition.description}</div>
-        </label>
-        <div className='controls'>
-          <input type='text' className='file-picker-text'
-            id={definition.property}
-            disabled='disabled'
-            value={value} />
-          <button className='btn' onClick={handleClick}>
-            <i className='icon'>folder_open</i>
-          </button>
-        </div>
-      </div>
-    </div>
-  )
+  var controls = [(
+    <input
+      type='text'
+      className='file-picker-text'
+      key={definition.property}
+      id={definition.property}
+      disabled='disabled'
+      value={value} />
+  ), (
+    <button
+      key={definition.property + '-btn'}
+      className='btn'
+      onClick={handleClick}>
+      <i className='icon'>folder_open</i>
+    </button>
+  )]
+  return renderControlGroup(definition, controls)
+
  function handleClick () {
    dialog.showOpenDialog(remote.getCurrentWindow(), definition.options, function (filenames) {
      if (!Array.isArray(filenames)) return
@@ -153,6 +176,18 @@ function renderFileSelector (definition, value, callback) {
  }
 }

-function setStateValue (property, value) {
-  dispatch('updatePreferences', property, value)
+function renderControlGroup (definition, controls) {
+  return (
+    <div key={definition.key} className='control-group'>
+      <div className='controls'>
+        <label className='control-label'>
+          <div className='preference-title'>{definition.label}</div>
+          <div className='preference-description'>{definition.description}</div>
+        </label>
+        <div className='controls'>
+          {controls}
+        </div>
+      </div>
+    </div>
+  )
 }
--- a/src/renderer/views/torrent-list.js
+++ b/src/renderer/views/torrent-list.js
@@ -8,16 +8,32 @@ const {dispatcher} = require('../lib/dispatcher')
 module.exports = class TorrentList extends React.Component {
  render () {
    var state = this.props.state
-    var torrentRows = state.saved.torrents.map(
+
+    var contents = []
+    if (state.downloadPathStatus === 'missing') {
+      contents.push(
+        <div key='torrent-missing-path'>
+          <p>Download path missing: {state.saved.prefs.downloadPath}</p>
+          <p>Check that all drives are connected?</p>
+          <p>Alternatively, choose a new download path
+            in <a href='#' onClick={dispatcher('preferences')}>Preferences</a>
+          </p>
+        </div>
+      )
+    }
+    var torrentElems = state.saved.torrents.map(
      (torrentSummary) => this.renderTorrent(torrentSummary)
    )
+    contents.push(...torrentElems)
+    contents.push(
+      <div key='torrent-placeholder' className='torrent-placeholder'>
+        <span className='ellipsis'>Drop a torrent file here or paste a magnet link</span>
+      </div>
+    )

    return (
      <div key='torrent-list' className='torrent-list'>
-        {torrentRows}
-        <div key='torrent-placeholder' className='torrent-placeholder'>
-          <span className='ellipsis'>Drop a torrent file here or paste a magnet link</span>
-        </div>
+        {contents}
      </div>
    )
  }
@@ -44,6 +60,7 @@ module.exports = class TorrentList extends React.Component {
    if (torrentSummary.playStatus) classes.push(torrentSummary.playStatus)
    if (isSelected) classes.push('selected')
    if (!infoHash) classes.push('disabled')
+    if (!torrentSummary.torrentKey) throw new Error('Missing torrentKey')
    return (
      <div
        key={torrentSummary.torrentKey}
@@ -67,8 +84,14 @@ module.exports = class TorrentList extends React.Component {

    // If it's downloading/seeding then show progress info
    var prog = torrentSummary.progress
-    if (torrentSummary.status !== 'paused' && prog) {
-      elements.push((
+    if (torrentSummary.error) {
+      elements.push(
+        <div key='progress-info' className='ellipsis'>
+          {getErrorMessage(torrentSummary)}
+        </div>
+      )
+    } else if (torrentSummary.status !== 'paused' && prog) {
+      elements.push(
        <div key='progress-info' className='ellipsis'>
          {renderPercentProgress()}
          {renderTotalProgress()}
@@ -77,7 +100,7 @@ module.exports = class TorrentList extends React.Component {
          {renderUploadSpeed()}
          {renderEta()}
        </div>
-      ))
+      )
    }

    return (<div key='metadata' className='metadata'>{elements}</div>)
@@ -174,8 +197,9 @@ module.exports = class TorrentList extends React.Component {
    }

    // Only show the play button for torrents that contain playable media
-    var playButton
-    if (TorrentPlayer.isPlayableTorrentSummary(torrentSummary)) {
+    var playButton, downloadButton
+    var noErrors = !torrentSummary.error
+    if (noErrors && TorrentPlayer.isPlayableTorrentSummary(torrentSummary)) {
      playButton = (
        <i
          key='play-button'
@@ -186,11 +210,8 @@ module.exports = class TorrentList extends React.Component {
        </i>
      )
    }
-
-    return (
-      <div key='buttons' className='buttons'>
-        {positionElem}
-        {playButton}
+    if (noErrors) {
+      downloadButton = (
        <i
          key='download-button'
          className={'button-round icon download ' + torrentSummary.status}
@@ -198,6 +219,14 @@ module.exports = class TorrentList extends React.Component {
          onClick={dispatcher('toggleTorrent', infoHash)}>
          {downloadIcon}
        </i>
+      )
+    }
+
+    return (
+      <div key='buttons' className='buttons'>
+        {positionElem}
+        {playButton}
+        {downloadButton}
        <i
          key='delete-button'
          className='icon delete'
@@ -212,12 +241,26 @@ module.exports = class TorrentList extends React.Component {
  // Show files, per-file download status and play buttons, and so on
  renderTorrentDetails (torrentSummary) {
    var filesElement
-    if (!torrentSummary.files) {
-      // We don't know what files this torrent contains
-      var message = torrentSummary.status === 'paused'
-        ? 'Failed to load torrent info. Click the download button to try again...'
-        : 'Downloading torrent info...'
-      filesElement = (<div key='files' className='files warning'>{message}</div>)
+    if (torrentSummary.error || !torrentSummary.files) {
+      var message = ''
+      if (torrentSummary.error === 'path-missing') {
+        // Special case error: this torrent's download dir or file is missing
+        message = 'Missing path: ' + TorrentSummary.getFileOrFolder(torrentSummary)
+      } else if (torrentSummary.error) {
+        // General error for this torrent: just show the message
+        message = torrentSummary.error.message || torrentSummary.error
+      } else if (torrentSummary.status === 'paused') {
+        // No file info, no infohash, and we're not trying to download from the DHT
+        message = 'Failed to load torrent info. Click the download button to try again...'
+      } else {
+        // No file info, no infohash, trying to load from the DHT
+        message = 'Downloading torrent info...'
+      }
+      filesElement = (
+        <div key='files' className='files warning'>
+          {message}
+        </div>
+      )
    } else {
      // We do know the files. List them and show download stats for each one
      var fileRows = torrentSummary.files
@@ -255,7 +298,8 @@ module.exports = class TorrentList extends React.Component {
    var isSelected = torrentSummary.selections && torrentSummary.selections[index]
    var isDone = false // Are we finished torrenting it?
    var progress = ''
-    if (torrentSummary.progress && torrentSummary.progress.files) {
+    if (torrentSummary.progress && torrentSummary.progress.files &&
+        torrentSummary.progress.files[index]) {
      var fileProg = torrentSummary.progress.files[index]
      isDone = fileProg.numPiecesPresent === fileProg.numPieces
      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
@@ -327,3 +371,16 @@ module.exports = class TorrentList extends React.Component {
    )
  }
 }
+
+function getErrorMessage (torrentSummary) {
+  var err = torrentSummary.error
+  if (err === 'path-missing') {
+    return (
+      <span>
+        Path missing.<br />
+        Fix and restart the app, or delete the torrent.
+      </span>
+    )
+  }
+  return 'Error'
+}
--- a/src/renderer/views/update-available-modal.js
+++ b/src/renderer/views/update-available-modal.js
@@ -11,18 +11,18 @@ module.exports = class UpdateAvailableModal extends React.Component {
        <p><strong>A new version of WebTorrent is available: v{state.modal.version}</strong></p>
        <p>We have an auto-updater for Windows and Mac. We don't have one for Linux yet, so you'll have to download the new version manually.</p>
        <p className='float-right'>
-          <button className='button button-flat' onClick={handleCancel}>Skip This Release</button>
-          <button className='button button-raised' onClick={handleOK}>Show Download Page</button>
+          <button className='button button-flat' onClick={handleSkip}>Skip This Release</button>
+          <button className='button button-raised' onClick={handleShow}>Show Download Page</button>
        </p>
      </div>
    )

-    function handleOK () {
+    function handleShow () {
      electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
      dispatch('exitModal')
    }

-    function handleCancel () {
+    function handleSkip () {
      dispatch('skipVersion', state.modal.version)
      dispatch('exitModal')
    }