Merge branch 'master' into feature/sort-file-alphanumerically-1185

2020-02-05 09:22:51 -08:00
parent 185f5ec30b 6f2aa86229
commit 58de27c484
91 changed files with 4263 additions and 6308 deletions
--- a/src/config.js
+++ b/src/config.js
@@ -73,8 +73,10 @@ module.exports = {
  GITHUB_URL: 'https://github.com/webtorrent/webtorrent-desktop',
  GITHUB_URL_ISSUES: 'https://github.com/webtorrent/webtorrent-desktop/issues',
  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master',
+  GITHUB_URL_RELEASES: 'https://github.com/webtorrent/webtorrent-desktop/releases',

  HOME_PAGE_URL: 'https://webtorrent.io',
+  TWITTER_PAGE_URL: 'https://twitter.com/WebTorrentApp',

  IS_PORTABLE: IS_PORTABLE,
  IS_PRODUCTION: IS_PRODUCTION,
--- a/src/main/announcement.js
+++ b/src/main/announcement.js
@@ -50,7 +50,5 @@ function onResponse (err, res, data) {
    title: data.title,
    message: data.message,
    detail: data.detail
-  }, noop)
+  })
 }
-
-function noop () {}
--- a/src/main/dialog.js
+++ b/src/main/dialog.js
@@ -19,7 +19,7 @@ function openSeedFile () {
  log('openSeedFile')
  const opts = {
    title: 'Select a file for the torrent.',
-    properties: [ 'openFile' ]
+    properties: ['openFile']
  }
  showOpenSeed(opts)
 }
@@ -35,11 +35,11 @@ function openSeedDirectory () {
  const opts = process.platform === 'darwin'
    ? {
      title: 'Select a file or folder for the torrent.',
-      properties: [ 'openFile', 'openDirectory' ]
+      properties: ['openFile', 'openDirectory']
    }
    : {
      title: 'Select a folder for the torrent.',
-      properties: [ 'openDirectory' ]
+      properties: ['openDirectory']
    }
  showOpenSeed(opts)
 }
@@ -54,18 +54,17 @@ function openFiles () {
  const opts = process.platform === 'darwin'
    ? {
      title: 'Select a file or folder to add.',
-      properties: [ 'openFile', 'openDirectory' ]
+      properties: ['openFile', 'openDirectory']
    }
    : {
      title: 'Select a file to add.',
-      properties: [ 'openFile' ]
+      properties: ['openFile']
    }
  setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-    resetTitle()
-    if (!Array.isArray(selectedPaths)) return
-    windows.main.dispatch('onOpen', selectedPaths)
-  })
+  const selectedPaths = electron.dialog.showOpenDialogSync(windows.main.win, opts)
+  resetTitle()
+  if (!Array.isArray(selectedPaths)) return
+  windows.main.dispatch('onOpen', selectedPaths)
 }

 /*
@@ -77,15 +76,14 @@ function openTorrentFile () {
  const opts = {
    title: 'Select a .torrent file.',
    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
-    properties: [ 'openFile', 'multiSelections' ]
+    properties: ['openFile', 'multiSelections']
  }
  setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-    resetTitle()
-    if (!Array.isArray(selectedPaths)) return
-    selectedPaths.forEach(function (selectedPath) {
-      windows.main.dispatch('addTorrent', selectedPath)
-    })
+  const selectedPaths = electron.dialog.showOpenDialogSync(windows.main.win, opts)
+  resetTitle()
+  if (!Array.isArray(selectedPaths)) return
+  selectedPaths.forEach(function (selectedPath) {
+    windows.main.dispatch('addTorrent', selectedPath)
  })
 }

@@ -116,9 +114,8 @@ function resetTitle () {
 */
 function showOpenSeed (opts) {
  setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-    resetTitle()
-    if (!Array.isArray(selectedPaths)) return
-    windows.main.dispatch('showCreateTorrent', selectedPaths)
-  })
+  const selectedPaths = electron.dialog.showOpenDialogSync(windows.main.win, opts)
+  resetTitle()
+  if (!Array.isArray(selectedPaths)) return
+  windows.main.dispatch('showCreateTorrent', selectedPaths)
 }
--- a/src/main/dock.js
+++ b/src/main/dock.js
@@ -34,7 +34,7 @@ function setBadge (count) {
  if (process.platform === 'darwin' ||
      (process.platform === 'linux' && app.isUnityRunning())) {
    log(`setBadge: ${count}`)
-    app.setBadgeCount(Number(count))
+    app.badgeCount = Number(count)
  }
 }

--- a/src/main/handlers.js
+++ b/src/main/handlers.js
@@ -12,8 +12,6 @@ function install () {
      break
    case 'win32': installWin32()
      break
-    case 'linux': installLinux()
-      break
  }
 }

@@ -23,8 +21,6 @@ function uninstall () {
      break
    case 'win32': uninstallWin32()
      break
-    case 'linux': uninstallLinux()
-      break
  }
 }

@@ -42,7 +38,7 @@ function installDarwin () {

 function uninstallDarwin () {}

-const EXEC_COMMAND = [ process.execPath, '--' ]
+const EXEC_COMMAND = [process.execPath, '--']

 if (!config.IS_PRODUCTION) {
  EXEC_COMMAND.push(config.ROOT_PATH)
@@ -269,100 +265,3 @@ function uninstallWin32 () {
 function commandToArgs (command) {
  return command.map((arg) => `"${arg}"`).join(' ')
 }
-
-function installLinux () {
-  const fs = require('fs')
-  const os = require('os')
-  const path = require('path')
-
-  const config = require('../config')
-  const log = require('./log')
-
-  // Do not install in user dir if running on system
-  if (/^\/opt/.test(process.execPath)) return
-
-  installDesktopFile()
-  installIconFile()
-
-  function installDesktopFile () {
-    const templatePath = path.join(
-      config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
-    )
-    fs.readFile(templatePath, 'utf8', writeDesktopFile)
-  }
-
-  function writeDesktopFile (err, desktopFile) {
-    if (err) return log.error(err.message)
-
-    const appPath = config.IS_PRODUCTION
-      ? path.dirname(process.execPath)
-      : config.ROOT_PATH
-
-    desktopFile = desktopFile
-      .replace(/\$APP_NAME/g, config.APP_NAME)
-      .replace(/\$APP_PATH/g, appPath)
-      .replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
-      .replace(/\$TRY_EXEC_PATH/g, process.execPath)
-
-    const desktopFilePath = path.join(
-      os.homedir(),
-      '.local',
-      'share',
-      'applications',
-      'webtorrent-desktop.desktop'
-    )
-    fs.mkdirp(path.dirname(desktopFilePath))
-    fs.writeFile(desktopFilePath, desktopFile, err => {
-      if (err) return log.error(err.message)
-    })
-  }
-
-  function installIconFile () {
-    const iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
-    fs.readFile(iconStaticPath, writeIconFile)
-  }
-
-  function writeIconFile (err, iconFile) {
-    if (err) return log.error(err.message)
-
-    const mkdirp = require('mkdirp')
-
-    const iconFilePath = path.join(
-      os.homedir(),
-      '.local',
-      'share',
-      'icons',
-      'webtorrent-desktop.png'
-    )
-    mkdirp(path.dirname(iconFilePath), err => {
-      if (err) return log.error(err.message)
-      fs.writeFile(iconFilePath, iconFile, err => {
-        if (err) log.error(err.message)
-      })
-    })
-  }
-}
-
-function uninstallLinux () {
-  const os = require('os')
-  const path = require('path')
-  const rimraf = require('rimraf')
-
-  const desktopFilePath = path.join(
-    os.homedir(),
-    '.local',
-    'share',
-    'applications',
-    'webtorrent-desktop.desktop'
-  )
-  rimraf(desktopFilePath)
-
-  const iconFilePath = path.join(
-    os.homedir(),
-    '.local',
-    'share',
-    'icons',
-    'webtorrent-desktop.png'
-  )
-  rimraf(iconFilePath)
-}
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -13,9 +13,14 @@ const menu = require('./menu')
 const State = require('../renderer/lib/state')
 const windows = require('./windows')

+const WEBTORRENT_VERSION = require('webtorrent/package.json').version
+
 let shouldQuit = false
 let argv = sliceArgv(process.argv)

+// allow electron/chromium to play startup sounds (without user interaction)
+app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required')
+
 // Start the app without showing the main window when auto launching on login
 // (On Windows and Linux, we get a flag. On MacOS, we get special API.)
 const hidden = argv.includes('--hidden') ||
@@ -38,17 +43,19 @@ if (!shouldQuit && !config.IS_PORTABLE) {
  // signal this instance and quit. Note: This feature creates a lock file in
  // %APPDATA%\Roaming\WebTorrent so we do not do it for the Portable App since
  // we want to be "silent" as well as "portable".
-  shouldQuit = app.makeSingleInstance(onAppOpen)
-  if (shouldQuit) {
-    app.quit()
+  if (!app.requestSingleInstanceLock()) {
+    shouldQuit = true
  }
 }

-if (!shouldQuit) {
+if (shouldQuit) {
+  app.quit()
+} else {
  init()
 }

 function init () {
+  app.on('second-instance', (event, commandLine, workingDirectory) => onAppOpen(commandLine))
  if (config.IS_PORTABLE) {
    const path = require('path')
    // Put all user data into the "Portable Settings" folder
@@ -91,6 +98,12 @@ function init () {
    })
  }

+  // Enable app logging into default directory, i.e. /Library/Logs/WebTorrent
+  // on Mac, %APPDATA% on Windows, $XDG_CONFIG_HOME or ~/.config on Linux.
+  app.setAppLogsPath()
+
+  app.userAgentFallback = `WebTorrent/${WEBTORRENT_VERSION} (https://webtorrent.io)`
+
  app.on('open-file', onOpen)
  app.on('open-url', onOpen)

@@ -162,7 +175,7 @@ function onOpen (e, torrentId) {
    // Electron issue: https://github.com/atom/electron/issues/4338
    setTimeout(() => windows.main.show(), 100)

-    processArgv([ torrentId ])
+    processArgv([torrentId])
  } else {
    argv.push(torrentId)
  }
--- a/src/main/ipc.js
+++ b/src/main/ipc.js
@@ -120,21 +120,21 @@ function init () {
   */

  ipc.on('startFolderWatcher', function () {
-    if (!modules['folderWatcher']) {
+    if (!modules.folderWatcher) {
      log('IPC ERR: folderWatcher module is not defined.')
      return
    }

-    modules['folderWatcher'].start()
+    modules.folderWatcher.start()
  })

  ipc.on('stopFolderWatcher', function () {
-    if (!modules['folderWatcher']) {
+    if (!modules.folderWatcher) {
      log('IPC ERR: folderWatcher module is not defined.')
      return
    }

-    modules['folderWatcher'].stop()
+    modules.folderWatcher.stop()
  })

  /**
--- a/src/main/menu.js
+++ b/src/main/menu.js
@@ -288,6 +288,14 @@ function getMenuTemplate () {
        {
          label: 'Resume All',
          click: () => windows.main.dispatch('resumeAllTorrents')
+        },
+        {
+          label: 'Remove All From List',
+          click: () => windows.main.dispatch('confirmDeleteAllTorrents', false)
+        },
+        {
+          label: 'Remove All Data Files',
+          click: () => windows.main.dispatch('confirmDeleteAllTorrents', true)
        }
      ]
    },
@@ -302,6 +310,13 @@ function getMenuTemplate () {
            shell.openExternal(config.HOME_PAGE_URL)
          }
        },
+        {
+          label: 'Release Notes',
+          click: () => {
+            const shell = require('./shell')
+            shell.openExternal(config.GITHUB_URL_RELEASES)
+          }
+        },
        {
          label: 'Contribute on GitHub',
          click: () => {
@@ -318,6 +333,13 @@ function getMenuTemplate () {
            const shell = require('./shell')
            shell.openExternal(config.GITHUB_URL_ISSUES)
          }
+        },
+        {
+          label: 'Follow us on Twitter',
+          click: () => {
+            const shell = require('./shell')
+            shell.openExternal(config.TWITTER_PAGE_URL)
+          }
        }
      ]
    }
@@ -343,8 +365,7 @@ function getMenuTemplate () {
          type: 'separator'
        },
        {
-          role: 'services',
-          submenu: []
+          role: 'services'
        },
        {
          type: 'separator'
--- a/src/main/thumbar.js
+++ b/src/main/thumbar.js
@@ -77,8 +77,8 @@ function onPlayerPlay () {

 function onPlayerUpdate (state) {
  if (!isEnabled()) return
-  buttons[PREV].flags = [ state.hasPrevious ? 'enabled' : 'disabled' ]
-  buttons[NEXT].flags = [ state.hasNext ? 'enabled' : 'disabled' ]
+  buttons[PREV].flags = [state.hasPrevious ? 'enabled' : 'disabled']
+  buttons[NEXT].flags = [state.hasNext ? 'enabled' : 'disabled']
  update()
 }

--- a/src/main/updater.js
+++ b/src/main/updater.js
@@ -72,6 +72,6 @@ function initDarwinWin32 () {
    (e, notes, name, date, url) => log(`Update downloaded: ${name}: ${url}`)
  )

-  electron.autoUpdater.setFeedURL(AUTO_UPDATE_URL)
+  electron.autoUpdater.setFeedURL({ url: AUTO_UPDATE_URL })
  electron.autoUpdater.checkForUpdates()
 }
--- a/src/main/windows/about.js
+++ b/src/main/windows/about.js
@@ -15,7 +15,7 @@ function init () {
    backgroundColor: '#ECECEC',
    center: true,
    fullscreen: false,
-    height: 170,
+    height: 250,
    icon: getIconPath(),
    maximizable: false,
    minimizable: false,
@@ -24,16 +24,21 @@ function init () {
    skipTaskbar: true,
    title: 'About ' + config.APP_WINDOW_TITLE,
    useContentSize: true,
+    webPreferences: {
+      nodeIntegration: true,
+      enableBlinkFeatures: 'AudioVideoTracks'
+    },
    width: 300
  })

  win.loadURL(config.WINDOW_ABOUT)

-  // No menu on the About window
-  win.setMenu(null)
-
  win.once('ready-to-show', function () {
    win.show()
+    // No menu on the About window
+    // Hack: BrowserWindow removeMenu method not working on electron@7
+    // https://github.com/electron/electron/issues/21088
+    win.setMenuBarVisibility(false)
  })

  win.once('closed', function () {
--- a/src/main/windows/main.js
+++ b/src/main/windows/main.js
@@ -32,7 +32,6 @@ function init (state, options) {

  const win = main.win = new electron.BrowserWindow({
    backgroundColor: '#282828',
-    backgroundThrottling: false, // do not throttle animations/timers when page is background
    darkTheme: true, // Forces dark theme (GTK+3)
    height: initialBounds.height,
    icon: getIconPath(), // Window icon (Windows, Linux)
@@ -40,9 +39,13 @@ function init (state, options) {
    minWidth: config.WINDOW_MIN_WIDTH,
    show: false,
    title: config.APP_WINDOW_TITLE,
-    titleBarStyle: 'hidden-inset', // Hide title bar (Mac)
+    titleBarStyle: 'hiddenInset', // Hide title bar (Mac)
    useContentSize: true, // Specify web page size without OS chrome
    width: initialBounds.width,
+    webPreferences: {
+      nodeIntegration: true,
+      enableBlinkFeatures: 'AudioVideoTracks'
+    },
    x: initialBounds.x,
    y: initialBounds.y
  })
@@ -138,7 +141,7 @@ function setAspectRatio (aspectRatio) {
 function setBounds (bounds, maximize) {
  // Do nothing in fullscreen
  if (!main.win || main.win.isFullScreen()) {
-    log(`setBounds: not setting bounds because we're in full screen`)
+    log('setBounds: not setting bounds because already in full screen mode')
    return
  }

@@ -209,7 +212,7 @@ function toggleDevTools () {
  if (main.win.webContents.isDevToolsOpened()) {
    main.win.webContents.closeDevTools()
  } else {
-    main.win.webContents.openDevTools({ detach: true })
+    main.win.webContents.openDevTools({ mode: 'detach' })
  }
 }

--- a/src/main/windows/webtorrent.js
+++ b/src/main/windows/webtorrent.js
@@ -13,7 +13,6 @@ const config = require('../../config')
 function init () {
  const win = webtorrent.win = new electron.BrowserWindow({
    backgroundColor: '#1E1E1E',
-    backgroundThrottling: false, // do not throttle animations/timers when page is background
    center: true,
    fullscreen: false,
    fullscreenable: false,
@@ -25,6 +24,10 @@ function init () {
    skipTaskbar: true,
    title: 'webtorrent-hidden-window',
    useContentSize: true,
+    webPreferences: {
+      nodeIntegration: true,
+      enableBlinkFeatures: 'AudioVideoTracks'
+    },
    width: 150
  })

@@ -56,6 +59,6 @@ function toggleDevTools () {
    webtorrent.win.webContents.closeDevTools()
    webtorrent.win.hide()
  } else {
-    webtorrent.win.webContents.openDevTools({ detach: true })
+    webtorrent.win.webContents.openDevTools({ mode: 'detach' })
  }
 }
--- a/src/renderer/components/delete-all-torrents-modal.js
+++ b/src/renderer/components/delete-all-torrents-modal.js
@@ -0,0 +1,31 @@
+const React = require('react')
+
+const ModalOKCancel = require('./modal-ok-cancel')
+const { dispatch, dispatcher } = require('../lib/dispatcher')
+
+module.exports = class DeleteAllTorrentsModal extends React.Component {
+  render () {
+    const { state: { modal: { deleteData } } } = this.props
+    const message = deleteData
+      ? 'Are you sure you want to remove all the torrents from the list and delete the data files?'
+      : 'Are you sure you want to remove all the torrents from the list?'
+    const buttonText = deleteData ? 'REMOVE DATA' : 'REMOVE'
+
+    return (
+      <div>
+        <p><strong>{message}</strong></p>
+        <ModalOKCancel
+          cancelText='CANCEL'
+          onCancel={dispatcher('exitModal')}
+          okText={buttonText}
+          onOK={handleRemove}
+        />
+      </div>
+    )
+
+    function handleRemove () {
+      dispatch('deleteAllTorrents', deleteData)
+      dispatch('exitModal')
+    }
+  }
+}
--- a/src/renderer/components/header.js
+++ b/src/renderer/components/header.js
@@ -6,22 +6,26 @@ class Header extends React.Component {
  render () {
    const loc = this.props.state.location
    return (
-      <div className='header'
+      <div
+        className='header'
        onMouseMove={dispatcher('mediaMouseMoved')}
        onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-        onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
+        onMouseLeave={dispatcher('mediaControlsMouseLeave')}
+      >
        {this.getTitle()}
        <div className='nav left float-left'>
          <i
            className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
            title='Back'
-            onClick={dispatcher('back')}>
+            onClick={dispatcher('back')}
+          >
            chevron_left
          </i>
          <i
            className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
            title='Forward'
-            onClick={dispatcher('forward')}>
+            onClick={dispatcher('forward')}
+          >
            chevron_right
          </i>
        </div>
@@ -45,7 +49,8 @@ class Header extends React.Component {
      <i
        className='icon add'
        title='Add torrent'
-        onClick={dispatcher('openFiles')}>
+        onClick={dispatcher('openFiles')}
+      >
        add
      </i>
    )
--- a/src/renderer/components/modal-ok-cancel.js
+++ b/src/renderer/components/modal-ok-cancel.js
@@ -12,13 +12,15 @@ module.exports = class ModalOKCancel extends React.Component {
          className='control cancel'
          style={cancelStyle}
          label={cancelText}
-          onClick={onCancel} />
+          onClick={onCancel}
+        />
        <RaisedButton
          className='control ok'
          primary
          label={okText}
          onClick={onOK}
-          autoFocus />
+          autoFocus
+        />
      </div>
    )
  }
--- a/src/renderer/components/open-torrent-address-modal.js
+++ b/src/renderer/components/open-torrent-address-modal.js
@@ -1,8 +1,10 @@
 const React = require('react')
 const TextField = require('material-ui/TextField').default
+const { clipboard } = require('electron')

 const ModalOKCancel = require('./modal-ok-cancel')
 const { dispatch, dispatcher } = require('../lib/dispatcher')
+const { isMagnetLink } = require('../lib/torrent-player')

 module.exports = class OpenTorrentAddressModal extends React.Component {
  render () {
@@ -15,19 +17,27 @@ module.exports = class OpenTorrentAddressModal extends React.Component {
            className='control'
            ref={(c) => { this.torrentURL = c }}
            fullWidth
-            onKeyDown={handleKeyDown.bind(this)} />
+            onKeyDown={handleKeyDown.bind(this)}
+          />
        </div>
        <ModalOKCancel
          cancelText='CANCEL'
          onCancel={dispatcher('exitModal')}
          okText='OK'
-          onOK={handleOK.bind(this)} />
+          onOK={handleOK.bind(this)}
+        />
      </div>
    )
  }

  componentDidMount () {
    this.torrentURL.input.focus()
+    const clipboardContent = clipboard.readText()
+
+    if (isMagnetLink(clipboardContent)) {
+      this.torrentURL.input.value = clipboardContent
+      this.torrentURL.input.select()
+    }
  }
 }

--- a/src/renderer/components/path-selector.js
+++ b/src/renderer/components/path-selector.js
@@ -1,3 +1,5 @@
+const path = require('path')
+
 const colors = require('material-ui/styles/colors')
 const electron = require('electron')
 const React = require('react')
@@ -16,7 +18,6 @@ class PathSelector extends React.Component {
    return {
      className: PropTypes.string,
      dialog: PropTypes.object,
-      displayValue: PropTypes.string,
      id: PropTypes.string,
      onChange: PropTypes.func,
      title: PropTypes.string.isRequired,
@@ -31,18 +32,13 @@ class PathSelector extends React.Component {

  handleClick () {
    const opts = Object.assign({
-      defaultPath: this.props.value,
-      properties: [ 'openFile', 'openDirectory' ]
+      defaultPath: path.dirname(this.props.value || ''),
+      properties: ['openFile', 'openDirectory']
    }, this.props.dialog)

-    remote.dialog.showOpenDialog(
-      remote.getCurrentWindow(),
-      opts,
-      (filenames) => {
-        if (!Array.isArray(filenames)) return
-        this.props.onChange && this.props.onChange(filenames[0])
-      }
-    )
+    const filenames = remote.dialog.showOpenDialogSync(remote.getCurrentWindow(), opts)
+    if (!Array.isArray(filenames)) return
+    this.props.onChange && this.props.onChange(filenames[0])
  }

  render () {
@@ -65,8 +61,7 @@ class PathSelector extends React.Component {
    const textFieldStyle = {
      flex: '1'
    }
-
-    const text = this.props.displayValue || this.props.value || ''
+    const text = this.props.value || ''
    const buttonStyle = {
      marginLeft: 10
    }
@@ -76,10 +71,14 @@ class PathSelector extends React.Component {
        <div className='label' style={labelStyle}>
          {this.props.title}:
        </div>
-        <TextField className='control' disabled id={id} value={text}
-          inputStyle={textareaStyle} style={textFieldStyle} />
-        <RaisedButton className='control' label='Change' onClick={this.handleClick}
-          style={buttonStyle} />
+        <TextField
+          className='control' disabled id={id} value={text}
+          inputStyle={textareaStyle} style={textFieldStyle}
+        />
+        <RaisedButton
+          className='control' label='Change' onClick={this.handleClick}
+          style={buttonStyle}
+        />
      </div>
    )
  }
--- a/src/renderer/components/remove-torrent-modal.js
+++ b/src/renderer/components/remove-torrent-modal.js
@@ -18,7 +18,8 @@ module.exports = class RemoveTorrentModal extends React.Component {
          cancelText='CANCEL'
          onCancel={dispatcher('exitModal')}
          okText={buttonText}
-          onOK={handleRemove} />
+          onOK={handleRemove}
+        />
      </div>
    )

--- a/src/renderer/components/show-more.js
+++ b/src/renderer/components/show-more.js
@@ -45,7 +45,8 @@ class ShowMore extends React.Component {
        <RaisedButton
          className='control'
          onClick={this.handleClick}
-          label={label} />
+          label={label}
+        />
      </div>
    )
  }
--- a/src/renderer/components/unsupported-media-modal.js
+++ b/src/renderer/components/unsupported-media-modal.js
@@ -28,7 +28,8 @@ module.exports = class UnsupportedMediaModal extends React.Component {
          cancelText='CANCEL'
          onCancel={dispatcher('backToList')}
          okText={actionText}
-          onOK={onAction} />
+          onOK={onAction}
+        />
        <p className='error-text'>{errorMessage}</p>
      </div>
    )
--- a/src/renderer/components/update-available-modal.js
+++ b/src/renderer/components/update-available-modal.js
@@ -18,7 +18,8 @@ module.exports = class UpdateAvailableModal extends React.Component {
          cancelText='SKIP THIS RELEASE'
          onCancel={handleSkip}
          okText='SHOW DOWNLOAD PAGE'
-          onOK={handleShow} />
+          onOK={handleShow}
+        />
      </div>
    )

--- a/src/renderer/controllers/audio-tracks-controller.js
+++ b/src/renderer/controllers/audio-tracks-controller.js
@@ -0,0 +1,17 @@
+const { dispatch } = require('../lib/dispatcher')
+
+module.exports = class AudioTracksController {
+  constructor (state) {
+    this.state = state
+  }
+
+  selectAudioTrack (ix) {
+    this.state.playing.audioTracks.selectedIndex = ix
+    dispatch('skip', 0.2) // HACK: hardcoded seek value for smooth audio change
+  }
+
+  toggleAudioTracksMenu () {
+    const audioTracks = this.state.playing.audioTracks
+    audioTracks.showMenu = !audioTracks.showMenu
+  }
+}
--- a/src/renderer/controllers/playback-controller.js
+++ b/src/renderer/controllers/playback-controller.js
@@ -269,6 +269,7 @@ module.exports = class PlaybackController {
    // update state
    state.playing.infoHash = infoHash
    state.playing.fileIndex = index
+    state.playing.fileName = fileSummary.name
    state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
        : 'other'
--- a/src/renderer/controllers/subtitles-controller.js
+++ b/src/renderer/controllers/subtitles-controller.js
@@ -13,14 +13,13 @@ module.exports = class SubtitlesController {
  }

  openSubtitles () {
-    remote.dialog.showOpenDialog({
+    const filenames = remote.dialog.showOpenDialogSync({
      title: 'Select a subtitles file.',
-      filters: [ { name: 'Subtitles', extensions: ['vtt', 'srt'] } ],
-      properties: [ 'openFile' ]
-    }, (filenames) => {
-      if (!Array.isArray(filenames)) return
-      this.addSubtitles(filenames, true)
+      filters: [{ name: 'Subtitles', extensions: ['vtt', 'srt'] }],
+      properties: ['openFile']
    })
+    if (!Array.isArray(filenames)) return
+    this.addSubtitles(filenames, true)
  }

  selectSubtitle (ix) {
--- a/src/renderer/controllers/torrent-controller.js
+++ b/src/renderer/controllers/torrent-controller.js
@@ -10,7 +10,7 @@ module.exports = class TorrentController {
    this.state = state
  }

-  torrentInfoHash (torrentKey, infoHash) {
+  torrentParsed (torrentKey, infoHash, magnetURI) {
    let torrentSummary = this.getTorrentSummary(torrentKey)
    console.log('got infohash for %s torrent %s',
      torrentSummary ? 'existing' : 'new', torrentKey)
@@ -33,6 +33,7 @@ module.exports = class TorrentController {
    }

    torrentSummary.infoHash = infoHash
+    torrentSummary.magnetURI = magnetURI
    dispatch('update')
  }

@@ -62,7 +63,6 @@ module.exports = class TorrentController {
    torrentSummary.status = 'downloading'
    torrentSummary.name = torrentSummary.displayName || torrentInfo.name
    torrentSummary.path = torrentInfo.path
-    torrentSummary.magnetURI = torrentInfo.magnetURI
    // TODO: make torrentInfo immutable, save separately as torrentSummary.info
    // For now, check whether torrentSummary.files has already been set:
    const hasDetailedFileInfo = torrentSummary.files && torrentSummary.files[0].path
--- a/src/renderer/controllers/torrent-list-controller.js
+++ b/src/renderer/controllers/torrent-list-controller.js
@@ -201,26 +201,38 @@ module.exports = class TorrentListController {
    }
  }

+  confirmDeleteAllTorrents (deleteData) {
+    this.state.modal = {
+      id: 'delete-all-torrents-modal',
+      deleteData
+    }
+  }
+
  // TODO: use torrentKey, not infoHash
  deleteTorrent (infoHash, deleteData) {
-    ipcRenderer.send('wt-stop-torrenting', infoHash)
-
    const index = this.state.saved.torrents.findIndex((x) => x.infoHash === infoHash)

    if (index > -1) {
      const summary = this.state.saved.torrents[index]
-
-      // remove torrent and poster file
-      deleteFile(TorrentSummary.getTorrentPath(summary))
-      deleteFile(TorrentSummary.getPosterPath(summary))
-
-      // optionally delete the torrent data
-      if (deleteData) moveItemToTrash(summary)
+      deleteTorrentFile(summary, deleteData)

      // remove torrent from saved list
      this.state.saved.torrents.splice(index, 1)
      dispatch('stateSave')
+
+      // prevent user from going forward to a deleted torrent
+      this.state.location.clearForward('player')
+      sound.play('DELETE')
+    } else {
+      throw new TorrentKeyNotFoundError(infoHash)
    }
+  }
+
+  deleteAllTorrents (deleteData) {
+    this.state.saved.torrents.forEach((summary) => deleteTorrentFile(summary, deleteData))
+
+    this.state.saved.torrents = []
+    dispatch('stateSave')

    // prevent user from going forward to a deleted torrent
    this.state.location.clearForward('player')
@@ -289,14 +301,14 @@ module.exports = class TorrentListController {
      click: () => dispatch('updatePreferences', 'sortByName', !sortedByName)
    }))

-    menu.popup(electron.remote.getCurrentWindow())
+    menu.popup({ window: electron.remote.getCurrentWindow() })
  }

  // Takes a torrentSummary or torrentKey
  // Shows a Save File dialog, then saves the .torrent file wherever the user requests
  saveTorrentFileAs (torrentKey) {
    const torrentSummary = TorrentSummary.getByKey(this.state, torrentKey)
-    if (!torrentSummary) throw new Error('Missing torrentKey: ' + torrentKey)
+    if (!torrentSummary) throw new TorrentKeyNotFoundError(torrentKey)
    const downloadPath = this.state.saved.prefs.downloadPath
    const newFileName = path.parse(torrentSummary.name).name + '.torrent'
    const win = electron.remote.getCurrentWindow()
@@ -306,18 +318,19 @@ module.exports = class TorrentListController {
      filters: [
        { name: 'Torrent Files', extensions: ['torrent'] },
        { name: 'All Files', extensions: ['*'] }
-      ]
+      ],
+      buttonLabel: 'Save'
    }

-    electron.remote.dialog.showSaveDialog(win, opts, function (savePath) {
-      console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
-      if (!savePath) return // They clicked Cancel
-      const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
-      fs.readFile(torrentPath, function (err, torrentFile) {
+    const savePath = electron.remote.dialog.showSaveDialogSync(win, opts)
+
+    if (!savePath) return // They clicked Cancel
+    console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
+    const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
+    fs.readFile(torrentPath, function (err, torrentFile) {
+      if (err) return dispatch('error', err)
+      fs.writeFile(savePath, torrentFile, function (err) {
        if (err) return dispatch('error', err)
-        fs.writeFile(savePath, torrentFile, function (err) {
-          if (err) return dispatch('error', err)
-        })
      })
    })
  }
@@ -333,7 +346,7 @@ function findFilesRecursive (paths, cb_) {
      findFilesRecursive([path], function (fileObjs) {
        ret.push(...fileObjs)
        if (++numComplete === paths.length) {
-          ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
+          ret.sort((a, b) => a.path < b.path ? -1 : Number(a.path > b.path))
          cb_(ret)
        }
      })
@@ -381,3 +394,14 @@ function moveItemToTrash (torrentSummary) {
 function showItemInFolder (torrentSummary) {
  ipcRenderer.send('showItemInFolder', TorrentSummary.getFileOrFolder(torrentSummary))
 }
+
+function deleteTorrentFile (torrentSummary, deleteData) {
+  ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
+
+  // remove torrent and poster file
+  deleteFile(TorrentSummary.getTorrentPath(torrentSummary))
+  deleteFile(TorrentSummary.getPosterPath(torrentSummary))
+
+  // optionally delete the torrent data
+  if (deleteData) moveItemToTrash(torrentSummary)
+}
--- a/src/renderer/lib/media-extensions.js
+++ b/src/renderer/lib/media-extensions.js
@@ -1,8 +1,8 @@
 const mediaExtensions = {
  audio: [
    '.aac', '.aif', '.aiff', '.asf', '.dff', '.dsf', '.flac', '.m2a',
-    '.m4a', '.m4b', '.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus',
-    '.spx', '.wma', '.wav', '.wv', '.wvp'],
+    '.m2a', '.m4a', '.mpc', '.m4b', '.mka', '.mp2', '.mp3', '.mpc', '.oga',
+    '.ogg', '.opus', '.spx', '.wma', '.wav', '.wv', '.wvp'],
  video: [
    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
    '.ogv', '.webm', '.wmv'],
--- a/src/renderer/lib/migrations.js
+++ b/src/renderer/lib/migrations.js
@@ -28,13 +28,15 @@ function run (state) {
  if (semver.lt(version, '0.14.0')) migrate_0_14_0(saved)
  if (semver.lt(version, '0.17.0')) migrate_0_17_0(saved)
  if (semver.lt(version, '0.17.2')) migrate_0_17_2(saved)
+  if (semver.lt(version, '0.21.0')) migrate_0_21_0(saved)
+  if (semver.lt(version, '0.21.1')) migrate_0_21_1(saved)

  // Config is now on the new version
  state.saved.version = config.APP_VERSION
 }

 function migrate_0_7_0 (saved) {
-  const cpFile = require('cp-file')
+  const { copyFileSync } = require('fs')
  const path = require('path')

  saved.torrents.forEach(function (ts) {
@@ -56,7 +58,7 @@ function migrate_0_7_0 (saved) {
      dst = path.join(config.TORRENT_PATH, infoHash + '.torrent')
      // Synchronous FS calls aren't ideal, but probably OK in a migration
      // that only runs once
-      if (src !== dst) cpFile.sync(src, dst)
+      if (src !== dst) copyFileSync(src, dst)

      delete ts.torrentPath
      ts.torrentFileName = infoHash + '.torrent'
@@ -71,7 +73,7 @@ function migrate_0_7_0 (saved) {
      dst = path.join(config.POSTER_PATH, infoHash + extension)
      // Synchronous FS calls aren't ideal, but probably OK in a migration
      // that only runs once
-      if (src !== dst) cpFile.sync(src, dst)
+      if (src !== dst) copyFileSync(src, dst)

      delete ts.posterURL
      ts.posterFileName = infoHash + extension
@@ -155,7 +157,7 @@ function migrate_0_17_2 (saved) {
  // folders/files that end in a trailing dot (.) or space are not deletable from
  // Windows Explorer. See: https://github.com/webtorrent/webtorrent-desktop/issues/905

-  const cpFile = require('cp-file')
+  const { copyFileSync } = require('fs')
  const rimraf = require('rimraf')

  const OLD_NAME = 'The WIRED CD - Rip. Sample. Mash. Share.'
@@ -190,7 +192,7 @@ function migrate_0_17_2 (saved) {
  ts.posterFileName = NEW_HASH + '.jpg'

  rimraf.sync(path.join(config.TORRENT_PATH, ts.torrentFileName))
-  cpFile.sync(
+  copyFileSync(
    path.join(config.STATIC_PATH, 'wiredCd.torrent'),
    path.join(config.TORRENT_PATH, NEW_HASH + '.torrent')
  )
@@ -206,3 +208,16 @@ function migrate_0_17_2 (saved) {
    } catch (err) {}
  }
 }
+
+function migrate_0_21_0 (saved) {
+  if (saved.prefs.soundNotifications == null) {
+    // The app used to always have sound notifications enabled
+    saved.prefs.soundNotifications = true
+  }
+}
+
+function migrate_0_21_1 (saved) {
+  if (saved.prefs.externalPlayerPath == null) {
+    saved.prefs.externalPlayerPath = ''
+  }
+}
--- a/src/renderer/lib/playlist.js
+++ b/src/renderer/lib/playlist.js
@@ -38,7 +38,8 @@ function getPreviousIndex (state) {

 function getCurrentLocalURL (state) {
  return state.server
-    ? state.server.localURL + '/' + state.playing.fileIndex
+    ? state.server.localURL + '/' + state.playing.fileIndex + '/' +
+      encodeURIComponent(state.playing.fileName)
    : ''
 }

--- a/src/renderer/lib/sound.js
+++ b/src/renderer/lib/sound.js
@@ -1,4 +1,5 @@
 module.exports = {
+  init,
  play
 }

@@ -8,6 +9,9 @@ const path = require('path')

 const VOLUME = 0.25

+// App state to access the soundNotifications preference
+let state
+
 /* Cache of Audio elements, for instant playback */
 const cache = {}

@@ -46,7 +50,19 @@ const sounds = {
  }
 }

+function init (appState) {
+  state = appState
+}
+
 function play (name) {
+  if (state == null) {
+    return
+  }
+
+  if (!state.saved.prefs.soundNotifications) {
+    return
+  }
+
  let audio = cache[name]
  if (!audio) {
    const sound = sounds[name]
--- a/src/renderer/lib/state.js
+++ b/src/renderer/lib/state.js
@@ -88,6 +88,7 @@ function getDefaultPlayState () {
  return {
    infoHash: null, /* the info hash of the torrent we're playing */
    fileIndex: null, /* the zero-based index within the torrent */
+    fileName: null, /* name of the file that is playing */
    location: 'local', /* 'local', 'chromecast', 'airplay' */
    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
    currentTime: 0, /* seconds */
@@ -104,14 +105,18 @@ function getDefaultPlayState () {
      selectedIndex: -1, /* current subtitle track */
      showMenu: false /* popover menu, above the video */
    },
+    audioTracks: {
+      tracks: [],
+      selectedIndex: 0, /* current audio track */
+      showMenu: false /* popover menu, above the video */
+    },
    aspectRatio: 0 /* aspect ratio of the video */
  }
 }

 /* If the saved state file doesn't exist yet, here's what we use instead */
-function setupStateSaved (cb) {
-  const cpFile = require('cp-file')
-  const fs = require('fs')
+function setupStateSaved () {
+  const { copyFileSync, mkdirSync, readFileSync } = require('fs')
  const parseTorrent = require('parse-torrent')

  const saved = {
@@ -119,8 +124,9 @@ function setupStateSaved (cb) {
      downloadPath: config.DEFAULT_DOWNLOAD_PATH,
      isFileHandler: false,
      openExternalPlayer: false,
-      externalPlayerPath: null,
+      externalPlayerPath: '',
      startup: false,
+      soundNotifications: true,
      autoAddTorrents: false,
      torrentsFolderPath: '',
      highestPlaybackPriority: true
@@ -130,31 +136,28 @@ function setupStateSaved (cb) {
    version: config.APP_VERSION /* make sure we can upgrade gracefully later */
  }

-  const tasks = []
+  // TODO: Doing several sync calls during first startup is not ideal
+  mkdirSync(config.POSTER_PATH, { recursive: true })
+  mkdirSync(config.TORRENT_PATH, { recursive: true })

  config.DEFAULT_TORRENTS.forEach((t, i) => {
    const infoHash = saved.torrents[i].infoHash
-    tasks.push(
-      cpFile(
-        path.join(config.STATIC_PATH, t.posterFileName),
-        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
-      )
+    // TODO: Doing several sync calls during first startup is not ideal
+    copyFileSync(
+      path.join(config.STATIC_PATH, t.posterFileName),
+      path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
    )
-    tasks.push(
-      cpFile(
-        path.join(config.STATIC_PATH, t.torrentFileName),
-        path.join(config.TORRENT_PATH, infoHash + '.torrent')
-      )
+    copyFileSync(
+      path.join(config.STATIC_PATH, t.torrentFileName),
+      path.join(config.TORRENT_PATH, infoHash + '.torrent')
    )
  })

-  Promise.all(tasks)
-    .then(() => cb(null, saved))
-    .catch(err => cb(err))
+  return saved

  function createTorrentObject (t) {
-    // TODO: Doing several fs.readFileSync calls during first startup is not ideal
-    const torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
+    // TODO: Doing several sync calls during first startup is not ideal
+    const torrent = readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
    const parsedTorrent = parseTorrent(torrent)

    return {
@@ -199,15 +202,20 @@ function shouldHidePlayerControls () {
    this.playing.playbackRate === 1
 }

-function load (cb) {
-  appConfig.read(function (err, saved) {
-    if (err || !saved.version) {
-      console.log('Missing config file: Creating new one')
-      setupStateSaved(onSavedState)
-    } else {
-      onSavedState(null, saved)
+async function load (cb) {
+  let saved = await appConfig.read()
+
+  if (!saved || !saved.version) {
+    console.log('Missing config file: Creating new one')
+    try {
+      saved = setupStateSaved()
+    } catch (err) {
+      onSavedState(err)
+      return
    }
-  })
+  }
+
+  onSavedState(null, saved)

  function onSavedState (err, saved) {
    if (err) return cb(err)
@@ -225,7 +233,7 @@ function load (cb) {
 }

 // Write state.saved to the JSON state file
-function saveImmediate (state, cb) {
+async function saveImmediate (state, cb) {
  console.log('Saving state to ' + appConfig.filePath)

  // Clean up, so that we're not saving any pending state
@@ -248,8 +256,10 @@ function saveImmediate (state, cb) {
      return torrent
    })

-  appConfig.write(copy, (err) => {
-    if (err) console.error(err)
-    else State.emit('stateSaved')
-  })
+  try {
+    await appConfig.write(copy)
+    State.emit('stateSaved')
+  } catch (err) {
+    console.error(err)
+  }
 }
--- a/src/renderer/lib/telemetry.js
+++ b/src/renderer/lib/telemetry.js
@@ -74,7 +74,7 @@ function reset () {

 // Track screen resolution
 function getScreenInfo () {
-  return electron.screen.getAllDisplays().map((screen) => ({
+  return electron.remote.screen.getAllDisplays().map((screen) => ({
    width: screen.size.width,
    height: screen.size.height,
    scaleFactor: screen.scaleFactor
--- a/src/renderer/lib/torrent-player.js
+++ b/src/renderer/lib/torrent-player.js
@@ -3,6 +3,7 @@ module.exports = {
  isVideo,
  isAudio,
  isTorrent,
+  isMagnetLink,
  isPlayableTorrentSummary
 }

@@ -31,9 +32,15 @@ function isAudio (file) {
 // - a file object where obj.name is ends in .torrent
 // - a string that's a magnet link (magnet://...)
 function isTorrent (file) {
-  const isTorrentFile = getFileExtension(file) === '.torrent'
-  const isMagnet = typeof file === 'string' && /^(stream-)?magnet:/.test(file)
-  return isTorrentFile || isMagnet
+  return isTorrentFile(file) || isMagnetLink(file)
+}
+
+function isTorrentFile (file) {
+  return getFileExtension(file) === '.torrent'
+}
+
+function isMagnetLink (link) {
+  return typeof link === 'string' && /^(stream-)?magnet:/.test(link)
 }

 function getFileExtension (file) {
--- a/src/renderer/lib/torrent-poster.js
+++ b/src/renderer/lib/torrent-poster.js
@@ -18,7 +18,8 @@ function torrentPoster (torrent, cb) {
  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
    return {
      type: mediaType,
-      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType]) }
+      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType])
+    }
  }).sort((a, b) => { // sort descending on size
    return b.size - a.size
  })[0]
@@ -73,7 +74,7 @@ function getLargestFileByExtension (torrent, extensions) {
 * Filter file on a list extension, can be used to find al image files
 * @param torrent Torrent to filter files from
 * @param extensions File extensions to filter on
- * @returns {number} Array of torrent file objects matching one of the given extensions
+ * @returns {Array} Array of torrent file objects matching one of the given extensions
 */
 function filterOnExtension (torrent, extensions) {
  return torrent.files.filter(file => {
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -74,6 +74,7 @@ function onState (err, _state) {
  window.dispatch = dispatch

  telemetry.init(state)
+  sound.init(state)

  // Log uncaught JS errors
  window.addEventListener(
@@ -98,6 +99,10 @@ function onState (err, _state) {
      const SubtitlesController = require('./controllers/subtitles-controller')
      return new SubtitlesController(state)
    }),
+    audioTracks: createGetter(() => {
+      const AudioTracksController = require('./controllers/audio-tracks-controller')
+      return new AudioTracksController(state)
+    }),
    torrent: createGetter(() => {
      const TorrentController = require('./controllers/torrent-controller')
      return new TorrentController(state)
@@ -147,6 +152,9 @@ function onState (err, _state) {
  // ...same thing if you paste a torrent
  document.addEventListener('paste', onPaste)

+  // Add YouTube style hotkey shortcuts
+  window.addEventListener('keydown', onKeydown)
+
  const debouncedFullscreenToggle = debounce(function () {
    dispatch('toggleFullScreen')
  }, 1000, true)
@@ -231,100 +239,108 @@ function updateElectron () {

 const dispatchHandlers = {
  // Torrent list: creating, deleting, selecting torrents
-  'openTorrentFile': () => ipcRenderer.send('openTorrentFile'),
-  'openFiles': () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
-  'openTorrentAddress': () => { state.modal = { id: 'open-torrent-address-modal' } },
+  openTorrentFile: () => ipcRenderer.send('openTorrentFile'),
+  openFiles: () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
+  openTorrentAddress: () => { state.modal = { id: 'open-torrent-address-modal' } },

-  'addTorrent': (torrentId) => controllers.torrentList().addTorrent(torrentId),
-  'showCreateTorrent': (paths) => controllers.torrentList().showCreateTorrent(paths),
-  'createTorrent': (options) => controllers.torrentList().createTorrent(options),
-  'toggleTorrent': (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
-  'pauseAllTorrents': () => controllers.torrentList().pauseAllTorrents(),
-  'resumeAllTorrents': () => controllers.torrentList().resumeAllTorrents(),
-  'toggleTorrentFile': (infoHash, index) =>
+  addTorrent: (torrentId) => controllers.torrentList().addTorrent(torrentId),
+  showCreateTorrent: (paths) => controllers.torrentList().showCreateTorrent(paths),
+  createTorrent: (options) => controllers.torrentList().createTorrent(options),
+  toggleTorrent: (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
+  pauseAllTorrents: () => controllers.torrentList().pauseAllTorrents(),
+  resumeAllTorrents: () => controllers.torrentList().resumeAllTorrents(),
+  toggleTorrentFile: (infoHash, index) =>
    controllers.torrentList().toggleTorrentFile(infoHash, index),
-  'confirmDeleteTorrent': (infoHash, deleteData) =>
+  confirmDeleteTorrent: (infoHash, deleteData) =>
    controllers.torrentList().confirmDeleteTorrent(infoHash, deleteData),
-  'deleteTorrent': (infoHash, deleteData) =>
+  deleteTorrent: (infoHash, deleteData) =>
    controllers.torrentList().deleteTorrent(infoHash, deleteData),
-  'toggleSelectTorrent': (infoHash) =>
+  confirmDeleteAllTorrents: (deleteData) =>
+    controllers.torrentList().confirmDeleteAllTorrents(deleteData),
+  deleteAllTorrents: (deleteData) =>
+    controllers.torrentList().deleteAllTorrents(deleteData),
+  toggleSelectTorrent: (infoHash) =>
    controllers.torrentList().toggleSelectTorrent(infoHash),
-  'openTorrentContextMenu': (infoHash) =>
+  openTorrentContextMenu: (infoHash) =>
    controllers.torrentList().openTorrentContextMenu(infoHash),
-  'startTorrentingSummary': (torrentKey) =>
+  startTorrentingSummary: (torrentKey) =>
    controllers.torrentList().startTorrentingSummary(torrentKey),
-  'saveTorrentFileAs': (torrentKey) =>
+  saveTorrentFileAs: (torrentKey) =>
    controllers.torrentList().saveTorrentFileAs(torrentKey),
-  'prioritizeTorrent': (infoHash) => controllers.torrentList().prioritizeTorrent(infoHash),
-  'resumePausedTorrents': () => controllers.torrentList().resumePausedTorrents(),
+  prioritizeTorrent: (infoHash) => controllers.torrentList().prioritizeTorrent(infoHash),
+  resumePausedTorrents: () => controllers.torrentList().resumePausedTorrents(),

  // Playback
-  'playFile': (infoHash, index) => controllers.playback().playFile(infoHash, index),
-  'playPause': () => controllers.playback().playPause(),
-  'nextTrack': () => controllers.playback().nextTrack(),
-  'previousTrack': () => controllers.playback().previousTrack(),
-  'skip': (time) => controllers.playback().skip(time),
-  'skipTo': (time) => controllers.playback().skipTo(time),
-  'changePlaybackRate': (dir) => controllers.playback().changePlaybackRate(dir),
-  'changeVolume': (delta) => controllers.playback().changeVolume(delta),
-  'setVolume': (vol) => controllers.playback().setVolume(vol),
-  'openItem': (infoHash, index) => controllers.playback().openItem(infoHash, index),
+  playFile: (infoHash, index) => controllers.playback().playFile(infoHash, index),
+  playPause: () => controllers.playback().playPause(),
+  nextTrack: () => controllers.playback().nextTrack(),
+  previousTrack: () => controllers.playback().previousTrack(),
+  skip: (time) => controllers.playback().skip(time),
+  skipTo: (time) => controllers.playback().skipTo(time),
+  changePlaybackRate: (dir) => controllers.playback().changePlaybackRate(dir),
+  changeVolume: (delta) => controllers.playback().changeVolume(delta),
+  setVolume: (vol) => controllers.playback().setVolume(vol),
+  openItem: (infoHash, index) => controllers.playback().openItem(infoHash, index),

  // Subtitles
-  'openSubtitles': () => controllers.subtitles().openSubtitles(),
-  'selectSubtitle': (index) => controllers.subtitles().selectSubtitle(index),
-  'toggleSubtitlesMenu': () => controllers.subtitles().toggleSubtitlesMenu(),
-  'checkForSubtitles': () => controllers.subtitles().checkForSubtitles(),
-  'addSubtitles': (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),
+  openSubtitles: () => controllers.subtitles().openSubtitles(),
+  selectSubtitle: (index) => controllers.subtitles().selectSubtitle(index),
+  toggleSubtitlesMenu: () => controllers.subtitles().toggleSubtitlesMenu(),
+  checkForSubtitles: () => controllers.subtitles().checkForSubtitles(),
+  addSubtitles: (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),
+
+  // Audio Tracks
+  selectAudioTrack: (index) => controllers.audioTracks().selectAudioTrack(index),
+  toggleAudioTracksMenu: () => controllers.audioTracks().toggleAudioTracksMenu(),

  // Local media: <video>, <audio>, external players
-  'mediaStalled': () => controllers.media().mediaStalled(),
-  'mediaError': (err) => controllers.media().mediaError(err),
-  'mediaSuccess': () => controllers.media().mediaSuccess(),
-  'mediaTimeUpdate': () => controllers.media().mediaTimeUpdate(),
-  'mediaMouseMoved': () => controllers.media().mediaMouseMoved(),
-  'mediaControlsMouseEnter': () => controllers.media().controlsMouseEnter(),
-  'mediaControlsMouseLeave': () => controllers.media().controlsMouseLeave(),
-  'openExternalPlayer': () => controllers.media().openExternalPlayer(),
-  'externalPlayerNotFound': () => controllers.media().externalPlayerNotFound(),
+  mediaStalled: () => controllers.media().mediaStalled(),
+  mediaError: (err) => controllers.media().mediaError(err),
+  mediaSuccess: () => controllers.media().mediaSuccess(),
+  mediaTimeUpdate: () => controllers.media().mediaTimeUpdate(),
+  mediaMouseMoved: () => controllers.media().mediaMouseMoved(),
+  mediaControlsMouseEnter: () => controllers.media().controlsMouseEnter(),
+  mediaControlsMouseLeave: () => controllers.media().controlsMouseLeave(),
+  openExternalPlayer: () => controllers.media().openExternalPlayer(),
+  externalPlayerNotFound: () => controllers.media().externalPlayerNotFound(),

  // Remote casting: Chromecast, Airplay, etc
-  'toggleCastMenu': (deviceType) => lazyLoadCast().toggleMenu(deviceType),
-  'selectCastDevice': (index) => lazyLoadCast().selectDevice(index),
-  'stopCasting': () => lazyLoadCast().stop(),
+  toggleCastMenu: (deviceType) => lazyLoadCast().toggleMenu(deviceType),
+  selectCastDevice: (index) => lazyLoadCast().selectDevice(index),
+  stopCasting: () => lazyLoadCast().stop(),

  // Preferences screen
-  'preferences': () => controllers.prefs().show(),
-  'updatePreferences': (key, value) => controllers.prefs().update(key, value),
-  'checkDownloadPath': checkDownloadPath,
-  'startFolderWatcher': () => controllers.folderWatcher().start(),
-  'stopFolderWatcher': () => controllers.folderWatcher().stop(),
+  preferences: () => controllers.prefs().show(),
+  updatePreferences: (key, value) => controllers.prefs().update(key, value),
+  checkDownloadPath: checkDownloadPath,
+  startFolderWatcher: () => controllers.folderWatcher().start(),
+  stopFolderWatcher: () => controllers.folderWatcher().stop(),

  // Update (check for new versions on Linux, where there's no auto updater)
-  'updateAvailable': (version) => controllers.update().updateAvailable(version),
-  'skipVersion': (version) => controllers.update().skipVersion(version),
+  updateAvailable: (version) => controllers.update().updateAvailable(version),
+  skipVersion: (version) => controllers.update().skipVersion(version),

  // Navigation between screens (back, forward, ESC, etc)
-  'exitModal': () => { state.modal = null },
-  'backToList': backToList,
-  'escapeBack': escapeBack,
-  'back': () => state.location.back(),
-  'forward': () => state.location.forward(),
-  'cancel': () => state.location.cancel(),
+  exitModal: () => { state.modal = null },
+  backToList: backToList,
+  escapeBack: escapeBack,
+  back: () => state.location.back(),
+  forward: () => state.location.forward(),
+  cancel: () => state.location.cancel(),

  // Controlling the window
-  'setDimensions': setDimensions,
-  'toggleFullScreen': (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
-  'setTitle': (title) => { state.window.title = title },
-  'resetTitle': () => { state.window.title = config.APP_WINDOW_TITLE },
+  setDimensions: setDimensions,
+  toggleFullScreen: (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
+  setTitle: (title) => { state.window.title = title },
+  resetTitle: () => { state.window.title = config.APP_WINDOW_TITLE },

  // Everything else
-  'onOpen': onOpen,
-  'error': onError,
-  'uncaughtError': (proc, err) => telemetry.logUncaughtError(proc, err),
-  'stateSave': () => State.save(state),
-  'stateSaveImmediate': () => State.saveImmediate(state),
-  'update': () => {} // No-op, just trigger an update
+  onOpen: onOpen,
+  error: onError,
+  uncaughtError: (proc, err) => telemetry.logUncaughtError(proc, err),
+  stateSave: () => State.save(state),
+  stateSaveImmediate: () => State.saveImmediate(state),
+  update: () => {} // No-op, just trigger an update
 }

 // Events from the UI never modify state directly. Instead they call dispatch()
@@ -356,7 +372,7 @@ function setupIpc () {
  ipcRenderer.on('windowBoundsChanged', onWindowBoundsChanged)

  const tc = controllers.torrent()
-  ipcRenderer.on('wt-infohash', (e, ...args) => tc.torrentInfoHash(...args))
+  ipcRenderer.on('wt-parsed', (e, ...args) => tc.torrentParsed(...args))
  ipcRenderer.on('wt-metadata', (e, ...args) => tc.torrentMetadata(...args))
  ipcRenderer.on('wt-done', (e, ...args) => tc.torrentDone(...args))
  ipcRenderer.on('wt-done', () => controllers.torrentList().resumePausedTorrents())
@@ -454,7 +470,7 @@ function setDimensions (dimensions) {
 // Called when the user adds files (.torrent, files to seed, subtitles) to the app
 // via any method (drag-drop, drag to app icon, command line)
 function onOpen (files) {
-  if (!Array.isArray(files)) files = [ files ]
+  if (!Array.isArray(files)) files = [files]

  // File API seems to transform "magnet:?foo" in "magnet:///?foo"
  // this is a sanitization
@@ -507,6 +523,34 @@ function onPaste (e) {
  update()
 }

+function onKeydown (e) {
+  const key = e.key
+
+  if (key === 'ArrowLeft') {
+    dispatch('skip', -5)
+  } else if (key === 'ArrowRight') {
+    dispatch('skip', 5)
+  } else if (key === 'ArrowUp') {
+    dispatch('changeVolume', 0.1)
+  } else if (key === 'ArrowDown') {
+    dispatch('changeVolume', -0.1)
+  } else if (key === 'j') {
+    dispatch('skip', -10)
+  } else if (key === 'l') {
+    dispatch('skip', 10)
+  } else if (key === 'k') {
+    dispatch('playPause')
+  } else if (key === '>') {
+    dispatch('changePlaybackRate', 1)
+  } else if (key === '<') {
+    dispatch('changePlaybackRate', -1)
+  } else if (key === 'f') {
+    dispatch('toggleFullScreen')
+  }
+
+  update()
+}
+
 function onFocus (e) {
  state.window.isFocused = true
  state.dock.badge = 0
@@ -519,7 +563,7 @@ function onBlur () {
 }

 function onVisibilityChange () {
-  state.window.isVisible = !document.webkitHidden
+  state.window.isVisible = !document.hidden
 }

 function onFullscreenChanged (e, isFullScreen) {
--- a/src/renderer/pages/app.js
+++ b/src/renderer/pages/app.js
@@ -12,10 +12,10 @@ const Header = require('../components/header')
 const TorrentListPage = require('./torrent-list-page')

 const Views = {
-  'home': createGetter(() => TorrentListPage),
-  'player': createGetter(() => require('./player-page')),
+  home: createGetter(() => TorrentListPage),
+  player: createGetter(() => require('./player-page')),
  'create-torrent': createGetter(() => require('./create-torrent-page')),
-  'preferences': createGetter(() => require('./preferences-page'))
+  preferences: createGetter(() => require('./preferences-page'))
 }

 const Modals = {
@@ -24,7 +24,9 @@ const Modals = {
  ),
  'remove-torrent-modal': createGetter(() => require('../components/remove-torrent-modal')),
  'update-available-modal': createGetter(() => require('../components/update-available-modal')),
-  'unsupported-media-modal': createGetter(() => require('../components/unsupported-media-modal'))
+  'unsupported-media-modal': createGetter(() => require('../components/unsupported-media-modal')),
+  'delete-all-torrents-modal':
+      createGetter(() => require('../components/delete-all-torrents-modal'))
 }

 const fontFamily = process.platform === 'win32'
@@ -88,8 +90,10 @@ class App extends React.Component {
      return (<div key={i} className='error'>{error.message}</div>)
    })
    return (
-      <div key='errors'
-        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}>
+      <div
+        key='errors'
+        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}
+      >
        <div key='title' className='title'>Error</div>
        {errorElems}
      </div>
--- a/src/renderer/pages/create-torrent-page.js
+++ b/src/renderer/pages/create-torrent-page.js
@@ -65,9 +65,9 @@ class CreateTorrentPage extends React.Component {
    }

    // Create React event handlers only once
-    this.setIsPrivate = (_, isPrivate) => this.setState({ isPrivate })
-    this.setComment = (_, comment) => this.setState({ comment })
-    this.setTrackers = (_, trackers) => this.setState({ trackers })
+    this.handleSetIsPrivate = (_, isPrivate) => this.setState({ isPrivate })
+    this.handleSetComment = (_, comment) => this.setState({ comment })
+    this.handleSetTrackers = (_, trackers) => this.setState({ trackers })
    this.handleSubmit = handleSubmit.bind(this)
  }

@@ -94,7 +94,8 @@ class CreateTorrentPage extends React.Component {
            marginBottom: 10
          }}
          hideLabel='Hide advanced settings...'
-          showLabel='Show advanced settings...'>
+          showLabel='Show advanced settings...'
+        >
          {this.renderAdvanced()}
        </ShowMore>
        <div className='float-right'>
@@ -104,12 +105,14 @@ class CreateTorrentPage extends React.Component {
            style={{
              marginRight: 10
            }}
-            onClick={dispatcher('cancel')} />
+            onClick={dispatcher('cancel')}
+          />
          <RaisedButton
            className='control create-torrent-button'
            label='Create Torrent'
            primary
-            onClick={this.handleSubmit} />
+            onClick={this.handleSubmit}
+          />
        </div>
      </div>
    )
@@ -143,7 +146,8 @@ class CreateTorrentPage extends React.Component {
            className='torrent-is-private control'
            style={{ display: '' }}
            checked={this.state.isPrivate}
-            onCheck={this.setIsPrivate} />
+            onCheck={this.handleSetIsPrivate}
+          />
        </div>
        <div key='trackers' className='torrent-attribute'>
          <label>Trackers:</label>
@@ -155,7 +159,8 @@ class CreateTorrentPage extends React.Component {
            rows={2}
            rowsMax={10}
            value={this.state.trackers}
-            onChange={this.setTrackers} />
+            onChange={this.handleSetTrackers}
+          />
        </div>
        <div key='comment' className='torrent-attribute'>
          <label>Comment:</label>
@@ -168,7 +173,8 @@ class CreateTorrentPage extends React.Component {
            rows={2}
            rowsMax={10}
            value={this.state.comment}
-            onChange={this.setComment} />
+            onChange={this.handleSetComment}
+          />
        </div>
        <div key='files' className='torrent-attribute'>
          <label>Files:</label>
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -1,7 +1,6 @@
 const React = require('react')
 const Bitfield = require('bitfield')
 const prettyBytes = require('prettier-bytes')
-const zeroFill = require('zero-fill')

 const TorrentSummary = require('../lib/torrent-summary')
 const Playlist = require('../lib/playlist')
@@ -20,7 +19,8 @@ module.exports = class Player extends React.Component {
      <div
        className='player'
        onWheel={handleVolumeWheel}
-        onMouseMove={dispatcher('mediaMouseMoved')}>
+        onMouseMove={dispatcher('mediaMouseMoved')}
+      >
        {showVideo ? renderMedia(state) : renderCastScreen(state)}
        {showControls ? renderPlayerControls(state) : null}
      </div>
@@ -95,6 +95,13 @@ function renderMedia (state) {
      delete file.selectedSubtitle
    }

+    // Switch to selected audio track
+    const audioTracks = mediaElement.audioTracks || []
+    for (let j = 0; j < audioTracks.length; j++) {
+      const isSelectedTrack = j === state.playing.audioTracks.selectedIndex
+      audioTracks[j].enabled = isSelectedTrack
+    }
+
    state.playing.volume = mediaElement.volume
  }

@@ -107,10 +114,11 @@ function renderMedia (state) {
      trackTags.push(
        <track
          key={i}
-          default={isSelected ? 'default' : ''}
+          default={isSelected}
          label={track.label}
-          type='subtitles'
-          src={track.buffer} />
+          kind='subtitles'
+          src={track.buffer}
+        />
      )
    }
  }
@@ -127,7 +135,7 @@ function renderMedia (state) {
      onError={dispatcher('mediaError')}
      onTimeUpdate={dispatcher('mediaTimeUpdate')}
      onEncrypted={dispatcher('mediaEncrypted')}
-      onCanPlay={onCanPlay}>
+    >
      {trackTags}
    </MediaTagName>
  )
@@ -137,21 +145,57 @@ function renderMedia (state) {
    <div
      key='letterbox'
      className='letterbox'
-      onMouseMove={dispatcher('mediaMouseMoved')}>
+      onMouseMove={dispatcher('mediaMouseMoved')}
+    >
      {mediaTag}
      {renderOverlay(state)}
    </div>
  )

-  // As soon as we know the video dimensions, resize the window
  function onLoadedMetadata (e) {
-    if (state.playing.type !== 'video') return
-    const video = e.target
-    const dimensions = {
-      width: video.videoWidth,
-      height: video.videoHeight
+    const mediaElement = e.target
+
+    // check if we can decode video and audio track
+    if (state.playing.type === 'video') {
+      if (mediaElement.videoTracks.length === 0) {
+        dispatch('mediaError', 'Video codec unsupported')
+      }
+
+      if (mediaElement.audioTracks.length === 0) {
+        dispatch('mediaError', 'Audio codec unsupported')
+      }
+
+      dispatch('mediaSuccess')
+
+      const dimensions = {
+        width: mediaElement.videoWidth,
+        height: mediaElement.videoHeight
+      }
+
+      // As soon as we know the video dimensions, resize the window
+      dispatch('setDimensions', dimensions)
+
+      // set audioTracks
+      const tracks = []
+      for (let i = 0; i < mediaElement.audioTracks.length; i++) {
+        tracks.push({
+          label: mediaElement.audioTracks[i].label || `Track ${i + 1}`,
+          language: mediaElement.audioTracks[i].language
+        })
+      }
+
+      state.playing.audioTracks.tracks = tracks
+      state.playing.audioTracks.selectedIndex = 0
+    }
+
+    // check if we can decode audio track
+    if (state.playing.type === 'audio') {
+      if (mediaElement.audioTracks.length === 0) {
+        dispatch('mediaError', 'Audio codec unsupported')
+      }
+
+      dispatch('mediaSuccess')
    }
-    dispatch('setDimensions', dimensions)
  }

  function onEnded (e) {
@@ -163,19 +207,6 @@ function renderMedia (state) {
      if (state.window.isFullScreen) dispatch('toggleFullScreen')
    }
  }
-
-  function onCanPlay (e) {
-    const elem = e.target
-    if (state.playing.type === 'video' &&
-      elem.webkitVideoDecodedByteCount === 0) {
-      dispatch('mediaError', 'Video codec unsupported')
-    } else if (elem.webkitAudioDecodedByteCount === 0) {
-      dispatch('mediaError', 'Audio codec unsupported')
-    } else {
-      dispatch('mediaSuccess')
-      elem.play()
-    }
-  }
 }

 function renderOverlay (state) {
@@ -293,7 +324,7 @@ function renderAudioMetadata (state) {
    }
    elems.push((
      <div key='release' className='audio-release'>
-        <label>Release</label>{ releaseInfo.join(', ') }
+        <label>Release</label>{releaseInfo.join(', ')}
      </div>
    ))
  }
@@ -301,14 +332,18 @@ function renderAudioMetadata (state) {
  // Audio metadata: format
  const format = []
  fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
-  if (fileSummary.audioInfo.format.dataformat) {
-    format.push(fileSummary.audioInfo.format.dataformat)
+  if (fileSummary.audioInfo.format.container) {
+    format.push(fileSummary.audioInfo.format.container)
+  }
+  if (fileSummary.audioInfo.format.codec &&
+    fileSummary.audioInfo.format.container !== fileSummary.audioInfo.format.codec) {
+    format.push(fileSummary.audioInfo.format.codec)
  }
  if (fileSummary.audioInfo.format.bitrate) {
    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbps') // 128 kbps
  }
  if (fileSummary.audioInfo.format.sampleRate) {
-    format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz') // 44.1 kHz
+    format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz')
  }
  if (fileSummary.audioInfo.format.bitsPerSample) {
    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
@@ -316,7 +351,7 @@ function renderAudioMetadata (state) {
  if (format.length > 0) {
    elems.push((
      <div key='format' className='audio-format'>
-        <label>Format</label>{ format.join(', ') }
+        <label>Format</label>{format.join(', ')}
      </div>
    ))
  }
@@ -358,7 +393,7 @@ function renderLoadingSpinner (state) {
    <div key='loading' className='media-stalled'>
      <div key='loading-spinner' className='loading-spinner' />
      <div key='loading-progress' className='loading-status ellipsis'>
-        <span className='progress'>{fileProgress}%</span> downloaded
+        <span><span className='progress'>{fileProgress}%</span> downloaded</span>
        <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
        <span> ↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
      </div>
@@ -425,6 +460,7 @@ function renderCastOptions (state) {
    return (
      <li key={ix} onClick={dispatcher('selectCastDevice', ix)}>
        <i className='icon'>{isSelected ? 'radio_button_checked' : 'radio_button_unchecked'}</i>
+        {' '}
        {name}
      </li>
    )
@@ -464,6 +500,27 @@ function renderSubtitleOptions (state) {
  )
 }

+function renderAudioTrackOptions (state) {
+  const audioTracks = state.playing.audioTracks
+  if (!audioTracks.tracks.length || !audioTracks.showMenu) return
+
+  const items = audioTracks.tracks.map(function (track, ix) {
+    const isSelected = state.playing.audioTracks.selectedIndex === ix
+    return (
+      <li key={ix} onClick={dispatcher('selectAudioTrack', ix)}>
+        <i className='icon'>{'radio_button_' + (isSelected ? 'checked' : 'unchecked')}</i>
+        {track.label}
+      </li>
+    )
+  })
+
+  return (
+    <ul key='audio-track-options' className='options-list'>
+      {items}
+    </ul>
+  )
+}
+
 function renderPlayerControls (state) {
  const positionPercent = 100 * state.playing.currentTime / state.playing.duration
  const playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 3px)' }
@@ -472,6 +529,9 @@ function renderPlayerControls (state) {
    : state.playing.subtitles.selectedIndex >= 0
      ? 'active'
      : ''
+  const multiAudioClass = state.playing.audioTracks.tracks.length > 1
+    ? 'active'
+    : 'disabled'
  const prevClass = Playlist.hasPrevious(state) ? '' : 'disabled'
  const nextClass = Playlist.hasNext(state) ? '' : 'disabled'

@@ -481,41 +541,47 @@ function renderPlayerControls (state) {
      <div
        key='cursor'
        className='playback-cursor'
-        style={playbackCursorStyle} />
+        style={playbackCursorStyle}
+      />
      <div
        key='scrub-bar'
        className='scrub-bar'
-        draggable='true'
+        draggable
        onDragStart={handleDragStart}
        onClick={handleScrub}
-        onDrag={handleScrub} />
+        onDrag={handleScrub}
+      />
    </div>,

    <i
      key='skip-previous'
      className={'icon skip-previous float-left ' + prevClass}
-      onClick={dispatcher('previousTrack')}>
+      onClick={dispatcher('previousTrack')}
+    >
      skip_previous
    </i>,

    <i
      key='play'
      className='icon play-pause float-left'
-      onClick={dispatcher('playPause')}>
+      onClick={dispatcher('playPause')}
+    >
      {state.playing.isPaused ? 'play_arrow' : 'pause'}
    </i>,

    <i
      key='skip-next'
      className={'icon skip-next float-left ' + nextClass}
-      onClick={dispatcher('nextTrack')}>
+      onClick={dispatcher('nextTrack')}
+    >
      skip_next
    </i>,

    <i
      key='fullscreen'
      className='icon fullscreen float-right'
-      onClick={dispatcher('toggleFullScreen')}>
+      onClick={dispatcher('toggleFullScreen')}
+    >
      {state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
    </i>
  ]
@@ -526,9 +592,18 @@ function renderPlayerControls (state) {
      <i
        key='subtitles'
        className={'icon closed-caption float-right ' + captionsClass}
-        onClick={handleSubtitles}>
+        onClick={handleSubtitles}
+      >
        closed_caption
      </i>
+    ), (
+      <i
+        key='audio-tracks'
+        className={'icon multi-audio float-right ' + multiAudioClass}
+        onClick={handleAudioTracks}
+      >
+        library_music
+      </i>
    ))
  }

@@ -539,9 +614,9 @@ function renderPlayerControls (state) {

  // Add the cast buttons. Icons for each cast type, connected/disconnected:
  const buttonIcons = {
-    'chromecast': { true: 'cast_connected', false: 'cast' },
-    'airplay': { true: 'airplay', false: 'airplay' },
-    'dlna': { true: 'tv', false: 'tv' }
+    chromecast: { true: 'cast_connected', false: 'cast' },
+    airplay: { true: 'airplay', false: 'airplay' },
+    dlna: { true: 'tv', false: 'tv' }
  }
  castTypes.forEach(function (castType) {
    // Do we show this button (eg. the Chromecast button) at all?
@@ -570,7 +645,8 @@ function renderPlayerControls (state) {
      <i
        key={castType}
        className={'icon device float-right ' + buttonClass}
-        onClick={buttonHandler}>
+        onClick={buttonHandler}
+      >
        {buttonIcon}
      </i>
    ))
@@ -593,7 +669,8 @@ function renderPlayerControls (state) {
    <div key='volume' className='volume float-left'>
      <i
        className='icon volume-icon float-left'
-        onMouseDown={handleVolumeMute}>
+        onMouseDown={handleVolumeMute}
+      >
        {volumeIcon}
      </i>
      <input
@@ -601,7 +678,8 @@ function renderPlayerControls (state) {
        type='range' min='0' max='1' step='0.05'
        value={volume}
        onChange={handleVolumeScrub}
-        style={volumeStyle} />
+        style={volumeStyle}
+      />
    </div>
  ))

@@ -624,12 +702,15 @@ function renderPlayerControls (state) {
  }

  return (
-    <div key='controls' className='controls'
+    <div
+      key='controls' className='controls'
      onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-      onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
+      onMouseLeave={dispatcher('mediaControlsMouseLeave')}
+    >
      {elements}
      {renderCastOptions(state)}
      {renderSubtitleOptions(state)}
+      {renderAudioTrackOptions(state)}
    </div>
  )

@@ -673,6 +754,10 @@ function renderPlayerControls (state) {
      dispatch('toggleSubtitlesMenu')
    }
  }
+
+  function handleAudioTracks (e) {
+    dispatch('toggleAudioTracksMenu')
+  }
 }

 // Renders the loading bar. Shows which parts of the torrent are loaded, which
@@ -738,10 +823,10 @@ function formatTime (time, total) {
  const totalMinutes = Math.floor(total / 60)
  const hours = Math.floor(time / 3600)
  let minutes = Math.floor(time % 3600 / 60)
-  if (totalMinutes > 9) {
-    minutes = zeroFill(2, minutes)
+  if (totalMinutes > 9 && minutes < 10) {
+    minutes = '0' + minutes
  }
-  const seconds = zeroFill(2, Math.floor(time % 60))
+  const seconds = `0${Math.floor(time % 60)}`.slice(-2)

  return (totalHours > 0 ? hours + ':' : '') + minutes + ':' + seconds
 }
--- a/src/renderer/pages/preferences-page.js
+++ b/src/renderer/pages/preferences-page.js
@@ -1,4 +1,3 @@
-const path = require('path')
 const React = require('react')
 const PropTypes = require('prop-types')

@@ -26,6 +25,9 @@ class PreferencesPage extends React.Component {

    this.handleStartupChange =
      this.handleStartupChange.bind(this)
+
+    this.handleSoundNotificationsChange =
+      this.handleSoundNotificationsChange.bind(this)
  }

  downloadPathSelector () {
@@ -34,11 +36,12 @@ class PreferencesPage extends React.Component {
        <PathSelector
          dialog={{
            title: 'Select download directory',
-            properties: [ 'openDirectory' ]
+            properties: ['openDirectory']
          }}
          onChange={this.handleDownloadPathChange}
          title='Download location'
-          value={this.props.state.saved.prefs.downloadPath} />
+          value={this.props.state.saved.prefs.downloadPath}
+        />
      </Preference>
    )
  }
@@ -53,8 +56,9 @@ class PreferencesPage extends React.Component {
        <Checkbox
          className='control'
          checked={!this.props.state.saved.prefs.openExternalPlayer}
-          label={'Play torrent media files using WebTorrent'}
-          onCheck={this.handleOpenExternalPlayerChange} />
+          label='Play torrent media files using WebTorrent'
+          onCheck={this.handleOpenExternalPlayerChange}
+        />
      </Preference>
    )
  }
@@ -69,7 +73,7 @@ class PreferencesPage extends React.Component {
        <Checkbox
          className='control'
          checked={this.props.state.saved.prefs.highestPlaybackPriority}
-          label={'Highest Playback Priority'}
+          label='Highest Playback Priority'
          onCheck={this.handleHighestPlaybackPriorityChange}
        />
        <p>Pauses all active torrents to allow playback to use all of the available bandwidth.</p>
@@ -95,12 +99,12 @@ class PreferencesPage extends React.Component {
        <PathSelector
          dialog={{
            title: 'Select media player app',
-            properties: [ 'openFile' ]
+            properties: ['openFile']
          }}
-          displayValue={playerName}
          onChange={this.handleExternalPlayerPathChange}
          title='External player'
-          value={playerPath ? path.dirname(playerPath) : null} />
+          value={playerPath}
+        />
      </Preference>
    )
  }
@@ -115,7 +119,7 @@ class PreferencesPage extends React.Component {
        <Checkbox
          className='control'
          checked={this.props.state.saved.prefs.autoAddTorrents}
-          label={'Watch for new .torrent files and add them immediately'}
+          label='Watch for new .torrent files and add them immediately'
          onCheck={(e, value) => { this.handleAutoAddTorrentsChange(e, value) }}
        />
      </Preference>
@@ -133,11 +137,11 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'autoAddTorrents', isChecked)

    if (isChecked) {
-      dispatch('startFolderWatcher', null)
+      dispatch('startFolderWatcher')
      return
    }

-    dispatch('stopFolderWatcher', null)
+    dispatch('stopFolderWatcher')
  }

  torrentsFolderPathSelector () {
@@ -148,17 +152,17 @@ class PreferencesPage extends React.Component {
        <PathSelector
          dialog={{
            title: 'Select folder to watch for new torrents',
-            properties: [ 'openDirectory' ]
+            properties: ['openDirectory']
          }}
-          displayValue={torrentsFolderPath || ''}
-          onChange={this.handletorrentsFolderPathChange}
+          onChange={this.handleTorrentsFolderPathChange}
          title='Folder to watch'
-          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null} />
+          value={torrentsFolderPath}
+        />
      </Preference>
    )
  }

-  handletorrentsFolderPathChange (filePath) {
+  handleTorrentsFolderPathChange (filePath) {
    dispatch('updatePreferences', 'torrentsFolderPath', filePath)
  }

@@ -177,7 +181,8 @@ class PreferencesPage extends React.Component {
        <RaisedButton
          className='control'
          onClick={this.handleSetDefaultApp}
-          label='Make WebTorrent the default' />
+          label='Make WebTorrent the default'
+        />
      </Preference>
    )
  }
@@ -186,25 +191,40 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'startup', isChecked)
  }

-  setStartupSection () {
+  setStartupCheckbox () {
    if (config.IS_PORTABLE) {
      return
    }

    return (
-      <PreferencesSection title='Startup'>
-        <Preference>
-          <Checkbox
-            className='control'
-            checked={this.props.state.saved.prefs.startup}
-            label={'Open WebTorrent on startup.'}
-            onCheck={this.handleStartupChange}
-          />
-        </Preference>
-      </PreferencesSection>
+      <Preference>
+        <Checkbox
+          className='control'
+          checked={this.props.state.saved.prefs.startup}
+          label='Open WebTorrent on startup'
+          onCheck={this.handleStartupChange}
+        />
+      </Preference>
    )
  }

+  soundNotificationsCheckbox () {
+    return (
+      <Preference>
+        <Checkbox
+          className='control'
+          checked={this.props.state.saved.prefs.soundNotifications}
+          label='Enable sounds'
+          onCheck={this.handleSoundNotificationsChange}
+        />
+      </Preference>
+    )
+  }
+
+  handleSoundNotificationsChange (e, isChecked) {
+    dispatch('updatePreferences', 'soundNotifications', isChecked)
+  }
+
  handleSetDefaultApp () {
    dispatch('updatePreferences', 'isFileHandler', true)
  }
@@ -230,7 +250,10 @@ class PreferencesPage extends React.Component {
        <PreferencesSection title='Default torrent app'>
          {this.setDefaultAppButton()}
        </PreferencesSection>
-        {this.setStartupSection()}
+        <PreferencesSection title='General'>
+          {this.setStartupCheckbox()}
+          {this.soundNotificationsCheckbox()}
+        </PreferencesSection>
      </div>
    )
  }
--- a/src/renderer/pages/torrent-list-page.js
+++ b/src/renderer/pages/torrent-list-page.js
@@ -67,7 +67,8 @@ module.exports = class TorrentList extends React.Component {
        style={style}
        className={classes.join(' ')}
        onContextMenu={infoHash && dispatcher('openTorrentContextMenu', infoHash)}
-        onClick={infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
+        onClick={infoHash && dispatcher('toggleSelectTorrent', infoHash)}
+      >
        {this.renderTorrentMetadata(torrentSummary)}
        {infoHash ? this.renderTorrentButtons(torrentSummary) : null}
        {isSelected ? this.renderTorrentDetails(torrentSummary) : null}
@@ -130,7 +131,8 @@ module.exports = class TorrentList extends React.Component {
          }}
          checked={isActive}
          onClick={stopPropagation}
-          onCheck={dispatcher('toggleTorrent', infoHash)} />
+          onCheck={dispatcher('toggleTorrent', infoHash)}
+        />
      )
    }

@@ -210,7 +212,9 @@ module.exports = class TorrentList extends React.Component {
        else if (torrentSummary.progress.progress === 1) status = 'Not seeding'
        else status = 'Paused'
      } else if (torrentSummary.status === 'downloading') {
-        status = 'Downloading'
+        if (!torrentSummary.progress) status = ''
+        else if (!torrentSummary.progress.ready) status = 'Verifying'
+        else status = 'Downloading'
      } else if (torrentSummary.status === 'seeding') {
        status = 'Seeding'
      } else { // torrentSummary.status is 'new' or something unexpected
@@ -232,8 +236,9 @@ module.exports = class TorrentList extends React.Component {
        <i
          key='play-button'
          title='Start streaming'
-          className={'icon play'}
-          onClick={dispatcher('playFile', infoHash)}>
+          className='icon play'
+          onClick={dispatcher('playFile', infoHash)}
+        >
          play_circle_outline
        </i>
      )
@@ -246,7 +251,8 @@ module.exports = class TorrentList extends React.Component {
          key='delete-button'
          className='icon delete'
          title='Remove torrent'
-          onClick={dispatcher('confirmDeleteTorrent', infoHash, false)}>
+          onClick={dispatcher('confirmDeleteTorrent', infoHash, false)}
+        >
          close
        </i>
      </div>
@@ -319,7 +325,7 @@ module.exports = class TorrentList extends React.Component {
        torrentSummary.progress.files[index]) {
      const fileProg = torrentSummary.progress.files[index]
      isDone = fileProg.numPiecesPresent === fileProg.numPieces
-      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+      progress = Math.floor(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
    }

    // Second, for media files where we saved our position, show how far we got
@@ -362,8 +368,10 @@ module.exports = class TorrentList extends React.Component {
        <td className={'col-size ' + rowClass}>
          {prettyBytes(file.length)}
        </td>
-        <td className='col-select'
-          onClick={dispatcher('toggleTorrentFile', infoHash, index)}>
+        <td
+          className='col-select'
+          onClick={dispatcher('toggleTorrentFile', infoHash, index)}
+        >
          <i className='icon deselect-file'>{isSelected ? 'close' : 'add'}</i>
        </td>
      </tr>
--- a/src/renderer/webtorrent.js
+++ b/src/renderer/webtorrent.js
@@ -3,7 +3,7 @@
 console.time('init')

 const crypto = require('crypto')
-const deepEqual = require('deep-equal')
+const util = require('util')
 const defaultAnnounceList = require('create-torrent').announceList
 const electron = require('electron')
 const fs = require('fs')
@@ -12,7 +12,6 @@ const mm = require('music-metadata')
 const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
-const zeroFill = require('zero-fill')

 const crashReporter = require('../crash-reporter')
 const config = require('../config')
@@ -41,10 +40,9 @@ const VERSION = require('../../package.json').version
 *   '0.16.1' -> '0016'
 *   '1.2.5' -> '0102'
 */
-const VERSION_STR = VERSION.match(/([0-9]+)/g)
-  .slice(0, 2)
-  .map((v) => zeroFill(2, v))
-  .join('')
+const VERSION_STR = VERSION
+  .replace(/\d*./g, v => `0${v % 100}`.slice(-2))
+  .slice(0, 4)

 /**
 * Version prefix string (used in peer ID). WebTorrent uses the Azureus-style
@@ -149,7 +147,7 @@ function addTorrentEvents (torrent) {
  torrent.on('error', (err) =>
    ipc.send('wt-error', torrent.key, err.message))
  torrent.on('infoHash', () =>
-    ipc.send('wt-infohash', torrent.key, torrent.infoHash))
+    ipc.send('wt-parsed', torrent.key, torrent.infoHash, torrent.magnetURI))
  torrent.on('metadata', torrentMetadata)
  torrent.on('ready', torrentReady)
  torrent.on('done', torrentDone)
@@ -251,7 +249,7 @@ function generateTorrentPoster (torrentKey) {
 function updateTorrentProgress () {
  const progress = getTorrentProgress()
  // TODO: diff torrent-by-torrent, not once for the whole update
-  if (prevProgress && deepEqual(progress, prevProgress, { strict: true })) {
+  if (prevProgress && util.isDeepStrictEqual(progress, prevProgress)) {
    return /* don't send heavy object if it hasn't changed */
  }
  ipc.send('wt-progress', progress)
@@ -345,24 +343,33 @@ function getAudioMetadata (infoHash, index) {
  const metadata = { title: file.name }
  ipc.send('wt-audio-metadata', infoHash, index, metadata)

-  const options = { native: false,
+  const options = {
+    native: false,
    skipCovers: true,
    fileSize: file.length,
    observer: event => {
      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
-    } }
-  const onMetaData = file.done
+    }
+  }
+  const onMetadata = file.done
    // If completed; use direct file access
    ? mm.parseFile(path.join(torrent.path, file.path), options)
    // otherwise stream
    : mm.parseStream(file.createReadStream(), file.name, options)

-  onMetaData
-    .then(() => {
-      console.log(`metadata for file='${file.name}' completed.`)
-    }).catch(function (err) {
-      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-    })
+  onMetadata
+    .then(
+      metadata => {
+        ipc.send('wt-audio-metadata', infoHash, index, metadata)
+        console.log(`metadata for file='${file.name}' completed.`)
+      },
+      err => {
+        console.log(
+          `error getting audio metadata for ${infoHash}:${index}`,
+          err
+        )
+      }
+    )
 }

 function selectFiles (torrentOrInfoHash, selections) {