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

2019-05-04 22:03:59 -07:00
parent 2aa2f0de19 c7ef42a65e
commit 2dc2953831
99 changed files with 12209 additions and 443 deletions
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -0,0 +1,19 @@
+# ProBot Request Info (https://probot.github.io/apps/request-info/)
+
+requestInfoReplyComment: >
+  👋 We would appreciate it if you could provide us with more information about this
+  issue. <br><br> ![](https://feross.net/s/cats/14.gif)
+requestInfoLabelToAdd: 'need more info'
+
+# ProBot Welcome (https://probot.github.io/apps/welcome/)
+
+newPRWelcomeComment: >
+  🙌 Thanks for opening this pull request! You're awesome.
+  <br><br> ![](https://feross.net/s/cats/6.gif)
+firstPRMergeComment: >
+  🎉 Congrats on getting your first pull request landed! <br><br>
+  ![](https://feross.net/s/cats/29.gif)
+
+# ProBot WIP (https://probot.github.io/apps/wip/)
+
+# (Requires no configuration)
--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -0,0 +1,4 @@
+# ProBot Lock (https://probot.github.io/apps/lock/)
+
+daysUntilLock: 90
+lockComment: false
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -0,0 +1,9 @@
+# ProBot No Response (https://probot.github.io/apps/no-response/)
+
+daysUntilClose: 7
+responseRequiredLabel: 'need more info'
+closeComment: >
+  This issue has been automatically closed because there was no response to a
+  request for more information from the issue opener. Please leave a comment or
+  open a new issue if you have additional information related to this issue.
+  <br><br> ![](https://feross.net/s/cats/7.gif)
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -0,0 +1,14 @@
+# ProBot Stale (https://probot.github.io/apps/stale/)
+
+daysUntilStale: 90
+daysUntilClose: 7
+exemptLabels:
+  - accepted
+  - bug
+  - enhancement
+  - meta
+staleLabel: stale
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs.
+closeComment: false
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-  - 'node'
-install: npm install standard depcheck walk-sync
+  - lts/*
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -37,5 +37,15 @@
 - Alexey Romanov (romanalexey@gmail.com)
 - Karan Thakkar (karanjthakkar@gmail.com)
 - Nuno Campos (nuno.campos@me.com)
+- Ebrahim Byagowi (ebrahim@gnu.org)
+- Josip Janzic (josip@jjanzic.com)
+- Emil Bay (github@tixz.dk)
+- Borewit (borewit@users.noreply.github.com)
+- greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
+- Auyer (rafa_auyer@icloud.com)
+- SimplyAhmazing (ahmad19526@gmail.com)
+- Cezar Carneiro (cezargcarneiro@gmail.com)
+- Terry Hau (terryhau@gmail.com)
+- Vítor Galvão (info@vitorgalvao.com)

 #### Generated by bin/update-authors.sh.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,41 @@
 # WebTorrent Desktop Version History

-## v0.18.0
+## v0.20.0 - 2018-04-26
+
+### Added
+
+- Added support for additional audio extensions: 'aiff', 'ape', 'mp2', 'oga', 'opus', 'wma' (#1240)
+
+### Changed
+
+- Displaying filename while music metadata is being downloaded (#1361)
+- Improved the poster selection for audio/music based torrents (#1334)
+- Launch VLC player without the `--video-on-top` flag (#1286)
+
+### Fixed
+
+- Fix silently failing to open magnets links on Linux (#1367)
+
+## v0.19.0 - 2018-01-26
+
+### Added
+- Added watch folder feature: Automatically add new torrent files added to a folder on disk (#1154)
+- Added highest playback priority feature: pauses other active torrents when playback starts (#840)
+- Add 'Start Speaking' and 'Stop Speaking' menu item (Mac) (#439)
+- Add pinch-to-zoom gesture to enter/exit fullscreen (#1148)
+
+### Changed
+- [SECURITY] Mitigate Electron protocol handler issue (Windows)
+- Moved project from Feross's GitHub account to the WebTorrent GitHub organization
+- Updated to electron@1.6.16
+- Updated to material-ui@0.17
+- Treat .FLAC as playable audio (#1127)
+
+### Fixed
+- Fix time and duration so it doesn't bounce in the UI (#1233)
+- Fix 'About WebTorrent' menu location on Windows (#1120)
+
+## v0.18.0 - 2017-02-03

 ### Added
 - Add a new "Transfers" menu for pausing or resuming all torrents (#1027)
@@ -67,7 +102,7 @@
 ## v0.16.0 - 2016-09-18

 ### Added
- **Windows 64-bit support!** ([#931](https://github.com/webtorrent/webtorrent-desktop/pull/931))
+- **Windows 64-bit support!** (#931)
  - Existing 32-bit users will update to 64-bit automatically in next release
  - 64-bit reduces likelihood of out-of-memory errors by increasing the address space

--- a/README.md
+++ b/README.md
@@ -13,20 +13,33 @@

 <p align="center">
  <a href="https://gitter.im/webtorrent/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="gitter"></a>
-  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release"></a>
  <a href="https://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></a>
+  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a>
+  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a>
  <a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>
 </p>

 ## Install

-Download the latest version of WebTorrent Desktop from
-[the official website](https://webtorrent.io/desktop/) or the
-[GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page.
+### Recommended Install

-**WebTorrent Desktop** is under very active development. You can try out the
-current (unstable) development version by cloning the Git repo. See the
-instructions below in the ["How to Contribute"](#how-to-contribute) section.
+Download the latest version of WebTorrent Desktop from
+[the official website](https://webtorrent.io/desktop/):
+
+### [✨ Download WebTorrent Desktop ✨](https://webtorrent.io/desktop/)
+
+### Advanced Install
+
+- Download specific installer files from the [GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page.
+
+- Use [Homebrew-Cask](https://github.com/caskroom/homebrew-cask) to install from the command line:
+
+  ```
+  $ brew cask install webtorrent
+  ```
+
+- Try the (unstable) development version by cloning the Git repository. See the
+  ["How to Contribute"](#how-to-contribute) instructions.

 ## Screenshots

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,42 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and general policies for the WebTorrent
+project.
+
+  * [Reporting a Bug](#reporting-a-bug)
+  * [Disclosure Policy](#disclosure-policy)
+  * [Comments on this Policy](#comments-on-this-policy)
+
+## Reporting a Bug
+
+The WebTorrent team and community take all security bugs in WebTorrent seriously.
+Thank you for improving the security of WebTorrent. We appreciate your efforts and
+responsible disclosure and will make every effort to acknowledge your
+contributions.
+
+Report security bugs by emailing the lead maintainer at feross@feross.org.
+
+The lead maintainer will acknowledge your email within 48 hours, and will send a
+more detailed response within 48 hours indicating the next steps in handling
+your report. After the initial reply to your report, the security team will
+endeavor to keep you informed of the progress towards a fix and full
+announcement, and may ask for additional information or guidance.
+
+Report security bugs in third-party modules to the person or team maintaining
+the module.
+
+## Disclosure Policy
+
+When the security team receives a security bug report, they will assign it to a
+primary handler. This person will coordinate the fix and release process,
+involving the following steps:
+
+  * Confirm the problem and determine the affected versions.
+  * Audit code to find any potential similar problems.
+  * Prepare fixes for all releases still under maintenance. These fixes will be
+    released as fast as possible to npm.
+
+## Comments on this Policy
+
+If you have suggestions on how this process could be improved please submit a
+pull request.
--- a/bin/extra-lint.js
+++ b/bin/extra-lint.js
@@ -7,7 +7,7 @@ const path = require('path')
 let hasErrors = false

 // Find all Javascript source files
-const files = walkSync('src', {globs: ['**/*.js']})
+const files = walkSync('src', { globs: ['**/*.js'] })
 console.log('Running extra-lint on ' + files.length + ' files...')

 // Read each file, line by line
@@ -35,7 +35,7 @@ files.forEach(function (file) {
    }

    if (error) {
-      let name = path.basename(file)
+      const name = path.basename(file)
      console.log('%s:%d - %s:\n%s', name, i + 1, error, line)
      hasErrors = true
    }
--- a/bin/open-config.js
+++ b/bin/open-config.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node

-const config = require('../src/config')
-const open = require('open')
+const { CONFIG_PATH } = require('../src/config')
+const opn = require('opn')

-open(config.CONFIG_PATH)
+opn(CONFIG_PATH)
--- a/bin/package.js
+++ b/bin/package.js
@@ -449,51 +449,51 @@ function buildWin32 (cb) {
        usePackageJson: false,
        version: pkg.version
      })
-      .then(function () {
-        console.log(`Windows: Created ${destArch} installer.`)
+        .then(function () {
+          console.log(`Windows: Created ${destArch} installer.`)

-        /**
+          /**
         * Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
         * versions of the app)
         */
-        fs.readdirSync(DIST_PATH)
-          .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
-          .forEach((filename) => {
-            fs.unlinkSync(path.join(DIST_PATH, filename))
-          })
+          fs.readdirSync(DIST_PATH)
+            .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
+            .forEach((filename) => {
+              fs.unlinkSync(path.join(DIST_PATH, filename))
+            })

-        if (destArch === 'ia32') {
-          console.log('Windows: Renaming ia32 installer files...')
+          if (destArch === 'ia32') {
+            console.log('Windows: Renaming ia32 installer files...')

-          // RELEASES -> RELEASES-ia32
-          const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
-          fs.renameSync(
-            path.join(DIST_PATH, 'RELEASES'),
-            relPath
-          )
+            // RELEASES -> RELEASES-ia32
+            const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
+            fs.renameSync(
+              path.join(DIST_PATH, 'RELEASES'),
+              relPath
+            )

-          // WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
-          fs.renameSync(
-            path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
-            path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
-          )
+            // WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
+            fs.renameSync(
+              path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
+              path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
+            )

-          // Change file name inside RELEASES-ia32 to match renamed file
-          const relContent = fs.readFileSync(relPath, 'utf8')
-          const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
-          fs.writeFileSync(relPath, relContent32)
+            // Change file name inside RELEASES-ia32 to match renamed file
+            const relContent = fs.readFileSync(relPath, 'utf8')
+            const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
+            fs.writeFileSync(relPath, relContent32)

-          if (relContent === relContent32) {
+            if (relContent === relContent32) {
            // Sanity check
-            throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
+              throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
+            }
+
+            console.log('Windows: Renamed ia32 installer files.')
          }

-          console.log('Windows: Renamed ia32 installer files.')
-        }
-
-        cb(null)
-      })
-      .catch(cb)
+          cb(null)
+        })
+        .catch(cb)
    }

    function packagePortable (filesPath, destArch, cb) {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "webtorrent-desktop",
  "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.18.0",
+  "version": "0.20.0",
  "author": {
    "name": "WebTorrent, LLC",
    "email": "feross@webtorrent.io",
@@ -14,36 +14,37 @@
    "airplayer": "^2.0.0",
    "application-config": "^1.0.0",
    "arch": "^2.0.0",
-    "auto-launch": "^4.0.1",
+    "auto-launch": "^5.0.5",
    "bitfield": "^1.0.2",
-    "capture-frame": "^1.0.0",
-    "chromecasts": "^1.8.0",
-    "cp-file": "^4.0.1",
-    "create-torrent": "^3.24.5",
+    "capture-frame": "^2.0.0",
+    "chokidar": "^2.0.4",
+    "chromecasts": "^1.9.1",
+    "cp-file": "^7.0.0",
+    "create-torrent": "^3.33.0",
    "debounce": "^1.0.0",
    "deep-equal": "^1.0.1",
    "dlnacasts": "^0.1.0",
-    "drag-drop": "^2.12.1",
+    "drag-drop": "^4.1.0",
    "es6-error": "^4.0.0",
    "fn-getter": "^1.0.0",
-    "iso-639-1": "^1.2.1",
-    "languagedetect": "^1.1.1",
+    "iso-639-1": "^2.0.5",
+    "languagedetect": "^1.2.0",
    "location-history": "^1.0.0",
-    "material-ui": "^0.17.0",
+    "material-ui": "^0.20.2",
    "mkdirp": "^0.5.1",
-    "musicmetadata": "^2.0.2",
+    "music-metadata": "^3.6.1",
    "natsort": "^1.0.6",
    "network-address": "^1.1.0",
-    "parse-torrent": "^5.7.3",
+    "parse-torrent": "^6.0.1",
    "prettier-bytes": "^1.0.1",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-tap-event-plugin": "^2.0.1",
+    "prop-types": "^15.6.2",
+    "react": "^16.5.2",
+    "react-dom": "^16.5.2",
    "rimraf": "^2.5.2",
    "run-parallel": "^1.1.6",
-    "semver": "^5.1.0",
+    "semver": "^6.0.0",
    "simple-concat": "^1.0.0",
-    "simple-get": "^2.0.0",
+    "simple-get": "^3.0.3",
    "srt-to-vtt": "^1.1.1",
    "vlc-command": "^1.0.1",
    "webtorrent": "0.x",
@@ -51,25 +52,26 @@
    "zero-fill": "^2.2.3"
  },
  "devDependencies": {
-    "buble": "^0.15.2",
+    "babel-eslint": "^9.0.0",
+    "buble": "^0.19.6",
    "cross-zip": "^2.0.1",
-    "depcheck": "^0.6.4",
-    "electron": "1.6.0",
-    "electron-osx-sign": "0.4.3",
+    "depcheck": "^0.7.2",
+    "electron": "^1.8.8",
+    "electron-osx-sign": "^0.4.11",
    "electron-packager": "~8.5.1",
-    "electron-winstaller": "~2.5.2",
-    "gh-release": "^2.0.3",
+    "electron-winstaller": "^2.6.4",
+    "gh-release": "^3.4.0",
    "minimist": "^1.2.0",
    "nobin-debian-installer": "0.0.10",
-    "nodemon": "^1.10.2",
-    "open": "0.0.5",
-    "plist": "^2.0.1",
+    "nodemon": "^1.18.8",
+    "opn": "^6.0.0",
+    "plist": "^3.0.1",
    "pngjs": "^3.0.0",
    "run-series": "^1.1.4",
    "spectron": "^3.3.0",
    "standard": "*",
-    "tape": "^4.6.0",
-    "walk-sync": "^0.3.1"
+    "tape": "^4.9.1",
+    "walk-sync": "^1.1.3"
  },
  "engines": {
    "node": ">=4.0.0"
@@ -104,9 +106,12 @@
    "package": "node ./bin/package.js",
    "prepublish": "npm run build",
    "start": "npm run build && electron .",
-    "test": "standard && depcheck --ignores=buble,nodemon,gh-release --ignore-dirs=build,dist && node ./bin/extra-lint.js",
+    "test": "standard && depcheck --ignores=standard,babel-eslint --ignore-dirs=build,dist && node ./bin/extra-lint.js",
    "test-integration": "npm run build && node ./test",
    "update-authors": "./bin/update-authors.sh",
    "watch": "nodemon --exec \"npm run start\" --ext js,css --ignore build/ --ignore dist/"
+  },
+  "standard": {
+    "parser": "babel-eslint"
  }
 }
--- a/src/config.js
+++ b/src/config.js
@@ -23,13 +23,13 @@ module.exports = {
  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
  TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',

-  APP_COPYRIGHT: 'Copyright © 2014-2017 ' + APP_TEAM,
+  APP_COPYRIGHT: 'Copyright © 2014-2019 ' + APP_TEAM,
  APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
  APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
  APP_NAME: APP_NAME,
  APP_TEAM: APP_TEAM,
  APP_VERSION: APP_VERSION,
-  APP_WINDOW_TITLE: APP_NAME + ' (BETA)',
+  APP_WINDOW_TITLE: APP_NAME,

  CONFIG_PATH: getConfigPath(),

--- a/src/main/announcement.js
+++ b/src/main/announcement.js
@@ -7,9 +7,8 @@ const electron = require('electron')
 const config = require('../config')
 const log = require('./log')

-const ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
-  '?version=' + config.APP_VERSION +
-  '&platform=' + process.platform
+const ANNOUNCEMENT_URL =
+  `${config.ANNOUNCEMENT_URL}?version=${config.APP_VERSION}&platform=${process.platform}`

 /**
 * In certain situations, the WebTorrent team may need to show an announcement to
--- a/src/main/dock.js
+++ b/src/main/dock.js
@@ -4,7 +4,7 @@ module.exports = {
  setBadge
 }

-const {app, Menu} = require('electron')
+const { app, Menu } = require('electron')

 const dialog = require('./dialog')
 const log = require('./log')
--- a/src/main/external-player.js
+++ b/src/main/external-player.js
@@ -25,11 +25,10 @@ function spawn (playerPath, url, title) {
  if (playerPath != null) return spawnExternal(playerPath, [url])

  // Try to find and use VLC if external player is not specified
-  vlcCommand(function (err, vlcPath) {
+  vlcCommand((err, vlcPath) => {
    if (err) return windows.main.dispatch('externalPlayerNotFound')
    const args = [
      '--play-and-exit',
-      '--video-on-top',
      '--quiet',
      `--meta-title=${JSON.stringify(title)}`,
      url
@@ -40,26 +39,26 @@ function spawn (playerPath, url, title) {

 function kill () {
  if (!proc) return
-  log('Killing external player, pid ' + proc.pid)
+  log(`Killing external player, pid ${proc.pid}`)
  proc.kill('SIGKILL') // kill -9
  proc = null
 }

 function spawnExternal (playerPath, args) {
-  log('Running external media player:', playerPath + ' ' + args.join(' '))
+  log('Running external media player:', `${playerPath} ${args.join(' ')}`)

  if (process.platform === 'darwin' && path.extname(playerPath) === '.app') {
    // Mac: Use executable in packaged .app bundle
-    playerPath += '/Contents/MacOS/' + path.basename(playerPath, '.app')
+    playerPath += `/Contents/MacOS/${path.basename(playerPath, '.app')}`
  }

-  proc = cp.spawn(playerPath, args, {stdio: 'ignore'})
+  proc = cp.spawn(playerPath, args, { stdio: 'ignore' })

  // If it works, close the modal after a second
  const closeModalTimeout = setTimeout(() =>
    windows.main.dispatch('exitModal'), 1000)

-  proc.on('close', function (code) {
+  proc.on('close', code => {
    clearTimeout(closeModalTimeout)
    if (!proc) return // Killed
    log('External player exited with code ', code)
@@ -71,7 +70,7 @@ function spawnExternal (playerPath, args) {
    proc = null
  })

-  proc.on('error', function (e) {
-    log('External player error', e)
+  proc.on('error', err => {
+    log('External player error', err)
  })
 }
--- a/src/main/folder-watcher.js
+++ b/src/main/folder-watcher.js
@@ -0,0 +1,50 @@
+const chokidar = require('chokidar')
+const log = require('./log')
+
+class FolderWatcher {
+  constructor ({ window, state }) {
+    this.window = window
+    this.state = state
+    this.torrentsFolderPath = null
+    this.watching = false
+  }
+
+  isEnabled () {
+    return this.state.saved.prefs.autoAddTorrents
+  }
+
+  start () {
+    // Stop watching previous folder before
+    // start watching a new one.
+    if (this.watching) this.stop()
+
+    const torrentsFolderPath = this.state.saved.prefs.torrentsFolderPath
+    this.torrentsFolderPath = torrentsFolderPath
+    if (!torrentsFolderPath) return
+
+    const glob = `${torrentsFolderPath}/**/*.torrent`
+    log('Folder Watcher: watching: ', glob)
+
+    const options = {
+      ignoreInitial: true,
+      awaitWriteFinish: true
+    }
+    this.watcher = chokidar.watch(glob, options)
+    this.watcher
+      .on('add', (path) => {
+        log('Folder Watcher: added torrent: ', path)
+        this.window.dispatch('addTorrent', path)
+      })
+
+    this.watching = true
+  }
+
+  stop () {
+    log('Folder Watcher: stop.')
+    if (!this.watching) return
+    this.watcher.close()
+    this.watching = false
+  }
+}
+
+module.exports = FolderWatcher
--- a/src/main/handlers.js
+++ b/src/main/handlers.js
@@ -7,26 +7,24 @@ const config = require('../config')
 const path = require('path')

 function install () {
-  if (process.platform === 'darwin') {
-    installDarwin()
-  }
-  if (process.platform === 'win32') {
-    installWin32()
-  }
-  if (process.platform === 'linux') {
-    installLinux()
+  switch (process.platform) {
+    case 'darwin': installDarwin()
+      break
+    case 'win32': installWin32()
+      break
+    case 'linux': installLinux()
+      break
  }
 }

 function uninstall () {
-  if (process.platform === 'darwin') {
-    uninstallDarwin()
-  }
-  if (process.platform === 'win32') {
-    uninstallWin32()
-  }
-  if (process.platform === 'linux') {
-    uninstallLinux()
+  switch (process.platform) {
+    case 'darwin': uninstallDarwin()
+      break
+    case 'win32': uninstallWin32()
+      break
+    case 'linux': uninstallLinux()
+      break
  }
 }

@@ -44,7 +42,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)
@@ -108,37 +106,37 @@ function installWin32 () {
    setProtocol()

    function setProtocol (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
      protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
    }

    function setURLProtocol (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
      protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
    }

    function setIcon (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const iconKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
+        key: `\\Software\\Classes\\${protocol}\\DefaultIcon`
      })
      iconKey.set('', Registry.REG_SZ, icon, setCommand)
    }

    function setCommand (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const commandKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+        key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
      })
      commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
    }

    function done (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
    }
  }

@@ -163,43 +161,43 @@ function installWin32 () {
    function setExt () {
      const extKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + ext
+        key: `\\Software\\Classes\\${ext}`
      })
      extKey.set('', Registry.REG_SZ, id, setId)
    }

    function setId (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const idKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + id
+        key: `\\Software\\Classes\\${id}`
      })
      idKey.set('', Registry.REG_SZ, name, setIcon)
    }

    function setIcon (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const iconKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
+        key: `\\Software\\Classes\\${id}\\DefaultIcon`
      })
      iconKey.set('', Registry.REG_SZ, icon, setCommand)
    }

    function setCommand (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const commandKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
+        key: `\\Software\\Classes\\${id}\\shell\\open\\command`
      })
      commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
    }

    function done (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
    }
  }
 }
@@ -217,9 +215,9 @@ function uninstallWin32 () {
    function getCommand () {
      const commandKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+        key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
      })
-      commandKey.get('', function (err, item) {
+      commandKey.get('', (err, item) => {
        if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
          destroyProtocol()
        }
@@ -229,9 +227,9 @@ function uninstallWin32 () {
    function destroyProtocol () {
      const protocolKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + protocol
+        key: `\\Software\\Classes\\${protocol}`
      })
-      protocolKey.destroy(function () {})
+      protocolKey.destroy(() => {})
    }
  }

@@ -241,7 +239,7 @@ function uninstallWin32 () {
    function eraseId () {
      const idKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + id
+        key: `\\Software\\Classes\\${id}`
      })
      idKey.destroy(getExt)
    }
@@ -249,9 +247,9 @@ function uninstallWin32 () {
    function getExt () {
      const extKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + ext
+        key: `\\Software\\Classes\\${ext}`
      })
-      extKey.get('', function (err, item) {
+      extKey.get('', (err, item) => {
        if (!err && item.value === id) {
          destroyExt()
        }
@@ -261,9 +259,9 @@ function uninstallWin32 () {
    function destroyExt () {
      const extKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + ext
+        key: `\\Software\\Classes\\${ext}`
      })
-      extKey.destroy(function () {})
+      extKey.destroy(() => {})
    }
  }
 }
@@ -300,10 +298,11 @@ function installLinux () {
      ? path.dirname(process.execPath)
      : config.ROOT_PATH

-    desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
-    desktopFile = desktopFile.replace(/\$APP_PATH/g, appPath)
-    desktopFile = desktopFile.replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
-    desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, process.execPath)
+    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(),
@@ -313,7 +312,7 @@ function installLinux () {
      'webtorrent-desktop.desktop'
    )
    fs.mkdirp(path.dirname(desktopFilePath))
-    fs.writeFile(desktopFilePath, desktopFile, function (err) {
+    fs.writeFile(desktopFilePath, desktopFile, err => {
      if (err) return log.error(err.message)
    })
  }
@@ -335,9 +334,9 @@ function installLinux () {
      'icons',
      'webtorrent-desktop.png'
    )
-    mkdirp(path.dirname(iconFilePath), (err) => {
+    mkdirp(path.dirname(iconFilePath), err => {
      if (err) return log.error(err.message)
-      fs.writeFile(iconFilePath, iconFile, (err) => {
+      fs.writeFile(iconFilePath, iconFile, err => {
        if (err) log.error(err.message)
      })
    })
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -72,18 +72,21 @@ function init () {
    if (err) throw err

    isReady = true
+    const state = results.state

-    windows.main.init(results.state, {hidden: hidden})
+    windows.main.init(state, { hidden: hidden })
    windows.webtorrent.init()
    menu.init()

    // To keep app startup fast, some code is delayed.
-    setTimeout(delayedInit, config.DELAYED_INIT)
+    setTimeout(() => {
+      delayedInit(state)
+    }, config.DELAYED_INIT)

    // Report uncaught exceptions
    process.on('uncaughtException', (err) => {
      console.error(err)
-      const error = {message: err.message, stack: err.stack}
+      const error = { message: err.message, stack: err.stack }
      windows.main.dispatch('uncaughtError', 'main', error)
    })
  }
@@ -121,17 +124,24 @@ function init () {
  })
 }

-function delayedInit () {
+function delayedInit (state) {
  if (app.isQuitting) return

  const announcement = require('./announcement')
  const dock = require('./dock')
  const updater = require('./updater')
+  const FolderWatcher = require('./folder-watcher')
+  const folderWatcher = new FolderWatcher({ window: windows.main, state })

  announcement.init()
  dock.init()
  updater.init()

+  ipc.setModule('folderWatcher', folderWatcher)
+  if (folderWatcher.isEnabled()) {
+    folderWatcher.start()
+  }
+
  if (process.platform === 'win32') {
    const userTasks = require('./user-tasks')
    userTasks.init()
@@ -178,11 +188,11 @@ function onAppOpen (newArgv) {
 function sliceArgv (argv) {
  return argv.slice(config.IS_PRODUCTION ? 1
    : config.IS_TEST ? 4
-    : 2)
+      : 2)
 }

 function processArgv (argv) {
-  let torrentIds = []
+  const torrentIds = []
  argv.forEach(function (arg) {
    if (arg === '-n' || arg === '-o' || arg === '-u') {
      // Critical path: Only load the 'dialog' package if it is needed
--- a/src/main/ipc.js
+++ b/src/main/ipc.js
@@ -1,5 +1,6 @@
 module.exports = {
-  init
+  init,
+  setModule
 }

 const electron = require('electron')
@@ -13,6 +14,14 @@ const windows = require('./windows')
 // Messages from the main process, to be sent once the WebTorrent process starts
 const messageQueueMainToWebTorrent = []

+// Will hold modules injected from the app that will be used on fired
+// IPC events.
+const modules = {}
+
+function setModule (name, module) {
+  modules[name] = module
+}
+
 function init () {
  const ipc = electron.ipcMain

@@ -58,7 +67,7 @@ function init () {
  })

  /**
-   * Events
+   * Player Events
   */

  ipc.on('onPlayerOpen', function () {
@@ -106,6 +115,28 @@ function init () {
    thumbar.onPlayerPause()
  })

+  /**
+   * Folder Watcher Events
+   */
+
+  ipc.on('startFolderWatcher', function () {
+    if (!modules['folderWatcher']) {
+      log('IPC ERR: folderWatcher module is not defined.')
+      return
+    }
+
+    modules['folderWatcher'].start()
+  })
+
+  ipc.on('stopFolderWatcher', function () {
+    if (!modules['folderWatcher']) {
+      log('IPC ERR: folderWatcher module is not defined.')
+      return
+    }
+
+    modules['folderWatcher'].stop()
+  })
+
  /**
   * Shell
   */
--- a/src/main/startup.js
+++ b/src/main/startup.js
@@ -3,19 +3,11 @@ module.exports = {
  uninstall
 }

-const config = require('../config')
+const { APP_NAME } = require('../config')
 const AutoLaunch = require('auto-launch')
-const { app } = require('electron')
-
-// On Mac, work around a bug in auto-launch where it opens a Terminal window
-// See https://github.com/Teamwork/node-auto-launch/issues/28#issuecomment-222194437
-const appPath = process.platform === 'darwin'
-  ? app.getPath('exe').replace(/\.app\/Content.*/, '.app')
-  : undefined // Use the default

 const appLauncher = new AutoLaunch({
-  name: config.APP_NAME,
-  path: appPath,
+  name: APP_NAME,
  isHidden: true
 })

--- a/src/main/windows/main.js
+++ b/src/main/windows/main.js
@@ -57,7 +57,7 @@ function init (state, options) {
    win.setSheetOffset(config.UI_HEADER_HEIGHT)
  }

-  win.webContents.on('dom-ready', function () {
+  win.webContents.on('dom-ready', () => {
    menu.onToggleFullScreen(main.win.isFullScreen())
  })

@@ -73,27 +73,27 @@ function init (state, options) {
  win.on('hide', onWindowBlur)
  win.on('show', onWindowFocus)

-  win.on('enter-full-screen', function () {
+  win.on('enter-full-screen', () => {
    menu.onToggleFullScreen(true)
    send('fullscreenChanged', true)
    win.setMenuBarVisibility(false)
  })

-  win.on('leave-full-screen', function () {
+  win.on('leave-full-screen', () => {
    menu.onToggleFullScreen(false)
    send('fullscreenChanged', false)
    win.setMenuBarVisibility(true)
  })

-  win.on('move', debounce(function (e) {
+  win.on('move', debounce(e => {
    send('windowBoundsChanged', e.sender.getBounds())
  }, 1000))

-  win.on('resize', debounce(function (e) {
+  win.on('resize', debounce(e => {
    send('windowBoundsChanged', e.sender.getBounds())
  }, 1000))

-  win.on('close', function (e) {
+  win.on('close', e => {
    if (process.platform !== 'darwin') {
      const tray = require('../tray')
      if (!tray.hasTray()) {
@@ -138,37 +138,29 @@ 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 we're in full screen`)
    return
  }

  // Maximize or minimize, if the second argument is present
-  let willBeMaximized
-  if (maximize === true) {
-    if (!main.win.isMaximized()) {
-      log('setBounds: maximizing')
-      main.win.maximize()
-    }
-    willBeMaximized = true
-  } else if (maximize === false) {
-    if (main.win.isMaximized()) {
-      log('setBounds: unmaximizing')
-      main.win.unmaximize()
-    }
-    willBeMaximized = false
-  } else {
-    willBeMaximized = main.win.isMaximized()
+  if (maximize === true && !main.win.isMaximized()) {
+    log('setBounds: maximizing')
+    main.win.maximize()
+  } else if (maximize === false && main.win.isMaximized()) {
+    log('setBounds: unmaximizing')
+    main.win.unmaximize()
  }

+  const willBeMaximized = typeof maximize === 'boolean' ? maximize : main.win.isMaximized()
  // Assuming we're not maximized or maximizing, set the window size
  if (!willBeMaximized) {
-    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
+    log(`setBounds: setting bounds to ${JSON.stringify(bounds)}`)
    if (bounds.x === null && bounds.y === null) {
      // X and Y not specified? By default, center on current screen
      const scr = electron.screen.getDisplayMatching(main.win.getBounds())
      bounds.x = Math.round(scr.bounds.x + (scr.bounds.width / 2) - (bounds.width / 2))
      bounds.y = Math.round(scr.bounds.y + (scr.bounds.height / 2) - (bounds.height / 2))
-      log('setBounds: centered to ' + JSON.stringify(bounds))
+      log(`setBounds: centered to ${JSON.stringify(bounds)}`)
    }
    // Resize the window's content area (so window border doesn't need to be taken
    // into account)
--- a/src/renderer/components/create-torrent-error-page.js
+++ b/src/renderer/components/create-torrent-error-page.js
@@ -1,6 +1,6 @@
 const React = require('react')

-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 module.exports = class CreateTorrentErrorPage extends React.Component {
  render () {
--- a/src/renderer/components/header.js
+++ b/src/renderer/components/header.js
@@ -1,6 +1,6 @@
 const React = require('react')

-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 class Header extends React.Component {
  render () {
--- a/src/renderer/components/heading.js
+++ b/src/renderer/components/heading.js
@@ -1,11 +1,12 @@
 const React = require('react')
+const PropTypes = require('prop-types')

 const colors = require('material-ui/styles/colors')

 class Heading extends React.Component {
  static get propTypes () {
    return {
-      level: React.PropTypes.number
+      level: PropTypes.number
    }
  }

--- a/src/renderer/components/modal-ok-cancel.js
+++ b/src/renderer/components/modal-ok-cancel.js
@@ -5,7 +5,7 @@ const RaisedButton = require('material-ui/RaisedButton').default
 module.exports = class ModalOKCancel extends React.Component {
  render () {
    const cancelStyle = { marginRight: 10, color: 'black' }
-    const {cancelText, onCancel, okText, onOK} = this.props
+    const { cancelText, onCancel, okText, onOK } = this.props
    return (
      <div className='float-right'>
        <FlatButton
--- a/src/renderer/components/open-torrent-address-modal.js
+++ b/src/renderer/components/open-torrent-address-modal.js
@@ -2,7 +2,7 @@ const React = require('react')
 const TextField = require('material-ui/TextField').default

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

 module.exports = class OpenTorrentAddressModal extends React.Component {
  render () {
--- a/src/renderer/components/path-selector.js
+++ b/src/renderer/components/path-selector.js
@@ -1,6 +1,7 @@
 const colors = require('material-ui/styles/colors')
 const electron = require('electron')
 const React = require('react')
+const PropTypes = require('prop-types')

 const remote = electron.remote

@@ -11,15 +12,15 @@ const TextField = require('material-ui/TextField').default
 // Uses the system Open File dialog.
 // You can't edit the text field directly.
 class PathSelector extends React.Component {
-  static get propTypes () {
+  static propTypes () {
    return {
-      className: React.PropTypes.string,
-      dialog: React.PropTypes.object,
-      displayValue: React.PropTypes.string,
-      id: React.PropTypes.string,
-      onChange: React.PropTypes.func,
-      title: React.PropTypes.string.isRequired,
-      value: React.PropTypes.string
+      className: PropTypes.string,
+      dialog: PropTypes.object,
+      displayValue: PropTypes.string,
+      id: PropTypes.string,
+      onChange: PropTypes.func,
+      title: PropTypes.string.isRequired,
+      value: PropTypes.string
    }
  }

@@ -64,7 +65,8 @@ class PathSelector extends React.Component {
    const textFieldStyle = {
      flex: '1'
    }
-    const text = this.props.displayValue || this.props.value
+
+    const text = this.props.displayValue || this.props.value || ''
    const buttonStyle = {
      marginLeft: 10
    }
--- a/src/renderer/components/remove-torrent-modal.js
+++ b/src/renderer/components/remove-torrent-modal.js
@@ -1,7 +1,7 @@
 const React = require('react')

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

 module.exports = class RemoveTorrentModal extends React.Component {
  render () {
--- a/src/renderer/components/show-more.js
+++ b/src/renderer/components/show-more.js
@@ -1,13 +1,14 @@
 const React = require('react')
+const PropTypes = require('prop-types')

 const RaisedButton = require('material-ui/RaisedButton').default

 class ShowMore extends React.Component {
  static get propTypes () {
    return {
-      defaultExpanded: React.PropTypes.bool,
-      hideLabel: React.PropTypes.string,
-      showLabel: React.PropTypes.string
+      defaultExpanded: PropTypes.bool,
+      hideLabel: PropTypes.string,
+      showLabel: PropTypes.string
    }
  }

--- a/src/renderer/components/unsupported-media-modal.js
+++ b/src/renderer/components/unsupported-media-modal.js
@@ -2,7 +2,7 @@ const React = require('react')
 const electron = require('electron')

 const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 module.exports = class UnsupportedMediaModal extends React.Component {
  render () {
--- a/src/renderer/components/update-available-modal.js
+++ b/src/renderer/components/update-available-modal.js
@@ -2,7 +2,7 @@ const React = require('react')
 const electron = require('electron')

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

 module.exports = class UpdateAvailableModal extends React.Component {
  render () {
--- a/src/renderer/controllers/folder-watcher-controller.js
+++ b/src/renderer/controllers/folder-watcher-controller.js
@@ -0,0 +1,13 @@
+const { ipcRenderer } = require('electron')
+
+module.exports = class FolderWatcherController {
+  start () {
+    console.log('-- IPC: start folder watcher')
+    ipcRenderer.send('startFolderWatcher')
+  }
+
+  stop () {
+    console.log('-- IPC: stop folder watcher')
+    ipcRenderer.send('stopFolderWatcher')
+  }
+}
--- a/src/renderer/controllers/media-controller.js
+++ b/src/renderer/controllers/media-controller.js
@@ -1,4 +1,4 @@
-const {ipcRenderer} = require('electron')
+const { ipcRenderer } = require('electron')
 const telemetry = require('../lib/telemetry')
 const Playlist = require('../lib/playlist')

--- a/src/renderer/controllers/playback-controller.js
+++ b/src/renderer/controllers/playback-controller.js
@@ -2,9 +2,9 @@ const electron = require('electron')
 const path = require('path')

 const Cast = require('../lib/cast')
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')
 const telemetry = require('../lib/telemetry')
-const {UnplayableFileError, UnplayableTorrentError} = require('../lib/errors')
+const { UnplayableFileError, UnplayableTorrentError } = require('../lib/errors')
 const sound = require('../lib/sound')
 const TorrentPlayer = require('../lib/torrent-player')
 const TorrentSummary = require('../lib/torrent-summary')
@@ -102,10 +102,10 @@ module.exports = class PlaybackController {
    const state = this.state
    if (Playlist.hasNext(state) && state.playing.location !== 'external') {
      this.updatePlayer(
-          state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
-            if (err) dispatch('error', err)
-            else this.play()
-          })
+        state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
+          if (err) dispatch('error', err)
+          else this.play()
+        })
    }
  }

@@ -271,7 +271,7 @@ module.exports = class PlaybackController {
    state.playing.fileIndex = index
    state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
-      : 'other'
+        : 'other'

    // pick up where we left off
    let jumpToTime = 0
@@ -292,7 +292,7 @@ module.exports = class PlaybackController {
    }

    function getAudioMetadata () {
-      if (state.playing.type === 'audio' && !fileSummary.audioInfo) {
+      if (state.playing.type === 'audio') {
        ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index)
      }
    }
--- a/src/renderer/controllers/prefs-controller.js
+++ b/src/renderer/controllers/prefs-controller.js
@@ -1,4 +1,4 @@
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')
 const ipcRenderer = require('electron').ipcRenderer

 // Controls the Preferences screen
@@ -16,45 +16,22 @@ module.exports = class PrefsController {
      setup: function (cb) {
        // initialize preferences
        state.window.title = 'Preferences'
-        state.unsaved = Object.assign(state.unsaved || {}, {
-          prefs: Object.assign({}, state.saved.prefs)
-        })
        ipcRenderer.send('setAllowNav', false)
        cb()
      },
      destroy: () => {
        ipcRenderer.send('setAllowNav', true)
-        this.save()
      }
    })
  }

-  // Updates a single property in the UNSAVED prefs
-  // For example: updatePreferences('foo.bar', 'baz')
-  // Call save() to save to config.json
+  // Updates a single property in the saved prefs
+  // For example: updatePreferences('isFileHandler', true)
  update (property, value) {
-    const path = property.split('.')
-    let obj = this.state.unsaved.prefs
-    let i
-    for (i = 0; i < path.length - 1; i++) {
-      if (typeof obj[path[i]] === 'undefined') {
-        obj[path[i]] = {}
-      }
-      obj = obj[path[i]]
-    }
-    obj[path[i]] = value
-  }
+    if (property === 'isFileHandler') ipcRenderer.send('setDefaultFileHandler', value)
+    else if (property === 'startup') ipcRenderer.send('setStartup', value)

-  // All unsaved prefs take effect atomically, and are saved to config.json
-  save () {
-    const state = this.state
-    if (state.unsaved.prefs.isFileHandler !== state.saved.prefs.isFileHandler) {
-      ipcRenderer.send('setDefaultFileHandler', state.unsaved.prefs.isFileHandler)
-    }
-    if (state.unsaved.prefs.startup !== state.saved.prefs.startup) {
-      ipcRenderer.send('setStartup', state.unsaved.prefs.startup)
-    }
-    state.saved.prefs = Object.assign(state.saved.prefs || {}, state.unsaved.prefs)
+    this.state.saved.prefs[property] = value
    dispatch('stateSaveImmediate')
    dispatch('checkDownloadPath')
  }
--- a/src/renderer/controllers/subtitles-controller.js
+++ b/src/renderer/controllers/subtitles-controller.js
@@ -5,7 +5,7 @@ const parallel = require('run-parallel')

 const remote = electron.remote

-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')

 module.exports = class SubtitlesController {
  constructor (state) {
--- a/src/renderer/controllers/torrent-controller.js
+++ b/src/renderer/controllers/torrent-controller.js
@@ -3,7 +3,7 @@ const ipcRenderer = require('electron').ipcRenderer

 const TorrentSummary = require('../lib/torrent-summary')
 const sound = require('../lib/sound')
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')

 module.exports = class TorrentController {
  constructor (state) {
--- a/src/renderer/controllers/torrent-list-controller.js
+++ b/src/renderer/controllers/torrent-list-controller.js
@@ -2,8 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const electron = require('electron')

-const {dispatch} = require('../lib/dispatcher')
-const {TorrentKeyNotFoundError} = require('../lib/errors')
+const { dispatch } = require('../lib/dispatcher')
+const { TorrentKeyNotFoundError } = require('../lib/errors')
 const sound = require('../lib/sound')
 const TorrentSummary = require('../lib/torrent-summary')

@@ -157,23 +157,24 @@ module.exports = class TorrentListController {

  prioritizeTorrent (infoHash) {
    this.state.saved.torrents
-    .filter((torrent) => { // We're interested in active torrents only.
-      return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
-    })
-    .map((torrent) => { // Pause all active torrents except the one that started playing.
-      if (infoHash === torrent.infoHash) return
+      .filter((torrent) => { // We're interested in active torrents only.
+        return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
+      })
+      .map((torrent) => { // Pause all active torrents except the one that started playing.
+        if (infoHash === torrent.infoHash) return

-      // Pause torrent without playing sounds.
-      this.pauseTorrent(torrent, false)
+        // Pause torrent without playing sounds.
+        this.pauseTorrent(torrent, false)

-      this.state.saved.torrentsToResume.push(torrent.infoHash)
-    })
+        this.state.saved.torrentsToResume.push(torrent.infoHash)
+      })

    console.log('Playback Priority: paused torrents: ', this.state.saved.torrentsToResume)
  }

  resumePausedTorrents () {
    console.log('Playback Priority: resuming paused torrents')
+    if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
    this.state.saved.torrentsToResume.map((infoHash) => {
      this.toggleTorrent(infoHash)
    })
@@ -317,7 +318,7 @@ module.exports = class TorrentListController {
 function findFilesRecursive (paths, cb_) {
  if (paths.length > 1) {
    let numComplete = 0
-    let ret = []
+    const ret = []
    paths.forEach(function (path) {
      findFilesRecursive([path], function (fileObjs) {
        ret.push(...fileObjs)
--- a/src/renderer/controllers/update-controller.js
+++ b/src/renderer/controllers/update-controller.js
@@ -1,4 +1,4 @@
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')

 // Controls the UI checking for new versions of the app, prompting install
 module.exports = class UpdateController {
--- a/src/renderer/lib/cast.js
+++ b/src/renderer/lib/cast.js
@@ -13,8 +13,10 @@ module.exports = {
  setRate
 }

+const http = require('http')
+
 const config = require('../../config')
-const {CastingError} = require('./errors')
+const { CastingError } = require('./errors')

 // Lazy load these for a ~300ms improvement in startup time
 let airplayer, chromecasts, dlnacasts
@@ -81,7 +83,7 @@ function testPlayer (type) {
  }

  function getDevices () {
-    return [{name: type + '-1'}, {name: type + '-2'}]
+    return [{ name: type + '-1' }, { name: type + '-2' }]
  }

  function open () {}
@@ -130,22 +132,47 @@ function chromecastPlayer () {
    })
  }

+  function serveSubtitles (callback) {
+    const subtitles = state.playing.subtitles
+    const selectedSubtitle = subtitles.tracks[subtitles.selectedIndex]
+    if (!selectedSubtitle) {
+      callback()
+    } else {
+      ret.subServer = http.createServer((req, res) => {
+        res.writeHead(200, {
+          'Content-Type': 'text/vtt;charset=utf-8',
+          'Access-Control-Allow-Origin': '*',
+          'Transfer-Encoding': 'chunked'
+        })
+        res.end(Buffer.from(selectedSubtitle.buffer.substr(21), 'base64'))
+      }).listen(0, function () {
+        const port = ret.subServer.address().port
+        const subtitlesUrl = 'http://' + state.server.networkAddress + ':' + port + '/'
+        callback(subtitlesUrl)
+      })
+    }
+  }
+
  function open () {
    const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
-      type: 'video/mp4',
-      title: config.APP_NAME + ' - ' + torrentSummary.name
-    }, function (err) {
-      if (err) {
-        state.playing.location = 'local'
-        state.errors.push({
-          time: new Date().getTime(),
-          message: 'Could not connect to Chromecast. ' + err.message
-        })
-      } else {
-        state.playing.location = 'chromecast'
-      }
-      update()
+    serveSubtitles(function (subtitlesUrl) {
+      ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
+        type: 'video/mp4',
+        title: config.APP_NAME + ' - ' + torrentSummary.name,
+        subtitles: subtitlesUrl ? [subtitlesUrl] : [],
+        autoSubtitles: !!subtitlesUrl
+      }, function (err) {
+        if (err) {
+          state.playing.location = 'local'
+          state.errors.push({
+            time: new Date().getTime(),
+            message: 'Could not connect to Chromecast. ' + err.message
+          })
+        } else {
+          state.playing.location = 'chromecast'
+        }
+        update()
+      })
    })
  }

@@ -159,6 +186,9 @@ function chromecastPlayer () {

  function stop (callback) {
    ret.device.stop(callback)
+    if (ret.subServer) {
+      ret.subServer.close()
+    }
  }

  function status () {
@@ -399,11 +429,11 @@ function toggleMenu (location) {
  }

  // Show a menu
-  state.devices.castMenu = {location, devices}
+  state.devices.castMenu = { location, devices }
 }

 function selectDevice (index) {
-  const {location, devices} = state.devices.castMenu
+  const { location, devices } = state.devices.castMenu

  // Start casting
  const player = getPlayer(location)
--- a/src/renderer/lib/media-extensions.js
+++ b/src/renderer/lib/media-extensions.js
@@ -0,0 +1,12 @@
+const mediaExtensions = {
+  audio: [
+    '.aac', '.aif', '.aiff', '.asf', '.dff', '.dsf', '.flac', '.m2a',
+    '.m4a', '.m4b', '.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus',
+    '.spx', '.wma', '.wav', '.wv', '.wvp'],
+  video: [
+    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
+    '.ogv', '.webm', '.wmv'],
+  image: ['.gif', '.jpg', '.jpeg', '.png']
+}
+
+module.exports = mediaExtensions
--- a/src/renderer/lib/sound.js
+++ b/src/renderer/lib/sound.js
@@ -3,7 +3,7 @@ module.exports = {
 }

 const config = require('../../config')
-const {InvalidSoundNameError} = require('./errors')
+const { InvalidSoundNameError } = require('./errors')
 const path = require('path')

 const VOLUME = 0.25
--- a/src/renderer/lib/state.js
+++ b/src/renderer/lib/state.js
@@ -1,6 +1,6 @@
 const appConfig = require('application-config')('WebTorrent')
 const path = require('path')
-const {EventEmitter} = require('events')
+const { EventEmitter } = require('events')

 const config = require('../../config')

@@ -113,7 +113,6 @@ function setupStateSaved (cb) {
  const cpFile = require('cp-file')
  const fs = require('fs')
  const parseTorrent = require('parse-torrent')
-  const parallel = require('run-parallel')

  const saved = {
    prefs: {
@@ -121,7 +120,10 @@ function setupStateSaved (cb) {
      isFileHandler: false,
      openExternalPlayer: false,
      externalPlayerPath: null,
-      startup: false
+      startup: false,
+      autoAddTorrents: false,
+      torrentsFolderPath: '',
+      highestPlaybackPriority: true
    },
    torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
    torrentsToResume: [],
@@ -130,26 +132,25 @@ function setupStateSaved (cb) {

  const tasks = []

-  config.DEFAULT_TORRENTS.map(function (t, i) {
+  config.DEFAULT_TORRENTS.forEach((t, i) => {
    const infoHash = saved.torrents[i].infoHash
-    tasks.push(function (cb) {
+    tasks.push(
      cpFile(
        path.join(config.STATIC_PATH, t.posterFileName),
        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
-      ).then(cb).catch(cb)
-    })
-    tasks.push(function (cb) {
+      )
+    )
+    tasks.push(
      cpFile(
        path.join(config.STATIC_PATH, t.torrentFileName),
        path.join(config.TORRENT_PATH, infoHash + '.torrent')
-      ).then(cb).catch(cb)
-    })
+      )
+    )
  })

-  parallel(tasks, function (err) {
-    if (err) return cb(err)
-    cb(null, saved)
-  })
+  Promise.all(tasks)
+    .then(() => cb(null, saved))
+    .catch(err => cb(err))

  function createTorrentObject (t) {
    // TODO: Doing several fs.readFileSync calls during first startup is not ideal
@@ -235,7 +236,7 @@ function saveImmediate (state, cb) {
    .filter((x) => x.infoHash)
    .map(function (x) {
      const torrent = {}
-      for (let key in x) {
+      for (const key in x) {
        if (key === 'progress' || key === 'torrentKey') {
          continue // Don't save progress info or key for the webtorrent process
        }
--- a/src/renderer/lib/telemetry.js
+++ b/src/renderer/lib/telemetry.js
@@ -98,7 +98,7 @@ function getSystemInfo () {
 function getTorrentStats (state) {
  const count = state.saved.torrents.length
  let sizeMB = 0
-  let byStatus = {
+  const byStatus = {
    new: { count: 0, sizeMB: 0 },
    downloading: { count: 0, sizeMB: 0 },
    seeding: { count: 0, sizeMB: 0 },
@@ -121,7 +121,7 @@ function getTorrentStats (state) {
  }

  // Then, round all the counts and sums to the nearest power of 2
-  const ret = roundTorrentStats({count, sizeMB})
+  const ret = roundTorrentStats({ count, sizeMB })
  ret.byStatus = {
    new: roundTorrentStats(byStatus.new),
    downloading: roundTorrentStats(byStatus.downloading),
@@ -198,7 +198,7 @@ function logUncaughtError (procName, e) {
  // Log the app version *at the time of the error*
  const version = config.APP_VERSION

-  telemetry.uncaughtErrors.push({process: procName, message, stack, version})
+  telemetry.uncaughtErrors.push({ process: procName, message, stack, version })
 }

 // Turns a DOM element into a string, eg "DIV.my-class.visible"
--- a/src/renderer/lib/torrent-player.js
+++ b/src/renderer/lib/torrent-player.js
@@ -8,6 +8,8 @@ module.exports = {

 const path = require('path')

+const mediaExtensions = require('./media-extensions')
+
 // Checks whether a fileSummary or file path is audio/video that we can play,
 // based on the file extension
 function isPlayable (file) {
@@ -16,30 +18,12 @@ function isPlayable (file) {

 // Checks whether a fileSummary or file path is playable video
 function isVideo (file) {
-  return [
-    '.avi',
-    '.m4v',
-    '.mkv',
-    '.mov',
-    '.mp4',
-    '.mpg',
-    '.ogv',
-    '.webm',
-    '.wmv'
-  ].includes(getFileExtension(file))
+  return mediaExtensions.video.includes(getFileExtension(file))
 }

 // Checks whether a fileSummary or file path is playable audio
 function isAudio (file) {
-  return [
-    '.aac',
-    '.ac3',
-    '.mp3',
-    '.ogg',
-    '.wav',
-    '.flac',
-    '.m4a'
-  ].includes(getFileExtension(file))
+  return mediaExtensions.audio.includes(getFileExtension(file))
 }

 // Checks if the argument is either:
--- a/src/renderer/lib/torrent-poster.js
+++ b/src/renderer/lib/torrent-poster.js
@@ -3,39 +3,143 @@ module.exports = torrentPoster
 const captureFrame = require('capture-frame')
 const path = require('path')

+const mediaExtensions = require('./media-extensions')
+
+const msgNoSuitablePoster = 'Cannot generate a poster from any files in the torrent'
+
 function torrentPoster (torrent, cb) {
  // First, try to use a poster image if available
  const posterFile = torrent.files.filter(function (file) {
    return /^poster\.(jpg|png|gif)$/.test(file.name)
  })[0]
-  if (posterFile) return torrentPosterFromImage(posterFile, torrent, cb)
+  if (posterFile) return extractPoster(posterFile, cb)

-  // Second, try to use the largest video file
-  // Filter out file formats that the <video> tag definitely can't play
-  const videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
-  if (videoFile) return torrentPosterFromVideo(videoFile, torrent, cb)
+  // 'score' each media type based on total size present in torrent
+  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
+    return {
+      type: mediaType,
+      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType]) }
+  }).sort((a, b) => { // sort descending on size
+    return b.size - a.size
+  })[0]

-  // Third, try to use the largest image file
-  const imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.jpeg', '.png'])
-  if (imgFile) return torrentPosterFromImage(imgFile, torrent, cb)
+  if (bestScore.size === 0) {
+    // Admit defeat, no video, audio or image had a significant presence
+    return cb(new Error(msgNoSuitablePoster))
+  }

-  // TODO: generate a waveform from the largest sound file
-  // Finally, admit defeat
-  return cb(new Error('Cannot generate a poster from any files in the torrent'))
+  // Based on which media type is dominant we select the corresponding poster function
+  switch (bestScore.type) {
+    case 'audio':
+      return torrentPosterFromAudio(torrent, cb)
+    case 'image':
+      return torrentPosterFromImage(torrent, cb)
+    case 'video':
+      return torrentPosterFromVideo(torrent, cb)
+  }
 }

+/**
+ * Calculate the total data size of file matching one of the provided extensions
+ * @param torrent
+ * @param extensions List of extension to match
+ * @returns {number} total size, of matches found (>= 0)
+ */
+function calculateDataLengthByExtension (torrent, extensions) {
+  const files = filterOnExtension(torrent, extensions)
+  if (files.length === 0) return 0
+  return files
+    .map(file => file.length)
+    .reduce((a, b) => {
+      return a + b
+    })
+}
+
+/**
+ * Get the largest file of a given torrent, filtered by provided extension
+ * @param torrent Torrent to search in
+ * @param extensions Extension whitelist filter
+ * @returns Torrent file object
+ */
 function getLargestFileByExtension (torrent, extensions) {
-  const files = torrent.files.filter(function (file) {
-    const extname = path.extname(file.name).toLowerCase()
-    return extensions.indexOf(extname) !== -1
-  })
+  const files = filterOnExtension(torrent, extensions)
  if (files.length === 0) return undefined
-  return files.reduce(function (a, b) {
+  return files.reduce((a, b) => {
    return a.length > b.length ? a : b
  })
 }

-function torrentPosterFromVideo (file, torrent, cb) {
+/**
+ * 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
+ */
+function filterOnExtension (torrent, extensions) {
+  return torrent.files.filter(file => {
+    const extname = path.extname(file.name).toLowerCase()
+    return extensions.indexOf(extname) !== -1
+  })
+}
+
+/**
+ * Returns a score how likely the file is suitable as a poster
+ * @param imgFile File object of an image
+ * @returns {number} Score, higher score is a better match
+ */
+function scoreAudioCoverFile (imgFile) {
+  const fileName = path.basename(imgFile.name, path.extname(imgFile.name)).toLowerCase()
+  const relevanceScore = {
+    cover: 80,
+    folder: 80,
+    album: 80,
+    front: 80,
+    back: 20,
+    spectrogram: -80
+  }
+
+  for (const keyword in relevanceScore) {
+    if (fileName === keyword) {
+      return relevanceScore[keyword]
+    }
+    if (fileName.indexOf(keyword) !== -1) {
+      return relevanceScore[keyword]
+    }
+  }
+  return 0
+}
+
+function torrentPosterFromAudio (torrent, cb) {
+  const imageFiles = filterOnExtension(torrent, mediaExtensions.image)
+
+  if (imageFiles.length === 0) return cb(new Error(msgNoSuitablePoster))
+
+  const bestCover = imageFiles.map(file => {
+    return {
+      file: file,
+      score: scoreAudioCoverFile(file)
+    }
+  }).reduce((a, b) => {
+    if (a.score > b.score) {
+      return a
+    }
+    if (b.score > a.score) {
+      return b
+    }
+    // If score is equal, pick the largest file, aiming for highest resolution
+    if (a.file.length > b.file.length) {
+      return a
+    }
+    return b
+  })
+
+  const extname = path.extname(bestCover.file.name)
+  bestCover.file.getBuffer((err, buf) => cb(err, buf, extname))
+}
+
+function torrentPosterFromVideo (torrent, cb) {
+  const file = getLargestFileByExtension(torrent, mediaExtensions.video)
+
  const index = torrent.files.indexOf(file)

  const server = torrent.createServer(0)
@@ -70,14 +174,19 @@ function torrentPosterFromVideo (file, torrent, cb) {

      server.destroy()

-      if (buf.length === 0) return cb(new Error('Generated poster contains no data'))
+      if (buf.length === 0) return cb(new Error(msgNoSuitablePoster))

      cb(null, buf, '.jpg')
    }
  }
 }

-function torrentPosterFromImage (file, torrent, cb) {
-  const extname = path.extname(file.name)
-  file.getBuffer((err, buf) => cb(err, buf, extname))
+function torrentPosterFromImage (torrent, cb) {
+  const file = getLargestFileByExtension(torrent, mediaExtensions.image)
+  extractPoster(file, cb)
+}
+
+function extractPoster (file, cb) {
+  const extname = path.extname(file.name)
+  file.getBuffer((err, buf) => { return cb(err, buf, extname) })
 }
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -5,7 +5,7 @@
 *   actually used because auto-prefixing is disabled with
 *   `darkBaseTheme.userAgent = false`. Return a fake object.
 */
-let Module = require('module')
+const Module = require('module')
 const _require = Module.prototype.require
 Module.prototype.require = function (id) {
  if (id === 'inline-style-prefixer') return {}
@@ -39,9 +39,6 @@ const TorrentPlayer = require('./lib/torrent-player')
 // Perf optimization: Needed immediately, so do not lazy load it below
 const TorrentListController = require('./controllers/torrent-list-controller')

-// Required by Material UI -- adds `onTouchTap` event
-require('react-tap-event-plugin')()
-
 const App = require('./pages/app')

 // Electron apps have two processes: a main process (node) runs first and starts
@@ -111,6 +108,10 @@ function onState (err, _state) {
    update: createGetter(() => {
      const UpdateController = require('./controllers/update-controller')
      return new UpdateController(state)
+    }),
+    folderWatcher: createGetter(() => {
+      const FolderWatcherController = require('./controllers/folder-watcher-controller')
+      return new FolderWatcherController()
    })
  }

@@ -296,6 +297,8 @@ const dispatchHandlers = {
  '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),
@@ -444,7 +447,7 @@ function setDimensions (dimensions) {
  )

  ipcRenderer.send('setAspectRatio', aspectRatio)
-  ipcRenderer.send('setBounds', {contentBounds: true, x: null, y: null, width, height})
+  ipcRenderer.send('setBounds', { contentBounds: true, x: null, y: null, width, height })
  state.playing.aspectRatio = aspectRatio
 }

@@ -453,6 +456,13 @@ function setDimensions (dimensions) {
 function onOpen (files) {
  if (!Array.isArray(files)) files = [ files ]

+  // File API seems to transform "magnet:?foo" in "magnet:///?foo"
+  // this is a sanitization
+  files = files.map(file => {
+    if (typeof file !== 'string') return file
+    return file.replace(/^magnet:\/+\?/i, 'magnet:?')
+  })
+
  const url = state.location.url()
  const allTorrents = files.every(TorrentPlayer.isTorrent)
  const allSubtitles = files.every(controllers.subtitles().isSubtitle)
--- a/src/renderer/pages/create-torrent-page.js
+++ b/src/renderer/pages/create-torrent-page.js
@@ -3,7 +3,7 @@ const path = require('path')
 const prettyBytes = require('prettier-bytes')
 const React = require('react')

-const {dispatch, dispatcher} = require('../lib/dispatcher')
+const { dispatch, dispatcher } = require('../lib/dispatcher')

 const FlatButton = require('material-ui/FlatButton').default
 const RaisedButton = require('material-ui/RaisedButton').default
@@ -35,7 +35,7 @@ class CreateTorrentPage extends React.Component {
    // Then, exclude .DS_Store and other dotfiles
    const files = info.files
      .filter((f) => !containsDots(f.path, pathPrefix))
-      .map((f) => ({name: f.name, path: f.path, size: f.size}))
+      .map((f) => ({ name: f.name, path: f.path, size: f.size }))
    if (files.length === 0) return (<CreateTorrentErrorPage state={state} />)

    // Then, use the name of the base folder (or sole file, for a single file torrent)
@@ -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.setIsPrivate = (_, isPrivate) => this.setState({ isPrivate })
+    this.setComment = (_, comment) => this.setState({ comment })
+    this.setTrackers = (_, trackers) => this.setState({ trackers })
    this.handleSubmit = handleSubmit.bind(this)
  }

@@ -141,7 +141,7 @@ class CreateTorrentPage extends React.Component {
          <label>Private:</label>
          <Checkbox
            className='torrent-is-private control'
-            style={{display: ''}}
+            style={{ display: '' }}
            checked={this.state.isPrivate}
            onCheck={this.setIsPrivate} />
        </div>
@@ -191,9 +191,14 @@ function handleSubmit () {
    path: this.state.basePath,
    files: this.state.files,
    announce: announceList,
-    private: this.state.isPrivate,
    comment: this.state.comment.trim()
  }
+
+  // If torrent is not private, leave private flag unset. This ensures that
+  // the torrent info hash will match the result generated by other tools,
+  // including webtorrent-cli.
+  if (this.state.isPrivate) options.private = true
+
  dispatch('createTorrent', options)
 }

--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -5,7 +5,7 @@ const zeroFill = require('zero-fill')

 const TorrentSummary = require('../lib/torrent-summary')
 const Playlist = require('../lib/playlist')
-const {dispatch, dispatcher} = require('../lib/dispatcher')
+const { dispatch, dispatcher } = require('../lib/dispatcher')
 const config = require('../../config')

 // Shows a streaming video player. Standard features + Chromecast + Airplay
@@ -160,6 +160,7 @@ function renderMedia (state) {
    } else {
      // When the last video completes, pause the video instead of looping
      state.playing.isPaused = true
+      if (state.window.isFullScreen) dispatch('toggleFullScreen')
    }
  }

@@ -203,28 +204,41 @@ function renderOverlay (state) {
  )
 }

+/**
+ * Render track or disk number string
+ * @param common metadata.common part
+ * @param key should be either 'track' or 'disk'
+ * @return track or disk number metadata as JSX block
+ */
+function renderTrack (common, key) {
+  // Audio metadata: track-number
+  if (common[key] && common[key].no) {
+    let str = `${common[key].no}`
+    if (common[key].of) {
+      str += ` of ${common[key].of}`
+    }
+    const style = { textTransform: 'capitalize' }
+    return (
+      <div className={`audio-${key}`}>
+        <label style={style}>{key}</label> {str}
+      </div>
+    )
+  }
+}
+
 function renderAudioMetadata (state) {
  const fileSummary = state.getPlayingFileSummary()
  if (!fileSummary.audioInfo) return
-  const info = fileSummary.audioInfo
+  const common = fileSummary.audioInfo.common || {}

  // Get audio track info
-  let title = info.title
-  if (!title) {
-    title = fileSummary.name
-  }
-  let artist = info.artist && info.artist[0]
-  let album = info.album
-  if (album && info.year && !album.includes(info.year)) {
-    album += ' (' + info.year + ')'
-  }
-  let track
-  if (info.track && info.track.no && info.track.of) {
-    track = info.track.no + ' of ' + info.track.of
-  }
+  const title = common.title ? common.title : fileSummary.name

  // Show a small info box in the middle of the screen with title/album/etc
  const elems = []
+
+  // Audio metadata: artist(s)
+  const artist = common.artist || common.albumartist
  if (artist) {
    elems.push((
      <div key='artist' className='audio-artist'>
@@ -232,17 +246,86 @@ function renderAudioMetadata (state) {
      </div>
    ))
  }
-  if (album) {
+
+  // Audio metadata: disk & track-number
+  const count = ['track', 'disk']
+  count.forEach(key => {
+    const nrElem = renderTrack(common, key)
+    if (nrElem) {
+      elems.push(nrElem)
+    }
+  })
+
+  // Audio metadata: album
+  if (common.album) {
    elems.push((
      <div key='album' className='audio-album'>
-        <label>Album</label>{album}
+        <label>Album</label>{common.album}
      </div>
    ))
  }
-  if (track) {
+
+  // Audio metadata: year
+  if (common.year) {
    elems.push((
-      <div key='track' className='audio-track'>
-        <label>Track</label>{track}
+      <div key='year' className='audio-year'>
+        <label>Year</label>{common.year}
+      </div>
+    ))
+  }
+
+  // Audio metadata: release information (label & catalog-number)
+  if (common.label || common.catalognumber) {
+    const releaseInfo = []
+    if (common.label && common.catalognumber &&
+      common.label.length === common.catalognumber.length) {
+      // Assume labels & catalog-numbers are pairs
+      for (let n = 0; n < common.label.length; ++n) {
+        releaseInfo.push(common.label[0] + ' / ' + common.catalognumber[n])
+      }
+    } else {
+      if (common.label) {
+        releaseInfo.push(...common.label)
+      }
+      if (common.catalognumber) {
+        releaseInfo.push(...common.catalognumber)
+      }
+    }
+    elems.push((
+      <div key='release' className='audio-release'>
+        <label>Release</label>{ releaseInfo.join(', ') }
+      </div>
+    ))
+  }
+
+  // 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.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
+  }
+  if (fileSummary.audioInfo.format.bitsPerSample) {
+    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
+  }
+  if (format.length > 0) {
+    elems.push((
+      <div key='format' className='audio-format'>
+        <label>Format</label>{ format.join(', ') }
+      </div>
+    ))
+  }
+
+  // Audio metadata: comments
+  if (common.comment) {
+    elems.push((
+      <div key='comments' className='audio-comments'>
+        <label>Comments</label>{common.comment.join(' / ')}
      </div>
    ))
  }
@@ -273,7 +356,7 @@ function renderLoadingSpinner (state) {

  return (
    <div key='loading' className='media-stalled'>
-      <div key='loading-spinner' className='loading-spinner'>&nbsp;</div>
+      <div key='loading-spinner' className='loading-spinner' />
      <div key='loading-progress' className='loading-status ellipsis'>
        <span className='progress'>{fileProgress}%</span> downloaded
        <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
@@ -303,7 +386,7 @@ function renderCastScreen (state) {
    isCast = false
  } else if (state.playing.location === 'error') {
    castIcon = 'error_outline'
-    castType = 'Error'
+    castType = 'Unable to Play'
    isCast = false
  }

@@ -333,7 +416,7 @@ function renderCastScreen (state) {
 function renderCastOptions (state) {
  if (!state.devices.castMenu) return

-  const {location, devices} = state.devices.castMenu
+  const { location, devices } = state.devices.castMenu
  const player = state.devices[location]

  const items = devices.map(function (device, ix) {
@@ -456,9 +539,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?
@@ -497,9 +580,9 @@ function renderPlayerControls (state) {
  const volume = state.playing.volume
  const volumeIcon = 'volume_' + (
    volume === 0 ? 'off'
-    : volume < 0.3 ? 'mute'
-    : volume < 0.6 ? 'down'
-    : 'up')
+      : volume < 0.3 ? 'mute'
+        : volume < 0.6 ? 'down'
+          : 'up')
  const volumeStyle = {
    background: '-webkit-gradient(linear, left top, right top, ' +
      'color-stop(' + (volume * 100) + '%, #eee), ' +
@@ -523,8 +606,8 @@ function renderPlayerControls (state) {
  ))

  // Show video playback progress
-  const currentTimeStr = formatTime(state.playing.currentTime)
-  const durationStr = formatTime(state.playing.duration)
+  const currentTimeStr = formatTime(state.playing.currentTime, state.playing.duration)
+  const durationStr = formatTime(state.playing.duration, state.playing.duration)
  elements.push((
    <span key='time' className='time float-left'>
      {currentTimeStr} / {durationStr}
@@ -613,7 +696,7 @@ function renderLoadingBar (state) {
  for (let i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
    const partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
    if (partPresent && !lastPiecePresent) {
-      parts.push({start: i - fileProg.startPiece, count: 1})
+      parts.push({ start: i - fileProg.startPiece, count: 1 })
    } else if (partPresent) {
      parts[parts.length - 1].count++
    }
@@ -646,17 +729,19 @@ function cssBackgroundImageDarkGradient () {
    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
 }

-function formatTime (time) {
+function formatTime (time, total) {
  if (typeof time !== 'number' || Number.isNaN(time)) {
    return '0:00'
  }

-  let hours = Math.floor(time / 3600)
+  const totalHours = Math.floor(total / 3600)
+  const totalMinutes = Math.floor(total / 60)
+  const hours = Math.floor(time / 3600)
  let minutes = Math.floor(time % 3600 / 60)
-  if (hours > 0) {
+  if (totalMinutes > 9) {
    minutes = zeroFill(2, minutes)
  }
-  let seconds = zeroFill(2, Math.floor(time % 60))
+  const seconds = zeroFill(2, Math.floor(time % 60))

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

 const colors = require('material-ui/styles/colors')
 const Checkbox = require('material-ui/Checkbox').default
@@ -7,7 +8,7 @@ const RaisedButton = require('material-ui/RaisedButton').default
 const Heading = require('../components/heading')
 const PathSelector = require('../components/path-selector')

-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')
 const config = require('../../config')

 class PreferencesPage extends React.Component {
@@ -37,7 +38,7 @@ class PreferencesPage extends React.Component {
          }}
          onChange={this.handleDownloadPathChange}
          title='Download location'
-          value={this.props.state.unsaved.prefs.downloadPath} />
+          value={this.props.state.saved.prefs.downloadPath} />
      </Preference>
    )
  }
@@ -51,7 +52,7 @@ class PreferencesPage extends React.Component {
      <Preference>
        <Checkbox
          className='control'
-          checked={!this.props.state.unsaved.prefs.openExternalPlayer}
+          checked={!this.props.state.saved.prefs.openExternalPlayer}
          label={'Play torrent media files using WebTorrent'}
          onCheck={this.handleOpenExternalPlayerChange} />
      </Preference>
@@ -67,7 +68,7 @@ class PreferencesPage extends React.Component {
      <Preference>
        <Checkbox
          className='control'
-          checked={this.props.state.unsaved.prefs.highestPlaybackPriority}
+          checked={this.props.state.saved.prefs.highestPlaybackPriority}
          label={'Highest Playback Priority'}
          onCheck={this.handleHighestPlaybackPriorityChange}
        />
@@ -81,10 +82,10 @@ class PreferencesPage extends React.Component {
  }

  externalPlayerPathSelector () {
-    const playerPath = this.props.state.unsaved.prefs.externalPlayerPath
+    const playerPath = this.props.state.saved.prefs.externalPlayerPath
    const playerName = this.props.state.getExternalPlayerName()

-    const description = this.props.state.unsaved.prefs.openExternalPlayer
+    const description = this.props.state.saved.prefs.openExternalPlayer
      ? `Torrent media files will always play in ${playerName}.`
      : `Torrent media files will play in ${playerName} if WebTorrent cannot play them.`

@@ -108,8 +109,61 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'externalPlayerPath', filePath)
  }

+  autoAddTorrentsCheckbox () {
+    return (
+      <Preference>
+        <Checkbox
+          className='control'
+          checked={this.props.state.saved.prefs.autoAddTorrents}
+          label={'Watch for new .torrent files and add them immediately'}
+          onCheck={(e, value) => { this.handleAutoAddTorrentsChange(e, value) }}
+        />
+      </Preference>
+    )
+  }
+
+  handleAutoAddTorrentsChange (e, isChecked) {
+    const torrentsFolderPath = this.props.state.saved.prefs.torrentsFolderPath
+    if (isChecked && !torrentsFolderPath) {
+      alert('Select a torrents folder first.') // eslint-disable-line
+      e.preventDefault()
+      return
+    }
+
+    dispatch('updatePreferences', 'autoAddTorrents', isChecked)
+
+    if (isChecked) {
+      dispatch('startFolderWatcher', null)
+      return
+    }
+
+    dispatch('stopFolderWatcher', null)
+  }
+
+  torrentsFolderPathSelector () {
+    const torrentsFolderPath = this.props.state.saved.prefs.torrentsFolderPath
+
+    return (
+      <Preference>
+        <PathSelector
+          dialog={{
+            title: 'Select folder to watch for new torrents',
+            properties: [ 'openDirectory' ]
+          }}
+          displayValue={torrentsFolderPath || ''}
+          onChange={this.handletorrentsFolderPathChange}
+          title='Folder to watch'
+          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null} />
+      </Preference>
+    )
+  }
+
+  handletorrentsFolderPathChange (filePath) {
+    dispatch('updatePreferences', 'torrentsFolderPath', filePath)
+  }
+
  setDefaultAppButton () {
-    const isFileHandler = this.props.state.unsaved.prefs.isFileHandler
+    const isFileHandler = this.props.state.saved.prefs.isFileHandler
    if (isFileHandler) {
      return (
        <Preference>
@@ -142,7 +196,7 @@ class PreferencesPage extends React.Component {
        <Preference>
          <Checkbox
            className='control'
-            checked={this.props.state.unsaved.prefs.startup}
+            checked={this.props.state.saved.prefs.startup}
            label={'Open WebTorrent on startup.'}
            onCheck={this.handleStartupChange}
          />
@@ -163,8 +217,10 @@ class PreferencesPage extends React.Component {
    }
    return (
      <div style={style}>
-        <PreferencesSection title='Downloads'>
+        <PreferencesSection title='Folders'>
          {this.downloadPathSelector()}
+          {this.autoAddTorrentsCheckbox()}
+          {this.torrentsFolderPathSelector()}
        </PreferencesSection>
        <PreferencesSection title='Playback'>
          {this.openExternalPlayerCheckbox()}
@@ -183,7 +239,7 @@ class PreferencesPage extends React.Component {
 class PreferencesSection extends React.Component {
  static get propTypes () {
    return {
-      title: React.PropTypes.string
+      title: PropTypes.string
    }
  }

--- a/src/renderer/pages/torrent-list-page.js
+++ b/src/renderer/pages/torrent-list-page.js
@@ -7,7 +7,7 @@ const LinearProgress = require('material-ui/LinearProgress').default

 const TorrentSummary = require('../lib/torrent-summary')
 const TorrentPlayer = require('../lib/torrent-player')
-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 module.exports = class TorrentList extends React.Component {
  render () {
@@ -148,7 +148,7 @@ module.exports = class TorrentList extends React.Component {
        }
      }
      return (
-        <div style={styles.wrapper}>
+        <div key='progress-bar' style={styles.wrapper}>
          <LinearProgress style={styles.progress} mode='determinate' value={progress} />
        </div>
      )
@@ -201,7 +201,7 @@ module.exports = class TorrentList extends React.Component {
      const minutesStr = (hours || minutes) ? minutes + 'm' : ''
      const secondsStr = seconds + 's'

-      return (<span>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
+      return (<span key='eta'>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
    }

    function renderTorrentStatus () {
@@ -217,7 +217,7 @@ module.exports = class TorrentList extends React.Component {
      } else { // torrentSummary.status is 'new' or something unexpected
        status = ''
      }
-      return (<span>{status}</span>)
+      return (<span key='torrent-status'>{status}</span>)
    }
  }

@@ -368,21 +368,21 @@ module.exports = class TorrentList extends React.Component {

  renderRadialProgressBar (fraction, cssClass) {
    const rotation = 360 * fraction
-    const transformFill = {transform: 'rotate(' + (rotation / 2) + 'deg)'}
-    const transformFix = {transform: 'rotate(' + rotation + 'deg)'}
+    const transformFill = { transform: 'rotate(' + (rotation / 2) + 'deg)' }
+    const transformFix = { transform: 'rotate(' + rotation + 'deg)' }

    return (
      <div key='radial-progress' className={'radial-progress ' + cssClass}>
-        <div key='circle' className='circle'>
-          <div key='mask-full' className='mask full' style={transformFill}>
-            <div key='fill' className='fill' style={transformFill} />
+        <div className='circle'>
+          <div className='mask full' style={transformFill}>
+            <div className='fill' style={transformFill} />
          </div>
-          <div key='mask-half' className='mask half'>
-            <div key='fill' className='fill' style={transformFill} />
-            <div key='fill-fix' className='fill fix' style={transformFix} />
+          <div className='mask half'>
+            <div className='fill' style={transformFill} />
+            <div className='fill fix' style={transformFix} />
          </div>
        </div>
-        <div key='inset' className='inset' />
+        <div className='inset' />
      </div>
    )
  }
@@ -396,7 +396,7 @@ function getErrorMessage (torrentSummary) {
  const err = torrentSummary.error
  if (err === 'path-missing') {
    return (
-      <span>
+      <span key='path-missing'>
        Path missing.<br />
        Fix and restart the app, or delete the torrent.
      </span>
--- a/src/renderer/webtorrent.js
+++ b/src/renderer/webtorrent.js
@@ -8,7 +8,7 @@ const defaultAnnounceList = require('create-torrent').announceList
 const electron = require('electron')
 const fs = require('fs')
 const mkdirp = require('mkdirp')
-const musicmetadata = require('musicmetadata')
+const mm = require('music-metadata')
 const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
@@ -16,7 +16,7 @@ const zeroFill = require('zero-fill')

 const crashReporter = require('../crash-reporter')
 const config = require('../config')
-const {TorrentKeyNotFoundError} = require('./lib/errors')
+const { TorrentKeyNotFoundError } = require('./lib/errors')
 const torrentPoster = require('./lib/torrent-poster')

 // Report when the process crashes
@@ -97,8 +97,8 @@ function init () {
  ipc.send('ipcReadyWebTorrent')

  window.addEventListener('error', (e) =>
-    ipc.send('wt-uncaught-error', {message: e.error.message, stack: e.error.stack}),
-    true)
+    ipc.send('wt-uncaught-error', { message: e.error.message, stack: e.error.stack }),
+  true)

  setInterval(updateTorrentProgress, 1000)
  console.timeEnd('init')
@@ -251,7 +251,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 && deepEqual(progress, prevProgress, { strict: true })) {
    return /* don't send heavy object if it hasn't changed */
  }
  ipc.send('wt-progress', progress)
@@ -320,7 +320,8 @@ function startServerFromReadyTorrent (torrent, cb) {
    const info = {
      torrentKey: torrent.key,
      localURL: 'http://localhost' + urlSuffix,
-      networkURL: 'http://' + networkAddress() + urlSuffix
+      networkURL: 'http://' + networkAddress() + urlSuffix,
+      networkAddress: networkAddress()
    }

    ipc.send('wt-server-running', info)
@@ -334,16 +335,34 @@ function stopServer () {
  server = null
 }

+console.log('Initializing...')
+
 function getAudioMetadata (infoHash, index) {
  const torrent = client.get(infoHash)
  const file = torrent.files[index]
-  musicmetadata(file.createReadStream(), function (err, info) {
-    if (err) return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-    const { artist, album, albumartist, title, year, track, disk, genre } = info
-    const importantInfo = { artist, album, albumartist, title, year, track, disk, genre }
-    console.log('got audio metadata for %s: %o', file.name, importantInfo)
-    ipc.send('wt-audio-metadata', infoHash, index, importantInfo)
-  })
+
+  // Set initial matadata to display the filename first.
+  const metadata = { title: file.name }
+  ipc.send('wt-audio-metadata', infoHash, index, metadata)
+
+  const options = { native: false,
+    skipCovers: true,
+    fileSize: file.length,
+    observer: event => {
+      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
+    } }
+  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)
+    })
 }

 function selectFiles (torrentOrInfoHash, selections) {
--- a/static/main.css
+++ b/static/main.css
@@ -615,6 +615,7 @@ body.drag .app::after {
  font-size: 13px;
  margin: 9px 8px 8px 8px;
  opacity: 0.8;
+  font-variant-numeric: tabular-nums;
 }

 .player .controls .icon.closed-caption {
@@ -800,6 +801,23 @@ video::-webkit-media-text-track-container {
  width: 40px;
  height: 40px;
  margin: 40px auto;
+  border-top: 6px solid rgba(255, 255, 255, 0.2);
+  border-right: 6px solid rgba(255, 255, 255, 0.2);
+  border-bottom: 6px solid rgba(255, 255, 255, 0.2);
+  border-left: 6px solid #ffffff;
+  border-radius: 50%;
+  color: transparent;
+  animation: spinning 1.1s infinite linear;
+}
+
+@keyframes spinning {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
 }

 .media-stalled .loading-status {
@@ -819,12 +837,17 @@ video::-webkit-media-text-track-container {

 .audio-metadata label {
  display:inline-block;
-  width: 100px;
+  width: 120px;
  text-align: right;
  font-weight: normal;
  margin-right: 25px;
 }

+.audio-metadata .audio-format,
+.audio-metadata .audio-comments {
+  font-weight: normal;
+}
+
 /*
 * ERRORS
 */
--- a/test/index.js
+++ b/test/index.js
@@ -10,7 +10,7 @@ test('app runs', function (t) {
  setup.waitForLoad(app, t)
    .then(() => setup.screenshotCreateOrCompare(app, t, 'app-basic'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })

 require('./test-torrent-list')
--- a/test/screenshots/darwin/add-torrent-0-percent.png
+++ b/test/screenshots/darwin/add-torrent-0-percent.png
--- a/test/screenshots/darwin/add-torrent-100-percent.png
+++ b/test/screenshots/darwin/add-torrent-100-percent.png
--- a/test/screenshots/darwin/app-basic.png
+++ b/test/screenshots/darwin/app-basic.png
--- a/test/screenshots/darwin/create-torrent-100-percent.png
+++ b/test/screenshots/darwin/create-torrent-100-percent.png
--- a/test/screenshots/darwin/create-torrent-advanced.png
+++ b/test/screenshots/darwin/create-torrent-advanced.png
--- a/test/screenshots/darwin/create-torrent-simple.png
+++ b/test/screenshots/darwin/create-torrent-simple.png
--- a/test/screenshots/darwin/play-torrent-bbb.png
+++ b/test/screenshots/darwin/play-torrent-bbb.png
--- a/test/screenshots/darwin/play-torrent-return.png
+++ b/test/screenshots/darwin/play-torrent-return.png
--- a/test/screenshots/darwin/play-torrent-wired-2.png
+++ b/test/screenshots/darwin/play-torrent-wired-2.png
--- a/test/screenshots/darwin/play-torrent-wired-3.png
+++ b/test/screenshots/darwin/play-torrent-wired-3.png
--- a/test/screenshots/darwin/play-torrent-wired-4.png
+++ b/test/screenshots/darwin/play-torrent-wired-4.png
--- a/test/screenshots/darwin/play-torrent-wired-5.png
+++ b/test/screenshots/darwin/play-torrent-wired-5.png
--- a/test/screenshots/darwin/play-torrent-wired-fullscreen.png
+++ b/test/screenshots/darwin/play-torrent-wired-fullscreen.png
--- a/test/screenshots/darwin/play-torrent-wired-list.png
+++ b/test/screenshots/darwin/play-torrent-wired-list.png
--- a/test/screenshots/darwin/play-torrent-wired.png
+++ b/test/screenshots/darwin/play-torrent-wired.png
--- a/test/screenshots/darwin/prefs-basic.png
+++ b/test/screenshots/darwin/prefs-basic.png
--- a/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
--- a/test/screenshots/darwin/torrent-list-cosmos-deleted.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-deleted.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand.png
--- a/test/screenshots/darwin/torrent-list-cosmos-hover.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-hover.png
--- a/test/screenshots/darwin/torrent-list-delete-prompt.png
+++ b/test/screenshots/darwin/torrent-list-delete-prompt.png
--- a/test/screenshots/darwin/torrent-list-deleted.png
+++ b/test/screenshots/darwin/torrent-list-deleted.png
--- a/test/screenshots/darwin/torrent-list-download-path-missing.png
+++ b/test/screenshots/darwin/torrent-list-download-path-missing.png
--- a/test/screenshots/darwin/torrent-list-download.png
+++ b/test/screenshots/darwin/torrent-list-download.png
--- a/test/screenshots/darwin/torrent-list-hover-download.png
+++ b/test/screenshots/darwin/torrent-list-hover-download.png
--- a/test/screenshots/darwin/torrent-list-hover.png
+++ b/test/screenshots/darwin/torrent-list-hover.png
--- a/test/screenshots/darwin/torrent-list-start-download.png
+++ b/test/screenshots/darwin/torrent-list-start-download.png
--- a/test/screenshots/darwin/torrent-list.png
+++ b/test/screenshots/darwin/torrent-list.png
--- a/test/screenshots/win32/play-torrent-wired-2.png
+++ b/test/screenshots/win32/play-torrent-wired-2.png
--- a/test/screenshots/win32/play-torrent-wired-3.png
+++ b/test/screenshots/win32/play-torrent-wired-3.png
--- a/test/screenshots/win32/play-torrent-wired-4.png
+++ b/test/screenshots/win32/play-torrent-wired-4.png
--- a/test/screenshots/win32/play-torrent-wired-5.png
+++ b/test/screenshots/win32/play-torrent-wired-5.png
--- a/test/screenshots/win32/play-torrent-wired-fullscreen.png
+++ b/test/screenshots/win32/play-torrent-wired-fullscreen.png
--- a/test/screenshots/win32/play-torrent-wired.png
+++ b/test/screenshots/win32/play-torrent-wired.png
--- a/test/setup.js
+++ b/test/setup.js
@@ -32,7 +32,7 @@ function createApp (t) {
    path: path.join(__dirname, '..', 'node_modules', '.bin',
      'electron' + (process.platform === 'win32' ? '.cmd' : '')),
    args: ['-r', path.join(__dirname, 'mocks.js'), path.join(__dirname, '..')],
-    env: {NODE_ENV: 'test'},
+    env: { NODE_ENV: 'test' },
    waitTimeout: 10e3
  })
 }
@@ -53,7 +53,7 @@ function waitForLoad (app, t, opts) {
  }).then(function () {
    return app.webContents.getTitle()
  }).then(function (title) {
-    // Note the window title is WebTorrent (BETA), this is the HTML <title>
+    // Note the window title is WebTorrent, this is the HTML <title>
    t.equal(title, 'Main Window', 'html title')
  })
 }
--- a/test/test-add-torrent.js
+++ b/test/test-add-torrent.js
@@ -30,7 +30,7 @@ test('add-torrent', function (t) {
    .then(() => app.client.moveToObject('.torrent'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'add-torrent-100-percent'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })

 test('create-torrent', function (t) {
@@ -40,10 +40,9 @@ test('create-torrent', function (t) {
    announce: [
      'udp://explodie.org:6969',
      'udp://tracker.coppersurfer.tk:6969',
+      'udp://tracker.empire-js.us:1337',
      'udp://tracker.leechers-paradise.org:6969',
-      'udp://tracker.openbittorrent.com:80',
      'udp://tracker.opentrackr.org:1337',
-      'udp://zer0day.ch:1337',
      'wss://tracker.btorrent.xyz',
      'wss://tracker.fastcast.nz',
      'wss://tracker.openwebtorrent.com'
@@ -84,5 +83,5 @@ test('create-torrent', function (t) {
      config.SAVED_TORRENT_FILE,
      expectedTorrent))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })
--- a/test/test-audio.js
+++ b/test/test-audio.js
@@ -6,7 +6,7 @@ test('audio-streaming', function (t) {

  t.timeoutAfter(60e3)
  const app = setup.createApp()
-  setup.waitForLoad(app, t, {online: true})
+  setup.waitForLoad(app, t, { online: true })
    .then(() => app.client.waitUntilTextExists('.torrent-list', 'Big Buck Bunny'))
    // Play Wired CD. Wait for it to start streaming.
    .then(() => app.client.moveToObject('#torrent-wired'))
@@ -53,5 +53,5 @@ test('audio-streaming', function (t) {
    .then(() => app.webContents.executeJavaScript('dispatch("skipTo", 2)'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'play-torrent-wired-5'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })
--- a/test/test-select-poster.js
+++ b/test/test-select-poster.js
@@ -0,0 +1,25 @@
+const test = require('tape')
+
+const fs = require('fs')
+const path = require('path')
+
+const WebTorrent = require('webtorrent')
+const torrentPoster = require('../build/renderer/lib/torrent-poster')
+
+const client = new WebTorrent()
+
+test("get cover from: 'wiredCd.torrent'", (t) => {
+  const torrentPath = path.join(__dirname, '..', 'static', 'wiredCd.torrent')
+  const torrentData = fs.readFileSync(torrentPath)
+
+  client.add(torrentData, (torrent) => {
+    torrentPoster(torrent, (err, buf, extension) => {
+      if (err) {
+        t.fail(err)
+      } else {
+        t.equals(extension, '.jpg')
+        t.end()
+      }
+    })
+  })
+})
--- a/test/test-torrent-list.js
+++ b/test/test-torrent-list.js
@@ -22,7 +22,7 @@ test('torrent-list: show download path missing', function (t) {
    .then((windowTitle) => t.equal(windowTitle, 'Preferences', 'window title'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'prefs-basic'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })

 test('torrent-list: start, stop, and delete torrents', function (t) {
@@ -31,22 +31,20 @@ test('torrent-list: start, stop, and delete torrents', function (t) {
  const app = setup.createApp()
  setup.waitForLoad(app, t)
    .then(() => app.client.waitUntilTextExists('.torrent-list', 'Big Buck Bunny'))
-    // Mouse over the first torrent
-    .then(() => app.client.moveToObject('.torrent'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-hover'))
+    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list'))
    // Click download on the first torrent, start downloading
    .then(() => app.client.click('.download input'))
    .then(() => app.client.waitUntilTextExists('.torrent-list', '276 MB'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-start-download'))
    // Click download on the first torrent again, stop downloading
    .then(() => app.client.click('.download input'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-hover-download'))
+    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-download'))
    // Click delete on the first torrent
    .then(() => app.client.click('.icon.delete'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-delete-prompt'))
    // Click cancel on the resulting confirmation dialog. Should be same as before.
    .then(() => app.client.click('.control.cancel'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-hover'))
+    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list'))
    // Click delete on the first torrent again
    .then(() => app.client.click('.icon.delete'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-delete-prompt'))
@@ -54,7 +52,7 @@ test('torrent-list: start, stop, and delete torrents', function (t) {
    .then(() => app.client.click('.control.ok'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-deleted'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })

 test('torrent-list: expand torrent, unselect file', function (t) {
@@ -63,9 +61,6 @@ test('torrent-list: expand torrent, unselect file', function (t) {
  const app = setup.createApp()
  setup.waitForLoad(app, t)
    .then(() => app.client.waitUntilTextExists('.torrent-list', 'Big Buck Bunny'))
-    // Mouse over the torrent
-    .then(() => app.client.moveToObject('#torrent-cosmos'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-cosmos-hover'))
    // Click on the torrent, expand
    .then(() => app.client.click('#torrent-cosmos'))
    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-cosmos-expand'))
@@ -101,5 +96,5 @@ test('torrent-list: expand torrent, unselect file', function (t) {
    // Make sure that all the files are gone
    .then(() => setup.compareDownloadFolder(t, 'CosmosLaundromatFirstCycle', null))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })
--- a/test/test-video.js
+++ b/test/test-video.js
@@ -6,7 +6,7 @@ test('video-streaming', function (t) {

  t.timeoutAfter(30e3)
  const app = setup.createApp()
-  setup.waitForLoad(app, t, {online: true})
+  setup.waitForLoad(app, t, { online: true })
    .then(() => app.client.waitUntilTextExists('.torrent-list', 'Big Buck Bunny'))
    // Play Big Buck Bunny. Wait for it to start streaming.
    .then(() => app.client.moveToObject('.torrent'))
@@ -31,5 +31,5 @@ test('video-streaming', function (t) {
    // Take another screenshot to verify that the window resized correctly
    .then(() => setup.screenshotCreateOrCompare(app, t, 'play-torrent-return'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })