0.3.2

Faster startup time (50ms)
Changelog
2016-04-07 01:02:07 -07:00 · 2016-04-07 00:58:37 -07:00 · 2016-04-07 00:25:19 -07:00 · 2016-04-06 21:57:11 -07:00 · 2016-04-06 21:52:25 -07:00 · 2016-04-06 21:29:34 -07:00
33 changed files with 2038 additions and 910 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,9 @@
+**What version of WebTorrent Desktop?**
+
+**What operating system and version?**
+
+**What did you do?**
+
+**What did you expect to happen?**
+
+**What actually happened?**
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,71 @@
 # WebTorrent Desktop Version History

+## v0.3.2 - 2016-04-07
+
+### Added
+
+- Register WebTorrent as default handler for magnet links (OS X)
+
+### Changed
+
+- Faster startup time (50ms)
+- Update Electron to 0.37.5
+  - Remove the white flash when loading pages and resizing the window
+  - Fix crash when sending IPC messages
+
+### Fixed
+
+- Fix installation bugs with .deb file (Linux)
+- Pause audio reliably when closing the window
+
+## v0.3.1 - 2016-04-06
+
+### Added
+
+- Add crash reporter to torrent engine process
+
+### Fixed
+
+- Fix cast screen background: cover, don't tile
+
+## v0.3.0 - 2016-04-06
+
+### Added
+
+- **Ubuntu/Debian support!** (.deb installer)
+- **DLNA streaming support**
+- Add "File > Quit" menu item (Linux)
+- App uninstaller (Windows)
+- Crash reporting
+
+### Changed
+
+- On startup, do not re-verify files when timestamps are unchanged
+- Moved torrent engine to an independent process, for better UI performance
+- Removed media queries (UI resizing based on window width)
+- Improved Chromecast icon, when connected
+
+### Fixed
+
+- "Download Complete" notification shows consistently
+- Create new torrents and seed them without copying to temporary folder
+- Clicking the "Download Complete" notification will always activate app
+- Fixed harmless "-psn_###" error on first app startup
+- Hide play buttons on unplayable torrents
+- Better error handling when Chromecast/Airplay cannot connect
+- Show player controls immediately on mouse move
+- When creating a torrent, show it in UI immediately
+- Stop casting to TV when player is closed
+- Torrent engine: Fixed memory leaks in `torrent-discovery` and `bittorrent-tracker`
+- Torrent engine: Fixed sub-optimal tcp/webrtc connection timeouts
+- Torrent engine: Throttle web seed connections to maximum of 4
+
+Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
+
 ## v0.2.0 - 2016-03-29

-Added
+### Added
+
 - Minimise to tray (Windows, Linux)
 - Show spinner and download speed when player is stalled waiting for data
 - Highlight window on drag-and-drop
@@ -10,11 +73,13 @@ Added
  - We have an auto-updater for Windows and Mac. We don't have one for Linux yet, so
    Linux users need to download new versions manually.

-Changed
+### Changed
+
 - Renamed WebTorrent.app to WebTorrent Desktop
 - Add Cosmos Laundromat as a default torrent

-Fixed
+### Fixed
+
 - Only capture media keys when player is active
 - Update WebTorrent to 0.88.1 for performance improvements
  - When seeding, do not proactively connect to new peers
@@ -74,7 +139,7 @@ Windows, and Linux. For now, we're only releasing binaries for OS X.

 WebTorrent Desktop is in ALPHA and under very active development – expect lots more polish in
 the coming weeks! If you know JavaScript and want to help us out, there's
-[lots to do](https://github.com/feross/webtorrent-app/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
+[lots to do](https://github.com/feross/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!

 ### Features

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,44 +4,72 @@ Contributions welcome!

 **Before spending lots of time on something, ask for feedback on your idea first!**

-Please search issues and pull requests before adding something new to avoid duplicating efforts and conversations.
+Please search issues and pull requests before adding something new to avoid duplicating
+efforts and conversations.

-This project welcomes non-code contributions, too! The following types of contributions are welcome:
+This project welcomes non-code contributions, too! The following types of contributions
+are welcome:

 - **Ideas**: participate in an issue thread or start your own to have your voice heard.
- **Writing**: contribute your expertise in an area by helping expand the included content.
- **Copy editing**: fix typos, clarify language, and generally improve the quality of the content.
- **Formatting**: help keep content easy to read with consistent formatting.
+- **Writing**: contribute your expertise in an area by helping expand the included docs.
+- **Copy editing**: fix typos, clarify language, and improve the quality of the docs.
+- **Formatting**: help keep docs easy to read with consistent formatting.

 ## Code Style

 [![standard][standard-image]][standard-url]

-This repository uses [`standard`][standard-url] to maintain code style and consistency, and to avoid style arguments. `npm test` runs `standard` automatically, so you don't have to!
+This repository uses [`standard`][standard-url] to maintain code style and consistency,
+and to avoid style arguments. `npm test` runs `standard` automatically, so you don't have
+to!

 [standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
 [standard-url]: https://github.com/feross/standard

-# Project Governance
+## Project Governance

-**This is an [OPEN Open Source Project](http://openopensource.org/).**
+Individuals making significant and valuable contributions are given commit-access to the
+project to contribute as they see fit. This project is more like an open wiki than a
+standard guarded open source project.

-Individuals making significant and valuable contributions are given commit-access to the project to contribute as they see fit. This project is more like an open wiki than a standard guarded open source project.
-
-## Rules
+### Rules

 There are a few basic ground-rules for contributors:

 1. **No `--force` pushes** or modifying the Git history in any way.
-1. **Non-master branches** ought to be used for ongoing work.
-1. **External API changes and significant modifications** ought to be subject to an **internal pull-request** to solicit feedback from other contributors.
-1. Internal pull-requests to solicit feedback are *encouraged* for any other non-trivial contribution but left to the discretion of the contributor.
-1. Contributors should attempt to adhere to the prevailing code style.
+2. **Non-master branches** should be used for ongoing work.
+3. **Significant modifications** like API changes should be subject to a **pull request**
+   to solicit feedback from other contributors.
+4. **Pull requests** are *encouraged* for all contributions to solicit feedback, but left to
+   the discretion of the contributor.

-## Releases
+### Releases

 Declaring formal releases remains the prerogative of the project maintainer.

-## Changes to this arrangement
+### Changes to this arrangement

-This is an experiment and feedback is welcome! This document may also be subject to pull-requests or changes by contributors where you believe you have something valuable to add or change.
+This is an experiment and feedback is welcome! This document may also be subject to pull-
+requests or changes by contributors where you believe you have something valuable to add
+or change.
+
+## Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+- (a) The contribution was created in whole or in part by me and I have the right to
+  submit it under the open source license indicated in the file; or
+
+- (b) The contribution is based upon previous work that, to the best of my knowledge, is
+  covered under an appropriate open source license and I have the right under that license
+  to submit that work with modifications, whether created in whole or in part by me, under
+  the same open source license (unless I am permitted to submit under a different
+  license), as indicated in the file; or
+
+- (c) The contribution was provided directly to me by some other person who certified
+  (a), (b) or (c) and I have not modified it.
+
+- (d) I understand and agree that this project and the contribution are public and that a
+  record of the contribution (including all personal information I submit with it,
+  including my sign-off) is maintained indefinitely and may be redistributed consistent
+  with this project or the open source license(s) involved.
--- a/README.md
+++ b/README.md
@@ -10,23 +10,14 @@
 <h4 align="center">The streaming torrent client. For OS X, Windows, and Linux.</h4>

 <p align="center">
-    <a href="https://gitter.im/feross/webtorrent">
-        <img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg"
-             alt="Gitter">
-    </a>
-    <a href="https://travis-ci.org/feross/webtorrent-app">
-        <img src="https://img.shields.io/travis/feross/webtorrent-app/master.svg"
-             alt="Travis Build">
-    </a>
-    <a href="https://github.com/feross/webtorrent-app/releases">
-        <img src="https://img.shields.io/github/release/feross/webtorrent-app.svg"
-             alt="Latest Release Version">
-    </a>
+  <a href="https://gitter.im/feross/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="Gitter"></a>
+  <a href="https://travis-ci.org/feross/webtorrent-desktop"><img src="https://img.shields.io/travis/feross/webtorrent-desktop/master.svg" alt="Travis"></a>
+  <a href="https://github.com/feross/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/feross/webtorrent-desktop.svg" alt="Release"></a>
 </p>

 ## Install

-**WebTorrent Desktop** is still under very active development. You can download the latest version from the [releases](https://github.com/feross/webtorrent-app/releases) page.
+**WebTorrent Desktop** is still under very active development. You can download the latest version from the [releases](https://github.com/feross/webtorrent-desktop/releases) page.

 ## Screenshot

@@ -59,10 +50,12 @@ $ npm run package
 To build for one platform:

 ```
-$ npm run package -- [platform]
+$ npm run package -- [platform] [package-type]
 ```

-Where `[platform]` is `darwin`, `linux`, or `win32`.
+Where `[platform]` is `darwin`, `linux`, or `win32`
+
+and `[package-type]` is `all` (default), `deb` or `zip` (`linux` platform only)

 #### Windows build notes

@@ -84,4 +77,3 @@ brew install wine
 ## License

 MIT. Copyright (c) [Feross Aboukhadijeh](http://feross.org).
-
--- a/bin/clean.js
+++ b/bin/clean.js
@@ -5,13 +5,18 @@
 * Useful for developers.
 */

-var config = require('../config')
 var os = require('os')
 var path = require('path')
 var pathExists = require('path-exists')
 var rimraf = require('rimraf')

+var config = require('../config')
+var handlers = require('../main/handlers')
+
 rimraf.sync(config.CONFIG_PATH)

 var tmpPath = path.join(pathExists.sync('/tmp') ? '/tmp' : os.tmpDir(), 'webtorrent')
 rimraf.sync(tmpPath)
+
+// Uninstall .torrent file and magnet link handlers
+handlers.uninstall()
--- a/bin/package.js
+++ b/bin/package.js
@@ -16,18 +16,19 @@ var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION

 function build () {
  var platform = process.argv[2]
+  var packageType = process.argv.length > 3 ? process.argv[3] : 'all'
  if (platform === 'darwin') {
    buildDarwin(printDone)
  } else if (platform === 'win32') {
    buildWin32(printDone)
  } else if (platform === 'linux') {
-    buildLinux(printDone)
+    buildLinux(packageType, printDone)
  } else {
    buildDarwin(function (err, buildPath) {
      printDone(err, buildPath)
      buildWin32(function (err, buildPath) {
        printDone(err, buildPath)
-        buildLinux(printDone)
+        buildLinux(packageType, printDone)
      })
    })
  }
@@ -63,7 +64,7 @@ var all = {

  // Pattern which specifies which files to ignore when copying files to create the
  // package(s).
-  ignore: /^\/dist|\/(appveyor.yml|.appveyor.yml|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
+  ignore: /^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,

  // The application name.
  name: config.APP_NAME,
@@ -114,7 +115,7 @@ var win32 = {
    // Original name of the file, not including a path. This information enables an
    // application to determine whether a file has been renamed by a user. The format of
    // the name depends on the file system for which the file was created.
-    OriginalFilename: 'WebTorrent.exe',
+    OriginalFilename: config.APP_NAME + '.exe',

    // Name of the product with which the file is distributed.
    ProductName: config.APP_NAME,
@@ -206,13 +207,11 @@ function buildDarwin (cb) {
        verbose: true
      }

-      // TODO: Use the built-in `sign` opt to electron-packager that takes an options
-      // object as of v6.
      sign(signOpts, function (err) {
        if (err) return cb(err)

        // Create .zip file (used by the auto-updater)
-        var zipPath = path.join(config.ROOT_PATH, 'dist', BUILD_NAME + '.zip')
+        var zipPath = path.join(config.ROOT_PATH, 'dist', BUILD_NAME + '-darwin.zip')
        cp.execSync(`cd ${buildPath[0]} && zip -r -y ${zipPath} ${config.APP_NAME + '.app'}`)
        console.log('Created OS X .zip file.')

@@ -263,21 +262,23 @@ function buildWin32 (cb) {

    console.log('Creating Windows installer...')
    installer.createWindowsInstaller({
-      name: config.APP_NAME,
-      productName: config.APP_NAME,
-      title: config.APP_NAME,
-      exe: config.APP_NAME + '.exe',
-
      appDirectory: buildPath[0],
-      outputDirectory: path.join(config.ROOT_PATH, 'dist'),
-      version: pkg.version,
-      description: config.APP_NAME,
      authors: config.APP_TEAM,
-      iconUrl: config.APP_ICON + '.ico',
-      setupIcon: config.APP_ICON + '.ico',
      // certificateFile: '', // TODO
+      description: config.APP_NAME,
+      exe: config.APP_NAME + '.exe',
+      iconUrl: config.GITHUB_URL_RAW + '/static/' + config.APP_NAME + '.ico',
+      loadingGif: path.join(config.STATIC_PATH, 'loading.gif'),
+      remoteReleases: config.GITHUB_URL,
+      name: config.APP_NAME,
+      noMsi: true,
+      outputDirectory: path.join(config.ROOT_PATH, 'dist'),
+      productName: config.APP_NAME,
+      setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
+      setupIcon: config.APP_ICON + '.ico',
+      title: config.APP_NAME,
      usePackageJson: false,
-      loadingGif: path.join(config.STATIC_PATH, 'loading.gif')
+      version: pkg.version
    }).then(function () {
      console.log('Created Windows installer.')
      cb(null, buildPath)
@@ -285,16 +286,47 @@ function buildWin32 (cb) {
  })
 }

-function buildLinux (cb) {
+function buildLinux (packageType, cb) {
  electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
    if (err) return cb(err)

-    // Create .zip file for Linux
    var distPath = path.join(config.ROOT_PATH, 'dist')
-    var zipPath = path.join(config.ROOT_PATH, 'dist', BUILD_NAME + '-linux.zip')
-    var appFolderName = path.basename(buildPath[0])
-    cp.execSync(`cd ${distPath} && zip -r -y ${zipPath} ${appFolderName}`)
-    console.log('Created Linux .zip file.')
+    var filesPath = buildPath[0]
+
+    if (packageType === 'deb' || packageType === 'all') {
+      // Create .deb file for debian based platforms
+      var deb = require('nobin-debian-installer')()
+      var destPath = path.join('/opt', pkg.name)
+
+      deb.pack({
+        package: pkg,
+        info: {
+          arch: 'amd64',
+          targetDir: distPath,
+          depends: 'libc6 (>= 2.4)',
+          scripts: {
+            postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
+            prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
+          }
+        }
+      }, [{
+        src: ['./**'],
+        dest: destPath,
+        expand: true,
+        cwd: filesPath
+      }], function (err, done) {
+        if (err) return console.error(err.message || err)
+        console.log('Created Linux .deb file.')
+      })
+    }
+
+    if (packageType === 'zip' || packageType === 'all') {
+      // Create .zip file for Linux
+      var zipPath = path.join(config.ROOT_PATH, 'dist', BUILD_NAME + '-linux.zip')
+      var appFolderName = path.basename(filesPath)
+      cp.execSync(`cd ${distPath} && zip -r -y ${zipPath} ${appFolderName}`)
+      console.log('Created Linux .zip file.')
+    }
  })
 }

--- a/bin/release-_post.sh
+++ b/bin/release-_post.sh
@@ -5,4 +5,5 @@ git diff --exit-code
 npm run package
 git push
 git push --tags
+npm publish
 gh-release
--- a/config.js
+++ b/config.js
@@ -14,13 +14,18 @@ module.exports = {
  APP_VERSION: APP_VERSION,
  APP_WINDOW_TITLE: APP_NAME + ' (BETA)',

-  AUTO_UPDATE_URL: 'https://webtorrent.io/app/update?version=' + APP_VERSION,
+  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update?version=' + APP_VERSION,
  AUTO_UPDATE_CHECK_STARTUP_DELAY: 5 * 1000 /* 5 seconds */,

+  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
+
  CONFIG_PATH: applicationConfigPath(APP_NAME),
  CONFIG_POSTER_PATH: path.join(applicationConfigPath(APP_NAME), 'Posters'),
  CONFIG_TORRENT_PATH: path.join(applicationConfigPath(APP_NAME), 'Torrents'),

+  GITHUB_URL: 'https://github.com/feross/webtorrent-desktop',
+  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/feross/webtorrent-desktop/master',
+
  IS_PRODUCTION: isProduction(),

  ROOT_PATH: __dirname,
@@ -60,6 +65,7 @@ module.exports = {
  },

  WINDOW_ABOUT: 'file://' + path.join(__dirname, 'renderer', 'about.html'),
+  WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, 'renderer', 'webtorrent.html'),
  WINDOW_MAIN: 'file://' + path.join(__dirname, 'renderer', 'main.html')
 }

--- a/crash-reporter.js
+++ b/crash-reporter.js
@@ -0,0 +1,15 @@
+module.exports = {
+  init
+}
+
+var config = require('./config')
+var electron = require('electron')
+
+function init () {
+  electron.crashReporter.start({
+    companyName: config.APP_NAME,
+    productName: config.APP_NAME,
+    submitURL: config.CRASH_REPORT_URL
+  })
+  console.log('crash reporter started')
+}
--- a/main/handlers.js
+++ b/main/handlers.js
@@ -1,43 +1,265 @@
 module.exports = {
-  init
+  install,
+  uninstall
 }

 var path = require('path')

-var log = require('./log')
-
-function init () {
+function install () {
+  if (process.platform === 'darwin') {
+    installDarwin()
+  }
  if (process.platform === 'win32') {
-    initWindows()
+    installWin32()
  }
  if (process.platform === 'linux') {
-    initLinux()
+    installLinux()
  }
 }

-function initWindows () {
-  var iconPath = path.join(process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico')
-  registerProtocolHandlerWin32('magnet', 'URL:BitTorrent Magnet URL', iconPath, process.execPath)
-  registerFileHandlerWin32('.torrent', 'io.webtorrent.torrent', 'BitTorrent Document', iconPath, process.execPath)
+function uninstall () {
+  if (process.platform === 'darwin') {
+    uninstallDarwin()
+  }
+  if (process.platform === 'win32') {
+    uninstallWin32()
+  }
+  if (process.platform === 'linux') {
+    uninstallLinux()
+  }
 }

-function initLinux () {
-  var config = require('../config')
+function installDarwin () {
+  var electron = require('electron')
+  var app = electron.app
+
+  // On OS X, only protocols that are listed in Info.plist can be set as the default
+  // handler at runtime.
+  app.setAsDefaultProtocolClient('magnet')
+
+  // File handlers are registered in the Info.plist.
+}
+
+function uninstallDarwin () {}
+
+function installWin32 () {
+  var Registry = require('winreg')
+
+  var log = require('./log')
+
+  var iconPath = path.join(process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico')
+
+  registerProtocolHandlerWin32('magnet', 'URL:BitTorrent Magnet URL', iconPath, process.execPath)
+  registerFileHandlerWin32('.torrent', 'io.webtorrent.torrent', 'BitTorrent Document', iconPath, process.execPath)
+
+  /**
+   * To add a protocol handler, the following keys must be added to the Windows registry:
+   *
+   * HKEY_CLASSES_ROOT
+   *   $PROTOCOL
+   *     (Default) = "$NAME"
+   *     URL Protocol = ""
+   *     DefaultIcon
+   *       (Default) = "$ICON"
+   *     shell
+   *       open
+   *         command
+   *           (Default) = "$COMMAND" "%1"
+   *
+   * Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
+   *
+   * However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
+   * So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
+   * "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
+   */
+
+  function registerProtocolHandlerWin32 (protocol, name, icon, command) {
+    var protocolKey = new Registry({
+      hive: Registry.HKCU, // HKEY_CURRENT_USER
+      key: '\\Software\\Classes\\' + protocol
+    })
+
+    setProtocol()
+
+    function setProtocol (err) {
+      if (err) log.error(err.message)
+      protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
+    }
+
+    function setURLProtocol (err) {
+      if (err) log.error(err.message)
+      protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
+    }
+
+    function setIcon (err) {
+      if (err) log.error(err.message)
+
+      var iconKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
+      })
+      iconKey.set('', Registry.REG_SZ, icon, setCommand)
+    }
+
+    function setCommand (err) {
+      if (err) log.error(err.message)
+
+      var commandKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+      })
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
+    }
+
+    function done (err) {
+      if (err) log.error(err.message)
+    }
+  }
+
+  /**
+   * To add a file handler, the following keys must be added to the Windows registry:
+   *
+   * HKEY_CLASSES_ROOT
+   *   $EXTENSION
+   *     (Default) = "$EXTENSION_ID"
+   *   $EXTENSION_ID
+   *     (Default) = "$NAME"
+   *     DefaultIcon
+   *       (Default) = "$ICON"
+   *     shell
+   *       open
+   *         command
+   *           (Default) = "$COMMAND" "%1"
+   */
+  function registerFileHandlerWin32 (ext, id, name, icon, command) {
+    setExt()
+
+    function setExt () {
+      var extKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + ext
+      })
+      extKey.set('', Registry.REG_SZ, id, setId)
+    }
+
+    function setId (err) {
+      if (err) log.error(err.message)
+
+      var idKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + id
+      })
+      idKey.set('', Registry.REG_SZ, name, setIcon)
+    }
+
+    function setIcon (err) {
+      if (err) log.error(err.message)
+
+      var iconKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
+      })
+      iconKey.set('', Registry.REG_SZ, icon, setCommand)
+    }
+
+    function setCommand (err) {
+      if (err) log.error(err.message)
+
+      var commandKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
+      })
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
+    }
+
+    function done (err) {
+      if (err) log.error(err.message)
+    }
+  }
+}
+
+function uninstallWin32 () {
+  var Registry = require('winreg')
+
+  unregisterProtocolHandlerWin32('magnet', process.execPath)
+  unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', process.execPath)
+
+  function unregisterProtocolHandlerWin32 (protocol, command) {
+    getCommand()
+
+    function getCommand () {
+      var commandKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+      })
+      commandKey.get('', function (err, item) {
+        if (!err && item.value.indexOf(command) >= 0) {
+          eraseProtocol()
+        }
+      })
+    }
+
+    function eraseProtocol () {
+      var protocolKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol
+      })
+      protocolKey.erase(function () {})
+    }
+  }
+
+  function unregisterFileHandlerWin32 (ext, id, command) {
+    eraseId()
+
+    function eraseId () {
+      var idKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + id
+      })
+      idKey.erase(getExt)
+    }
+
+    function getExt () {
+      var extKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + ext
+      })
+      extKey.get('', function (err, item) {
+        if (!err && item.value === id) {
+          eraseExt()
+        }
+      })
+    }
+
+    function eraseExt () {
+      var extKey = new Registry({
+        hive: Registry.HKCU, // HKEY_CURRENT_USER
+        key: '\\Software\\Classes\\' + ext
+      })
+      extKey.erase(function () {})
+    }
+  }
+}
+
+function installLinux () {
  var fs = require('fs')
  var mkdirp = require('mkdirp')
  var os = require('os')
  var path = require('path')

+  var config = require('../config')
+  var log = require('./log')
+
  installDesktopFile()
  installIconFile()

  function installDesktopFile () {
-    var templatePath = path.join(config.STATIC_PATH, 'webtorrent.desktop')
+    var templatePath = path.join(config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop')
    fs.readFile(templatePath, 'utf8', writeDesktopFile)
  }

  function writeDesktopFile (err, desktopFile) {
-    if (err) return console.error(err.message)
+    if (err) return log.error(err.message)

    var appPath = config.IS_PRODUCTION ? path.dirname(process.execPath) : config.ROOT_PATH
    var execPath = process.execPath + (config.IS_PRODUCTION ? '' : ' \.')
@@ -53,11 +275,11 @@ function initLinux () {
      '.local',
      'share',
      'applications',
-      'webtorrent.desktop'
+      'webtorrent-desktop.desktop'
    )
    mkdirp(path.dirname(desktopFilePath))
    fs.writeFile(desktopFilePath, desktopFile, function (err) {
-      if (err) return console.error(err.message)
+      if (err) return log.error(err.message)
    })
  }

@@ -67,99 +289,42 @@ function initLinux () {
  }

  function writeIconFile (err, iconFile) {
-    if (err) return console.error(err.message)
+    if (err) return log.error(err.message)

    var iconFilePath = path.join(
      os.homedir(),
      '.local',
      'share',
      'icons',
-      'webtorrent.png'
+      'webtorrent-desktop.png'
    )
    mkdirp(path.dirname(iconFilePath))
    fs.writeFile(iconFilePath, iconFile, function (err) {
-      if (err) return console.error(err.message)
+      if (err) return log.error(err.message)
    })
  }
 }

-/**
- * To add a protocol handler on Windows, the following keys must be added to the Windows
- * registry:
- *
- * HKEY_CLASSES_ROOT
- *   $PROTOCOL
- *     (Default) = "$NAME"
- *     URL Protocol = ""
- *     DefaultIcon
- *       (Default) = "$ICON"
- *     shell
- *       open
- *         command
- *           (Default) = "$COMMAND" "%1"
- *
- * Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
- *
- * However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
- * So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
- * "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
- */
+function uninstallLinux () {
+  var os = require('os')
+  var path = require('path')
+  var rimraf = require('rimraf')

-function registerProtocolHandlerWin32 (protocol, name, icon, command) {
-  var Registry = require('winreg')
+  var desktopFilePath = path.join(
+    os.homedir(),
+    '.local',
+    'share',
+    'applications',
+    'webtorrent-desktop.desktop'
+  )
+  rimraf.sync(desktopFilePath)

-  var protocolKey = new Registry({
-    hive: Registry.HKCU, // HKEY_CURRENT_USER
-    key: '\\Software\\Classes\\' + protocol
-  })
-  protocolKey.set('', Registry.REG_SZ, name, callback)
-  protocolKey.set('URL Protocol', Registry.REG_SZ, '', callback)
-
-  var iconKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
-  })
-  iconKey.set('', Registry.REG_SZ, icon, callback)
-
-  var commandKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
-  })
-  commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', callback)
-
-  function callback (err) {
-    if (err) log.error(err.message || err)
-  }
-}
-
-function registerFileHandlerWin32 (ext, id, name, icon, command) {
-  var Registry = require('winreg')
-
-  var extKey = new Registry({
-    hive: Registry.HKCU, // HKEY_CURRENT_USER
-    key: '\\Software\\Classes\\' + ext
-  })
-  extKey.set('', Registry.REG_SZ, id, callback)
-
-  var idKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + id
-  })
-  idKey.set('', Registry.REG_SZ, name, callback)
-
-  var iconKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
-  })
-  iconKey.set('', Registry.REG_SZ, icon, callback)
-
-  var commandKey = new Registry({
-    hive: Registry.HKCU,
-    key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
-  })
-  commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', callback)
-
-  function callback (err) {
-    if (err) log.error(err.message || err)
-  }
+  var iconFilePath = path.join(
+    os.homedir(),
+    '.local',
+    'share',
+    'icons',
+    'webtorrent-desktop.png'
+  )
+  rimraf.sync(iconFilePath)
 }
--- a/main/index.js
+++ b/main/index.js
@@ -1,9 +1,11 @@
 var electron = require('electron')

 var app = electron.app
+var ipcMain = electron.ipcMain

 var autoUpdater = require('./auto-updater')
 var config = require('../config')
+var crashReporter = require('../crash-reporter')
 var handlers = require('./handlers')
 var ipc = require('./ipc')
 var log = require('./log')
@@ -45,16 +47,17 @@ function init () {
  ipc.init()

  app.on('will-finish-launching', function () {
+    crashReporter.init()
    autoUpdater.init()
-    setupCrashReporter()
  })

  app.on('ready', function () {
    menu.init()
    windows.createMainWindow()
+    windows.createWebTorrentHiddenWindow()
    shortcuts.init()
    tray.init()
-    if (process.platform !== 'win32') handlers.init()
+    handlers.install()
  })

  app.on('ipcReady', function () {
@@ -62,8 +65,14 @@ function init () {
    processArgv(argv)
  })

-  app.on('before-quit', function () {
+  app.on('before-quit', function (e) {
+    if (app.isQuitting) return
+
    app.isQuitting = true
+    e.preventDefault()
+    windows.main.send('dispatch', 'saveState') /* try to save state on exit */
+    ipcMain.once('savedState', () => app.quit())
+    setTimeout(() => app.quit(), 2000) /* quit after 2 secs, at most */
  })

  app.on('activate', function () {
@@ -105,28 +114,18 @@ function sliceArgv (argv) {
 }

 function processArgv (argv) {
-  argv.forEach(function (argvi) {
-    switch (argvi) {
-      case '-n':
-        windows.main.send('dispatch', 'showCreateTorrent')
-        break
-      case '-o':
-        windows.main.send('dispatch', 'showOpenTorrentFile')
-        break
-      case '-u':
-        windows.main.send('showOpenTorrentAddress')
-        break
-      default:
-        windows.main.send('dispatch', 'onOpen', argvi)
+  argv.forEach(function (arg) {
+    if (arg === '-n') {
+      windows.main.send('dispatch', 'showCreateTorrent')
+    } else if (arg === '-o') {
+      windows.main.send('dispatch', 'showOpenTorrentFile')
+    } else if (arg === '-u') {
+      windows.main.send('showOpenTorrentAddress')
+    } else if (arg.startsWith('-psn')) {
+      // Ignore OS X launchd "process serial number" argument
+      // More: https://github.com/feross/webtorrent-desktop/issues/214
+    } else {
+      windows.main.send('dispatch', 'onOpen', arg)
    }
  })
 }
-
-function setupCrashReporter () {
-  // require('crash-reporter').start({
-  //   productName: 'WebTorrent',
-  //   companyName: 'WebTorrent',
-  //   submitURL: 'https://webtorrent.io/crash-report',
-  //   autoSubmit: true
-  // })
-}
--- a/main/ipc.js
+++ b/main/ipc.js
@@ -2,7 +2,6 @@ module.exports = {
  init
 }

-var debug = require('debug')('webtorrent-app:ipcMain')
 var electron = require('electron')

 var app = electron.app
@@ -21,10 +20,19 @@ function init () {
  ipcMain.on('ipcReady', function (e) {
    app.ipcReady = true
    app.emit('ipcReady')
-    setTimeout(function () {
-      windows.main.show()
-      console.timeEnd('init')
-    }, 50)
+    windows.main.show()
+    console.timeEnd('init')
+  })
+
+  var messageQueueMainToWebTorrent = []
+  ipcMain.on('ipcReadyWebTorrent', function (e) {
+    app.ipcReadyWebTorrent = true
+    log('sending %d queued messages from the main win to the webtorrent window',
+      messageQueueMainToWebTorrent.length)
+    messageQueueMainToWebTorrent.forEach(function (message) {
+      windows.webtorrent.send(message.name, ...message.args)
+      log('webtorrent: sent queued %s', message.name)
+    })
  })

  ipcMain.on('showOpenTorrentFile', menu.showOpenTorrentFile)
@@ -70,19 +78,60 @@ function init () {
    menu.onPlayerClose()
    shortcuts.unregisterPlayerShortcuts()
  })
+
+  ipcMain.on('focusWindow', function (e, windowName) {
+    windows.focusWindow(windows[windowName])
+  })
+
+  // Capture all events
+  var oldEmit = ipcMain.emit
+  ipcMain.emit = function (name, e, ...args) {
+    // Relay messages between the main window and the WebTorrent hidden window
+    if (name.startsWith('wt-')) {
+      if (e.sender.browserWindowOptions.title === 'webtorrent-hidden-window') {
+        // Send message to main window
+        windows.main.send(name, ...args)
+        log('webtorrent: got %s', name)
+      } else if (app.ipcReadyWebTorrent) {
+        // Send message to webtorrent window
+        windows.webtorrent.send(name, ...args)
+        log('webtorrent: sent %s', name)
+      } else {
+        // Queue message for webtorrent window, it hasn't finished loading yet
+        messageQueueMainToWebTorrent.push({
+          name: name,
+          args: args
+        })
+        log('webtorrent: queueing %s', name)
+      }
+      return
+    }
+
+    // Emit all other events normally
+    oldEmit.call(ipcMain, name, e, ...args)
+  }
 }

 function setBounds (bounds, maximize) {
  // Do nothing in fullscreen
-  if (!windows.main || windows.main.isFullScreen()) return
+  if (!windows.main || windows.main.isFullScreen()) {
+    log('setBounds: not setting bounds because we\'re in full screen')
+    return
+  }

  // Maximize or minimize, if the second argument is present
  var willBeMaximized
  if (maximize === true) {
-    if (!windows.main.isMaximized()) windows.main.maximize()
+    if (!windows.main.isMaximized()) {
+      log('setBounds: maximizing')
+      windows.main.maximize()
+    }
    willBeMaximized = true
  } else if (maximize === false) {
-    if (windows.main.isMaximized()) windows.main.unmaximize()
+    if (windows.main.isMaximized()) {
+      log('setBounds: unmaximizing')
+      windows.main.unmaximize()
+    }
    willBeMaximized = false
  } else {
    willBeMaximized = windows.main.isMaximized()
@@ -90,12 +139,15 @@ function setBounds (bounds, maximize) {

  // Assuming we're not maximized or maximizing, set the window size
  if (!willBeMaximized) {
+    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
    windows.main.setBounds(bounds, true)
+  } else {
+    log('setBounds: not setting bounds because of window maximization')
  }
 }

 function setAspectRatio (aspectRatio, extraSize) {
-  debug('setAspectRatio %o %o', aspectRatio, extraSize)
+  log('setAspectRatio %o %o', aspectRatio, extraSize)
  if (windows.main) {
    windows.main.setAspectRatio(aspectRatio, extraSize)
  }
@@ -103,13 +155,13 @@ function setAspectRatio (aspectRatio, extraSize) {

 // Display string in dock badging area (OS X)
 function setBadge (text) {
-  debug('setBadge %s', text)
+  log('setBadge %s', text)
  if (app.dock) app.dock.setBadge(String(text))
 }

 // Show progress bar. Valid range is [0, 1]. Remove when < 0; indeterminate when > 1.
 function setProgress (progress) {
-  debug('setProgress %s', progress)
+  log('setProgress %s', progress)
  if (windows.main) {
    windows.main.setProgressBar(progress)
  }
@@ -117,12 +169,12 @@ function setProgress (progress) {

 function blockPowerSave () {
  powerSaveBlockID = powerSaveBlocker.start('prevent-display-sleep')
-  debug('blockPowerSave %d', powerSaveBlockID)
+  log('blockPowerSave %d', powerSaveBlockID)
 }

 function unblockPowerSave () {
  if (powerSaveBlocker.isStarted(powerSaveBlockID)) {
    powerSaveBlocker.stop(powerSaveBlockID)
-    debug('unblockPowerSave %d', powerSaveBlockID)
+    log('unblockPowerSave %d', powerSaveBlockID)
  }
 }
--- a/main/menu.js
+++ b/main/menu.js
@@ -10,12 +10,12 @@ module.exports = {
  toggleFullScreen
 }

-var debug = require('debug')('webtorrent-app:menu')
 var electron = require('electron')

 var app = electron.app

 var config = require('../config')
+var log = require('./log')
 var windows = require('./windows')

 var appMenu, dockMenu
@@ -29,7 +29,7 @@ function init () {
 }

 function toggleFullScreen (flag) {
-  debug('toggleFullScreen %s', flag)
+  log('toggleFullScreen %s', flag)
  if (windows.main && windows.main.isVisible()) {
    flag = flag != null ? flag : !windows.main.isFullScreen()
    windows.main.setFullScreen(flag)
@@ -38,7 +38,7 @@ function toggleFullScreen (flag) {

 // Sets whether the window should always show on top of other windows
 function toggleFloatOnTop (flag) {
-  debug('toggleFloatOnTop %s', flag)
+  log('toggleFloatOnTop %s', flag)
  if (windows.main) {
    flag = flag != null ? flag : !windows.main.isAlwaysOnTop()
    windows.main.setAlwaysOnTop(flag)
@@ -59,32 +59,30 @@ function decreaseVolume () {
 }

 function toggleDevTools () {
-  debug('toggleDevTools')
+  log('toggleDevTools')
  if (windows.main) {
    windows.main.toggleDevTools()
  }
 }

-function reloadWindow () {
-  debug('reloadWindow')
-  if (windows.main) {
-    windows.main.webContents.reloadIgnoringCache()
-  }
+function showWebTorrentWindow () {
+  windows.webtorrent.show()
+  windows.webtorrent.webContents.openDevTools({ detach: true })
 }

 function addFakeDevice (device) {
-  debug('addFakeDevice %s', device)
+  log('addFakeDevice %s', device)
  windows.main.send('addFakeDevice', device)
 }

 function onWindowShow () {
-  debug('onWindowShow')
+  log('onWindowShow')
  getMenuItem('Full Screen').enabled = true
  getMenuItem('Float on Top').enabled = true
 }

 function onWindowHide () {
-  debug('onWindowHide')
+  log('onWindowHide')
  getMenuItem('Full Screen').enabled = false
  getMenuItem('Float on Top').enabled = false
 }
@@ -117,12 +115,17 @@ function getMenuItem (label) {

 // Prompts the user for a file or folder, then makes a torrent out of the data
 function showCreateTorrent () {
+  // Allow only a single selection
+  // To create a multi-file torrent, the user must select a folder
  electron.dialog.showOpenDialog({
    title: 'Select a file or folder for the torrent file.',
-    properties: [ 'openFile', 'openDirectory', 'multiSelections' ]
+    properties: [ 'openFile', 'openDirectory' ]
  }, function (filenames) {
    if (!Array.isArray(filenames)) return
-    windows.main.send('dispatch', 'seed', filenames)
+    var options = {
+      files: filenames[0]
+    }
+    windows.main.send('dispatch', 'createTorrent', options)
  })
 }

@@ -130,6 +133,7 @@ function showCreateTorrent () {
 function showOpenTorrentFile () {
  electron.dialog.showOpenDialog(windows.main, {
    title: 'Select a .torrent file to open.',
+    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
    properties: [ 'openFile', 'multiSelections' ]
  }, function (filenames) {
    if (!Array.isArray(filenames)) return
@@ -145,36 +149,44 @@ function showOpenTorrentAddress () {
 }

 function getAppMenuTemplate () {
+  var fileMenu = [
+    {
+      label: 'Create New Torrent...',
+      accelerator: 'CmdOrCtrl+N',
+      click: showCreateTorrent
+    },
+    {
+      label: 'Open Torrent File...',
+      accelerator: 'CmdOrCtrl+O',
+      click: showOpenTorrentFile
+    },
+    {
+      label: 'Open Torrent Address...',
+      accelerator: 'CmdOrCtrl+U',
+      click: showOpenTorrentAddress
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: process.platform === 'windows' ? 'Close' : 'Close Window',
+      accelerator: 'CmdOrCtrl+W',
+      role: 'close'
+    }
+  ]
+
+  // File > Quit for Linux users with distros where the system tray is broken
+  if (process.platform === 'linux') {
+    fileMenu.push({
+      label: 'Quit',
+      click: () => app.quit()
+    })
+  }
+
  var template = [
    {
      label: 'File',
-      submenu: [
-        {
-          label: 'Create New Torrent...',
-          accelerator: 'CmdOrCtrl+N',
-          click: showCreateTorrent
-        },
-        {
-          label: 'Open Torrent File...',
-          accelerator: 'CmdOrCtrl+O',
-          click: showOpenTorrentFile
-        },
-        {
-          label: 'Open Torrent Address...',
-          accelerator: 'CmdOrCtrl+U',
-          click: showOpenTorrentAddress
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: process.platform === 'darwin'
-            ? 'Close Window'
-            : 'Close',
-          accelerator: 'CmdOrCtrl+W',
-          role: 'close'
-        }
-      ]
+      submenu: fileMenu
    },
    {
      label: 'Edit',
@@ -238,11 +250,6 @@ function getAppMenuTemplate () {
        {
          label: 'Developer',
          submenu: [
-            {
-              label: 'Reload',
-              accelerator: 'CmdOrCtrl+R',
-              click: reloadWindow
-            },
            {
              label: 'Developer Tools',
              accelerator: process.platform === 'darwin'
@@ -250,6 +257,13 @@ function getAppMenuTemplate () {
                : 'Ctrl+Shift+I',
              click: toggleDevTools
            },
+            {
+              label: 'Show WebTorrent Process',
+              accelerator: process.platform === 'darwin'
+                ? 'Alt+Command+P'
+                : 'Ctrl+Shift+P',
+              click: showWebTorrentWindow
+            },
            {
              type: 'separator'
            },
@@ -286,14 +300,14 @@ function getAppMenuTemplate () {
        },
        {
          label: 'Contribute on GitHub',
-          click: () => electron.shell.openExternal('https://github.com/feross/webtorrent-app')
+          click: () => electron.shell.openExternal(config.GITHUB_URL)
        },
        {
          type: 'separator'
        },
        {
          label: 'Report an Issue...',
-          click: () => electron.shell.openExternal('https://github.com/feross/webtorrent-app/issues')
+          click: () => electron.shell.openExternal(config.GITHUB_URL + '/issues')
        }
      ]
    }
--- a/main/squirrel-win32.js
+++ b/main/squirrel-win32.js
@@ -18,17 +18,13 @@ var updateDotExe = path.join(process.execPath, '..', '..', 'Update.exe')

 function handleEvent (cmd) {
  if (cmd === '--squirrel-install') {
-    // App was installed.
-
-    // Install protocol/file handlers, desktop/start menu shortcuts.
-    handlers.init()
-
+    // App was installed. Install desktop/start menu shortcuts.
    createShortcuts(function () {
      // Ensure user sees install splash screen so they realize that Setup.exe actually
      // installed an application and isn't the application itself.
      setTimeout(function () {
        app.quit()
-      }, 5000)
+      }, 3000)
    })
    return true
  }
@@ -44,9 +40,18 @@ function handleEvent (cmd) {
  if (cmd === '--squirrel-uninstall') {
    // App was just uninstalled. Undo anything we did in the --squirrel-install and
    // --squirrel-updated handlers
-    removeShortcuts(function () {
-      app.quit()
-    })
+
+    // Uninstall .torrent file and magnet link handlers
+    handlers.uninstall()
+
+    // Remove desktop/start menu shortcuts.
+    // HACK: add a callback to handlers.uninstall() so we can remove this setTimeout
+    setTimeout(function () {
+      removeShortcuts(function () {
+        app.quit()
+      })
+    }, 1000)
+
    return true
  }

--- a/main/tray.js
+++ b/main/tray.js
@@ -4,20 +4,41 @@ module.exports = {

 var path = require('path')
 var electron = require('electron')
+
+var app = electron.app
+var Menu = electron.Menu
+var Tray = electron.Tray
+
 var windows = require('./windows')

+var trayIcon
+
 function init () {
-  // No tray icon on OSX
+  // OS X has no tray icon
  if (process.platform === 'darwin') return

-  var trayIcon = new electron.Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))
+  trayIcon = new Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))

  // On Windows, left click to open the app, right click for context menu
  // On Linux, any click (right or left) opens the context menu
  trayIcon.on('click', showApp)
-  var contextMenu = electron.Menu.buildFromTemplate([
-    { label: 'Show', click: showApp },
-    { label: 'Quit', click: quitApp }
+
+  // Show the tray context menu, and keep the available commands up to date
+  updateTrayMenu()
+  windows.main.on('show', updateTrayMenu)
+  windows.main.on('hide', updateTrayMenu)
+}
+
+function updateTrayMenu () {
+  var showHideMenuItem
+  if (windows.main.isVisible()) {
+    showHideMenuItem = { label: 'Hide to tray', click: hideApp }
+  } else {
+    showHideMenuItem = { label: 'Show', click: showApp }
+  }
+  var contextMenu = Menu.buildFromTemplate([
+    showHideMenuItem,
+    { label: 'Quit', click: () => app.quit() }
  ])
  trayIcon.setContextMenu(contextMenu)
 }
@@ -26,6 +47,6 @@ function showApp () {
  windows.main.show()
 }

-function quitApp () {
-  electron.app.quit()
+function hideApp () {
+  windows.main.hide()
 }
--- a/main/windows.js
+++ b/main/windows.js
@@ -1,9 +1,10 @@
 var windows = module.exports = {
  about: null,
  main: null,
-  createAboutWindow: createAboutWindow,
-  createMainWindow: createMainWindow,
-  focusWindow: focusWindow
+  createAboutWindow,
+  createWebTorrentHiddenWindow,
+  createMainWindow,
+  focusWindow
 }

 var electron = require('electron')
@@ -46,15 +47,42 @@ function createAboutWindow () {
  })
 }

+function createWebTorrentHiddenWindow () {
+  var win = windows.webtorrent = new electron.BrowserWindow({
+    backgroundColor: '#1E1E1E',
+    show: false,
+    center: true,
+    title: 'webtorrent-hidden-window',
+    useContentSize: true,
+    width: 150,
+    height: 150,
+    minimizable: false,
+    maximizable: false,
+    resizable: false,
+    fullscreenable: false,
+    fullscreen: false,
+    skipTaskbar: true
+  })
+  win.loadURL(config.WINDOW_WEBTORRENT)
+
+  // Prevent killing the WebTorrent process
+  win.on('close', function (e) {
+    if (!electron.app.isQuitting) {
+      e.preventDefault()
+      win.hide()
+    }
+  })
+}
+
 function createMainWindow () {
  if (windows.main) {
    return focusWindow(windows.main)
  }
  var win = windows.main = new electron.BrowserWindow({
-    backgroundColor: '#282828',
+    backgroundColor: '#1E1E1E',
    darkTheme: true, // Forces dark theme (GTK+3)
    icon: config.APP_ICON + '.png',
-    minWidth: 375,
+    minWidth: 425,
    minHeight: 38 + (120 * 2), // header height + 2 torrents
    show: false, // Hide window until DOM finishes loading
    title: config.APP_WINDOW_TITLE,
--- a/package.json
+++ b/package.json
@@ -1,12 +1,15 @@
 {
  "name": "webtorrent-desktop",
  "description": "WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.",
-  "version": "0.2.0",
+  "version": "0.3.2",
  "author": {
    "name": "Feross Aboukhadijeh",
    "email": "feross@feross.org",
    "url": "http://feross.org"
  },
+  "bin": {
+    "webtorrent-desktop": "./bin/cmd.js"
+  },
  "bugs": {
    "url": "https://github.com/feross/webtorrent-desktop/issues"
  },
@@ -14,12 +17,14 @@
    "airplay-js": "guerrerocarlos/node-airplay-js",
    "application-config": "^0.2.0",
    "application-config-path": "^0.1.0",
+    "bitfield": "^1.0.2",
    "chromecasts": "^1.8.0",
    "create-torrent": "^3.22.1",
-    "debug": "^2.2.0",
+    "deep-equal": "^1.0.1",
+    "dlnacasts": "^0.0.3",
    "drag-drop": "^2.11.0",
    "electron-localshortcut": "^0.6.0",
-    "electron-prebuilt": "0.37.2",
+    "electron-prebuilt": "0.37.5",
    "hyperx": "^2.0.2",
    "main-loop": "^3.2.0",
    "mkdirp": "^0.5.1",
@@ -27,24 +32,22 @@
    "network-address": "^1.1.0",
    "path-exists": "^2.1.0",
    "prettier-bytes": "^1.0.1",
+    "rimraf": "^2.5.2",
    "simple-get": "^2.0.0",
    "upload-element": "^1.0.1",
    "virtual-dom": "^2.1.1",
-    "webtorrent": "^0.88.1",
-    "winreg": "^1.0.1"
+    "webtorrent": "^0.90.0",
+    "winreg": "feross/node-winreg"
  },
  "devDependencies": {
    "electron-osx-sign": "^0.3.0",
    "electron-packager": "^6.0.0",
-    "electron-winstaller": "^2.0.5",
+    "electron-winstaller": "feross/windows-installer#build",
    "gh-release": "^2.0.3",
+    "nobin-debian-installer": "^0.0.8",
    "plist": "^1.2.0",
-    "rimraf": "^2.5.2",
    "standard": "^6.0.5"
  },
-  "optionalDependencies": {
-    "appdmg": "^0.3.6"
-  },
  "homepage": "https://webtorrent.io",
  "keywords": [
    "desktop",
@@ -54,6 +57,9 @@
  ],
  "license": "MIT",
  "main": "index.js",
+  "optionalDependencies": {
+    "appdmg": "^0.3.6"
+  },
  "productName": "WebTorrent",
  "repository": {
    "type": "git",
@@ -61,14 +67,10 @@
  },
  "scripts": {
    "clean": "node ./bin/clean.js",
-    "debug": "DEBUG=* electron .",
    "package": "npm install && npm prune && npm dedupe && node ./bin/package.js",
    "size": "npm run package -- darwin && du -ch dist/WebTorrent-darwin-x64 | grep total",
    "start": "electron .",
    "test": "standard",
    "update-authors": "./bin/update-authors.sh"
-  },
-  "bin": {
-    "webtorrent-desktop": "./bin/cmd.js"
  }
 }
--- a/renderer/index.css
+++ b/renderer/index.css
@@ -271,10 +271,32 @@ i:not(.disabled):hover {
  padding: 20px;
 }

+.create-torrent-modal input,
 .open-torrent-address-modal input {
  width: calc(100% - 100px)
 }

+.create-torrent-modal .torrent-attribute {
+  white-space: nowrap;
+}
+
+.create-torrent-modal .torrent-attribute>* {
+  display: inline-block;
+}
+
+.create-torrent-modal .torrent-attribute label {
+  width: 60px;
+  margin-right: 10px;
+  vertical-align: top;
+}
+
+.create-torrent-modal .torrent-attribute div {
+  font-family: Consolas, monospace;
+  white-space: nowrap;
+}
+
+
+
 /*
 * BUTTONS
 */
@@ -325,7 +347,7 @@ input {
  background: linear-gradient(to bottom right, #4B79A1, #283E51);
  background-repeat: no-repeat;
  background-size: cover;
-  background-position: 0 50%;
+  background-position: center;
  transition: -webkit-filter 0.1s ease-out;
  position: relative;
  animation: fadein .4s;
@@ -348,10 +370,15 @@ input {
  position: absolute;
  top: 20px;
  left: 20px;
-  width: calc(100% - 150px);
+  right: 20px;
+  width: calc(100% - 40px);
  text-shadow: rgba(0, 0, 0, 0.5) 0 0 4px;
 }

+.torrent:hover .metadata {
+  width: calc(100% - 150px);
+}
+
 .torrent .metadata span:not(:last-child)::after {
  content: ' — ';
 }
@@ -564,6 +591,8 @@ body.drag .app::after {
  width: 100%;
  height: 100%;
  display: flex;
+  background-size: cover;
+  background-position: center;
 }

 .player video {
@@ -646,8 +675,7 @@ body.drag .app::after {
  margin: 0 auto;
 }

-.player-controls .chromecast,
-.player-controls .airplay,
+.player-controls .device,
 .player-controls .fullscreen,
 .player-controls .back {
  display: block;
@@ -660,8 +688,7 @@ body.drag .app::after {
  float: left;
 }

-.player-controls .chromecast,
-.player-controls .airplay,
+.player-controls .device,
 .player-controls .fullscreen {
  float: right;
 }
@@ -670,14 +697,12 @@ body.drag .app::after {
  margin-right: 15px;
 }

-.player-controls .chromecast,
-.player-controls .airplay {
+.player-controls .device {
  font-size: 18px; /* make the cast icons less huge */
  margin-top: 8px !important;
 }

-.player-controls .chromecast.active,
-.player-controls .airplay.active {
+.player-controls .device.active {
  color: #9af;
 }

@@ -812,29 +837,3 @@ body.drag .app::after {
 .error-popover .error:last-child {
  border-bottom: none;
 }
-
-/*
- * MEDIA QUERIES
- */
-
-@media only screen and (min-width: 700px) {
-  body {
-    font-size: 16px;
-    line-height: 1.5em;
-  }
-  .torrent,
-  .torrent-placeholder {
-    height: 150px;
-  }
-}
-
-@media only screen and (min-width: 900px) {
-  body {
-    font-size: 18px;
-    line-height: 1.5em;
-  }
-  .torrent,
-  .torrent-placeholder {
-    height: 180px;
-  }
-}
--- a/renderer/index.js
+++ b/renderer/index.js
--- a/renderer/lib/cast.js
+++ b/renderer/lib/cast.js
@@ -1,70 +1,154 @@
-var chromecasts = require('chromecasts')()
-var airplay = require('airplay-js')
-
-var config = require('../../config')
-var state = require('../state')
-
 // The Cast module talks to Airplay and Chromecast
 // * Modifies state when things change
 // * Starts and stops casting, provides remote video controls
 module.exports = {
  init,
-  openChromecast,
-  openAirplay,
-  stopCasting,
+  open,
+  close,
  playPause,
  seek,
-  setVolume,
-  isCasting
+  setVolume
 }

+var airplay = require('airplay-js')
+var chromecasts = require('chromecasts')()
+var dlnacasts = require('dlnacasts')()
+
+var config = require('../../config')
+
+// App state. Cast modifies state.playing and state.errors in response to events
+var state
+
 // Callback to notify module users when state has changed
 var update

-function init (callback) {
+// setInterval() for updating cast status
+var statusInterval = null
+
+// Start looking for cast devices on the local network
+function init (appState, callback) {
+  state = appState
  update = callback

-  // Start polling Chromecast or Airplay, whenever we're connected
-  setInterval(() => pollCastStatus(state), 1000)
-
-  // Listen for devices: Chromecast and Airplay
+  // Listen for devices: Chromecast, DLNA and Airplay
  chromecasts.on('update', function (player) {
-    state.devices.chromecast = player
-    addChromecastEvents()
+    state.devices.chromecast = chromecastPlayer(player)
+  })
+
+  dlnacasts.on('update', function (player) {
+    state.devices.dlna = dlnaPlayer(player)
  })

  var browser = airplay.createBrowser()
  browser.on('deviceOn', function (player) {
-    state.devices.airplay = player
-    addAirplayEvents()
+    state.devices.airplay = airplayPlayer(player)
  }).start()
 }

-function addChromecastEvents () {
-  state.devices.chromecast.on('error', function (err) {
-    state.devices.chromecast.errorMessage = err.message
-    update()
-  })
-  state.devices.chromecast.on('disconnect', function () {
-    state.playing.location = 'local'
-    update()
-  })
-}
+// chromecast player implementation
+function chromecastPlayer (player) {
+  function addEvents () {
+    player.on('error', function (err) {
+      state.playing.location = 'local'
+      state.errors.push({
+        time: new Date().getTime(),
+        message: 'Could not connect to Chromecast. ' + err.message
+      })
+      update()
+    })
+    player.on('disconnect', function () {
+      state.playing.location = 'local'
+      update()
+    })
+  }

-function addAirplayEvents () {}
+  function open () {
+    var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
+    player.play(state.server.networkURL, {
+      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()
+    })
+  }

-// Update our state from the remote TV
-function pollCastStatus (state) {
-  if (state.playing.location === 'chromecast') {
-    state.devices.chromecast.status(function (err, status) {
+  function playPause (callback) {
+    if (!state.playing.isPaused) player.pause(callback)
+    else player.play(null, null, callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (err, status) {
      if (err) return console.log('error getting %s status: %o', state.playing.location, err)
      state.playing.isPaused = status.playerState === 'PAUSED'
      state.playing.currentTime = status.currentTime
      state.playing.volume = status.volume.muted ? 0 : status.volume.level
      update()
    })
-  } else if (state.playing.location === 'airplay') {
-    state.devices.airplay.status(function (status) {
+  }
+
+  function seek (time, callback) {
+    player.seek(time, callback)
+  }
+
+  function volume (volume, callback) {
+    player.volume(volume, callback)
+  }
+
+  addEvents()
+
+  return {
+    player: player,
+    open: open,
+    playPause: playPause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// airplay player implementation
+function airplayPlayer (player) {
+  function open () {
+    player.play(state.server.networkURL, 0, function (res) {
+      if (res.statusCode !== 200) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to AirPlay.'
+        })
+      } else {
+        state.playing.location = 'airplay'
+      }
+      update()
+    })
+  }
+
+  function playPause (callback) {
+    if (!state.playing.isPaused) player.rate(0, callback)
+    else player.rate(1, callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (status) {
      state.playing.isPaused = status.rate === 0
      state.playing.currentTime = status.position
      // TODO: get airplay volume, implementation needed. meanwhile set value in setVolume
@@ -73,54 +157,142 @@ function pollCastStatus (state) {
      update()
    })
  }
-}

-function openChromecast () {
-  if (state.playing.location !== 'local') {
-    throw new Error('You can\'t connect to Chromecast when already connected to another device')
+  function seek (time, callback) {
+    player.scrub(time, callback)
  }

-  state.playing.location = 'chromecast-pending'
-  var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-  state.devices.chromecast.play(state.server.networkURL, {
-    type: 'video/mp4',
-    title: config.APP_NAME + ' — ' + torrentSummary.name
-  }, function (err) {
-    state.playing.location = err ? 'local' : 'chromecast'
-    update()
-  })
-  update()
-}
-
-function openAirplay () {
-  if (state.playing.location !== 'local') {
-    throw new Error('You can\'t connect to Airplay when already connected to another device')
+  function volume (volume, callback) {
+    // TODO remove line below once we can fetch the information in status update
+    state.playing.volume = volume
+    volume = (volume - 1) * 30
+    player.volume(volume, callback)
  }

-  state.playing.location = 'airplay-pending'
-  state.devices.airplay.play(state.server.networkURL, 0, function (res) {
-    if (res.statusCode !== 200) {
+  return {
+    player: player,
+    open: open,
+    playPause: playPause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// DLNA player implementation
+function dlnaPlayer (player) {
+  function addEvents () {
+    player.on('error', function (err) {
      state.playing.location = 'local'
      state.errors.push({
        time: new Date().getTime(),
-        message: 'Couldn\'t connect to Airplay'
+        message: 'Could not connect to DLNA. ' + err.message
      })
-    } else {
-      state.playing.location = 'airplay'
+      update()
+    })
+    player.on('disconnect', function () {
+      state.playing.location = 'local'
+      update()
+    })
+  }
+
+  function open () {
+    var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
+    player.play(state.server.networkURL, {
+      type: 'video/mp4',
+      title: config.APP_NAME + ' - ' + torrentSummary.name,
+      seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
+    }, function (err) {
+      if (err) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to DLNA. ' + err.message
+        })
+      } else {
+        state.playing.location = 'dlna'
+      }
+      update()
+    })
+  }
+
+  function playPause (callback) {
+    if (!state.playing.isPaused) player.pause(callback)
+    else player.play(null, null, callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (err, status) {
+      if (err) return console.log('error getting %s status: %o', state.playing.location, err)
+      state.playing.isPaused = status.playerState === 'PAUSED'
+      state.playing.currentTime = status.currentTime
+      state.playing.volume = status.volume.level
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.seek(time, callback)
+  }
+
+  function volume (volume, callback) {
+    player.volume(volume, function (err) {
+      // quick volume update
+      state.playing.volume = volume
+      callback(err)
+    })
+  }
+
+  addEvents()
+
+  return {
+    player: player,
+    open: open,
+    playPause: playPause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// Start polling cast device state, whenever we're connected
+function startStatusInterval () {
+  statusInterval = setInterval(function () {
+    var device = getDevice()
+    if (device) {
+      device.status()
    }
-    update()
-  })
+  }, 1000)
+}
+
+function open (location) {
+  if (state.playing.location !== 'local') {
+    throw new Error('You can\'t connect to ' + location + ' when already connected to another device')
+  }
+
+  state.playing.location = location + '-pending'
+  var device = getDevice(location)
+  if (device) {
+    getDevice(location).open()
+    startStatusInterval()
+  }
+
  update()
 }

-// Stops Chromecast or Airplay, move video back to local screen
-function stopCasting () {
-  if (state.playing.location === 'chromecast') {
-    state.devices.chromecast.stop(stoppedCasting)
-  } else if (state.playing.location === 'airplay') {
-    state.devices.airplay.stop(stoppedCasting)
-  } else if (state.playing.location.endsWith('-pending')) {
-    // Connecting to Chromecast took too long or errored out. Let the user cancel
+// Stops casting, move video back to local screen
+function close () {
+  var device = getDevice()
+  if (device) {
+    device.stop(stoppedCasting)
+    clearInterval(statusInterval)
+  } else {
    stoppedCasting()
  }
 }
@@ -131,45 +303,41 @@ function stoppedCasting () {
  update()
 }

-// Checks whether we are connected and already casting
-// Returns false if we not casting (state.playing.location === 'local')
-// or if we're trying to connect but haven't yet ('chromecast-pending', etc)
-function isCasting () {
-  return state.playing.location === 'chromecast' || state.playing.location === 'airplay'
+function getDevice (location) {
+  if (location && state.devices[location]) {
+    return state.devices[location]
+  } else if (state.playing.location === 'chromecast') {
+    return state.devices.chromecast
+  } else if (state.playing.location === 'airplay') {
+    return state.devices.airplay
+  } else if (state.playing.location === 'dlna') {
+    return state.devices.dlna
+  } else {
+    return null
+  }
 }

 function playPause () {
-  var device
-  if (state.playing.location === 'chromecast') {
-    device = state.devices.chromecast
-    if (!state.playing.isPaused) device.pause(castCallback)
-    else device.play(null, null, castCallback)
-  } else if (state.playing.location === 'airplay') {
-    device = state.devices.airplay
-    if (!state.playing.isPaused) device.rate(0, castCallback)
-    else device.rate(1, castCallback)
+  var device = getDevice()
+  if (device) {
+    device.playPause(castCallback)
  }
 }

 function seek (time) {
-  if (state.playing.location === 'chromecast') {
-    state.devices.chromecast.seek(time, castCallback)
-  } else if (state.playing.location === 'airplay') {
-    state.devices.airplay.scrub(time, castCallback)
+  var device = getDevice()
+  if (device) {
+    device.seek(time, castCallback)
  }
 }

 function setVolume (volume) {
-  if (state.playing.location === 'chromecast') {
-    state.devices.chromecast.volume(volume, castCallback)
-  } else if (state.playing.location === 'airplay') {
-    // TODO remove line below once we can fetch the information in status update
-    state.playing.volume = volume
-    volume = (volume - 1) * 30
-    state.devices.airplay.volume(volume, castCallback)
+  var device = getDevice()
+  if (device) {
+    device.volume(volume, castCallback)
  }
 }

 function castCallback () {
-  console.log(state.playing.location + ' callback: %o', arguments)
+  console.log('%s callback: %o', state.playing.location, arguments)
 }
--- a/renderer/lib/dispatcher.js
+++ b/renderer/lib/dispatcher.js
@@ -24,7 +24,7 @@ function dispatcher (...args) {
      // Don't click on whatever is below the button
      e.stopPropagation()
      // Don't regisiter clicks on disabled buttons
-      if (e.target.classList.contains('disabled')) return
+      if (e.currentTarget.classList.contains('disabled')) return
      _dispatch.apply(null, args)
    }
  }
--- a/renderer/lib/location-history.js
+++ b/renderer/lib/location-history.js
@@ -18,8 +18,9 @@ LocationHistory.prototype._go = function (page) {
  if (page.onbeforeload) {
    this._pending = page
    page.onbeforeload((err) => {
-      if (err) return
+      if (this._pending !== page) return /* navigation was cancelled */
      this._pending = null
+      if (err) return
      this._history.push(page)
    })
  } else {
@@ -67,3 +68,7 @@ LocationHistory.prototype.hasForward = function () {
 LocationHistory.prototype.pending = function () {
  return this._pending
 }
+
+LocationHistory.prototype.clearPending = function () {
+  this._pending = null
+}
--- a/renderer/lib/torrent-player.js
+++ b/renderer/lib/torrent-player.js
@@ -1,7 +1,8 @@
 module.exports = {
  isPlayable,
  isVideo,
-  isAudio
+  isAudio,
+  isPlayableTorrent
 }

 var path = require('path')
@@ -22,3 +23,7 @@ function isAudio (file) {
  var ext = path.extname(file.name)
  return ['.mp3', '.aac', '.ogg', '.wav'].indexOf(ext) !== -1
 }
+
+function isPlayableTorrent (torrentSummary) {
+  return torrentSummary.files && torrentSummary.files.some(isPlayable)
+}
--- a/renderer/state.js
+++ b/renderer/state.js
@@ -5,64 +5,78 @@ var config = require('../config')
 var LocationHistory = require('./lib/location-history')

 module.exports = {
-  /*
-   * Temporary state disappears once the program exits.
-   * It can contain complex objects like open connections, etc.
-   */
-  client: null, /* the WebTorrent client */
-  server: null, /* local WebTorrent-to-HTTP server */
-  prev: {}, /* used for state diffing in updateElectron() */
-  location: new LocationHistory(),
-  window: {
-    bounds: null, /* {x, y, width, height } */
-    isFocused: true,
-    isFullScreen: false,
-    title: config.APP_WINDOW_TITLE
-  },
-  selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
-  playing: { /* the media (audio or video) that we're currently playing */
+  getInitialState,
+  getDefaultPlayState,
+  getDefaultSavedState
+}
+
+function getInitialState () {
+  return {
+    /*
+     * Temporary state disappears once the program exits.
+     * It can contain complex objects like open connections, etc.
+     */
+    client: null, /* the WebTorrent client */
+    server: null, /* local WebTorrent-to-HTTP server */
+    prev: {}, /* used for state diffing in updateElectron() */
+    location: new LocationHistory(),
+    window: {
+      bounds: null, /* {x, y, width, height } */
+      isFocused: true,
+      isFullScreen: false,
+      title: config.APP_WINDOW_TITLE
+    },
+    selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
+    playing: getDefaultPlayState(), /* the media (audio or video) that we're currently playing */
+    devices: { /* playback devices like Chromecast and AppleTV */
+      airplay: null, /* airplay client. finds and manages AppleTVs */
+      chromecast: null /* chromecast client. finds and manages Chromecasts */
+    },
+    dock: {
+      badge: 0,
+      progress: 0
+    },
+    modal: null, /* modal popover */
+    errors: [], /* user-facing errors */
+    nextTorrentKey: 1, /* identify torrents for IPC between the main and webtorrent windows */
+
+    /*
+     * Saved state is read from and written to a file every time the app runs.
+     * It should be simple and minimal and must be JSON.
+     *
+     * Config path:
+     *
+     * OS X                 ~/Library/Application Support/WebTorrent/config.json
+     * Linux (XDG)          $XDG_CONFIG_HOME/WebTorrent/config.json
+     * Linux (Legacy)       ~/.config/WebTorrent/config.json
+     * Windows (> Vista)    %LOCALAPPDATA%/WebTorrent/config.json
+     * Windows (XP, 2000)   %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
+     *
+     * Also accessible via `require('application-config')('WebTorrent').filePath`
+     */
+    saved: {}
+  }
+}
+
+/* Whenever we stop playing video or audio, here's what we reset state.playing to */
+function getDefaultPlayState () {
+  return {
    infoHash: null, /* the info hash of the torrent we're playing */
    fileIndex: null, /* the zero-based index within the torrent */
    location: 'local', /* 'local', 'chromecast', 'airplay' */
-    type: null, /* 'audio' or 'video' */
+    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
    currentTime: 0, /* seconds */
    duration: 1, /* seconds */
    isPaused: true,
    isStalled: false,
    lastTimeUpdate: 0, /* Unix time in ms */
    mouseStationarySince: 0 /* Unix time in ms */
-  },
-  audioInfo: null, /* set whenever an audio file is playing */
-  pendingTorrents: {}, /* infohash to WebTorrent handle */
-  devices: { /* playback devices like Chromecast and AppleTV */
-    airplay: null, /* airplay client. finds and manages AppleTVs */
-    chromecast: null /* chromecast client. finds and manages Chromecasts */
-  },
-  dock: {
-    badge: 0,
-    progress: 0
-  },
-  modal: null, /* modal popover */
-  errors: [], /* user-facing errors */
+  }
+}

-  /*
-   * Saved state is read from and written to a file every time the app runs.
-   * It should be simple and minimal and must be JSON.
-   *
-   * Config path:
-   *
-   * OS X                 ~/Library/Application Support/WebTorrent/config.json
-   * Linux (XDG)          $XDG_CONFIG_HOME/WebTorrent/config.json
-   * Linux (Legacy)       ~/.config/WebTorrent/config.json
-   * Windows (> Vista)    %LOCALAPPDATA%/WebTorrent/config.json
-   * Windows (XP, 2000)   %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
-   *
-   * Also accessible via `require('application-config')('WebTorrent').filePath`
-   */
-  saved: {},
-
-  /* If the saved state file doesn't exist yet, here's what we use instead */
-  defaultSavedState: {
+/* If the saved state file doesn't exist yet, here's what we use instead */
+function getDefaultSavedState () {
+  return {
    version: 1, /* make sure we can upgrade gracefully later */
    torrents: [
      {
--- a/renderer/views/app.js
+++ b/renderer/views/app.js
@@ -9,7 +9,8 @@ var Player = require('./player')
 var TorrentList = require('./torrent-list')
 var Modals = {
  'open-torrent-address-modal': require('./open-torrent-address-modal'),
-  'update-available-modal': require('./update-available-modal')
+  'update-available-modal': require('./update-available-modal'),
+  'create-torrent-modal': require('./create-torrent-modal')
 }

 function App (state, dispatch) {
@@ -67,7 +68,7 @@ function App (state, dispatch) {
      return hx`
        <div class='modal'>
          <div class='modal-background'></div>
-          <div class='modal-content add-file-modal'>
+          <div class='modal-content'>
            ${contents}
          </div>
        </div>
--- a/renderer/views/create-torrent-modal.js
+++ b/renderer/views/create-torrent-modal.js
@@ -0,0 +1,76 @@
+module.exports = UpdateAvailableModal
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var path = require('path')
+
+var {dispatch} = require('../lib/dispatcher')
+
+function UpdateAvailableModal (state) {
+  // First, extract the base folder that the files are all in
+  var files = state.modal.files
+  var pathPrefix = files.map((x) => x.path).reduce(findCommonPrefix)
+  if (files.length > 0 && !pathPrefix.endsWith('/') && !pathPrefix.endsWith('\\')) {
+    pathPrefix = path.dirname(pathPrefix)
+  }
+
+  // Then, use the name of the base folder (or sole file, for a single file torrent)
+  // as the default name. Show all files relative to the base folder.
+  var defaultName = path.basename(pathPrefix)
+  var basePath = path.dirname(pathPrefix)
+  var fileElems = files.map(function (file) {
+    var relativePath = files.length === 0 ? file.name : path.relative(pathPrefix, file.path)
+    return hx`<div>${relativePath}</div>`
+  })
+
+  return hx`
+    <div class='create-torrent-modal'>
+      <p><strong>Create New Torrent</strong></p>
+      <p class='torrent-attribute'>
+        <label>Name:</label>
+        <div class='torrent-attribute'>${defaultName}</div>
+      </p>
+      <p class='torrent-attribute'>
+        <label>Path:</label>
+        <div class='torrent-attribute'>${pathPrefix}</div>
+      </p>
+      <p class='torrent-attribute'>
+        <label>Files:</label>
+        <div>${fileElems}</div>
+      </p>
+      <p>
+        <button class='primary' onclick=${handleOK}>Create Torrent</button>
+        <button class='cancel' onclick=${handleCancel}>Cancel</button>
+      </p>
+    </div>
+  `
+
+  function handleOK () {
+    var options = {
+      // TODO: we can't let the user choose their own name if we want WebTorrent
+      // to use the files in place rather than creating a new folder.
+      // name: document.querySelector('.torrent-name').value
+      name: defaultName,
+      path: basePath,
+      files: files
+    }
+    dispatch('createTorrent', options)
+    dispatch('exitModal')
+  }
+
+  function handleCancel () {
+    dispatch('exitModal')
+  }
+}
+
+// Finds the longest common prefix
+function findCommonPrefix (a, b) {
+  for (var i = 0; i < a.length && i < b.length; i++) {
+    if (a.charCodeAt(i) !== b.charCodeAt(i)) break
+  }
+  if (i === a.length) return a
+  if (i === b.length) return b
+  return a.substring(0, i)
+}
--- a/renderer/views/player.js
+++ b/renderer/views/player.js
@@ -5,6 +5,7 @@ var hyperx = require('hyperx')
 var hx = hyperx(h)

 var prettyBytes = require('prettier-bytes')
+var Bitfield = require('bitfield')

 var util = require('../util')
 var {dispatch, dispatcher} = require('../lib/dispatcher')
@@ -20,7 +21,7 @@ function Player (state) {
      onmousemove=${dispatcher('mediaMouseMoved')}>
      ${showVideo ? renderMedia(state) : renderCastScreen(state)}
      ${renderPlayerControls(state)}
-    </div>
+      </div>
  `
 }

@@ -122,14 +123,15 @@ function renderOverlay (state) {
 }

 function renderAudioMetadata (state) {
-  if (!state.playing.audioInfo) return
-  var info = state.playing.audioInfo
+  var torrentSummary = getPlayingTorrentSummary(state)
+  var fileSummary = torrentSummary.files[state.playing.fileIndex]
+  if (!fileSummary.audioInfo) return
+  var info = fileSummary.audioInfo

  // Get audio track info
  var title = info.title
  if (!title) {
-    var torrentSummary = getPlayingTorrentSummary(state)
-    title = torrentSummary.files[state.playing.fileIndex].name
+    title = fileSummary.name
  }
  var artist = info.artist && info.artist[0]
  var album = info.album
@@ -160,66 +162,57 @@ function renderLoadingSpinner (state) {
    (new Date().getTime() - state.playing.lastTimeUpdate > 2000)
  if (!isProbablyStalled) return

-  var torrentSummary = getPlayingTorrentSummary(state)
-  var torrent = state.client.get(torrentSummary.infoHash)
-  var file = torrentSummary.files[state.playing.fileIndex]
-  var progress = Math.floor(100 * file.numPiecesPresent / file.numPieces)
+  var prog = getPlayingTorrentSummary(state).progress || {}
+  var fileProgress = 0
+  if (prog.files) {
+    var file = prog.files[state.playing.fileIndex]
+    fileProgress = Math.floor(100 * file.numPiecesPresent / file.numPieces)
+  }

  return hx`
    <div class='media-stalled'>
      <div class='loading-spinner'>&nbsp;</div>
      <div class='loading-status ellipsis'>
-        <span class='progress'>${progress}%</span> downloaded,
-        <span>↓ ${prettyBytes(torrent.downloadSpeed || 0)}/s</span>
-        <span>↑ ${prettyBytes(torrent.uploadSpeed || 0)}/s</span>
+        <span class='progress'>${fileProgress}%</span> downloaded,
+        <span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
+        <span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
      </div>
    </div>
  `
 }

 function renderCastScreen (state) {
-  var isChromecast = state.playing.location.startsWith('chromecast')
-  var isAirplay = state.playing.location.startsWith('airplay')
+  var castIcon, castType
+  if (state.playing.location.startsWith('chromecast')) {
+    castIcon = 'cast_connected'
+    castType = 'Chromecast'
+  } else if (state.playing.location.startsWith('airplay')) {
+    castIcon = 'airplay'
+    castType = 'AirPlay'
+  } else if (state.playing.location.startsWith('dlna')) {
+    castIcon = 'tv'
+    castType = 'DLNA'
+  }
+
  var isStarting = state.playing.location.endsWith('-pending')
-  if (!isChromecast && !isAirplay) throw new Error('Unimplemented cast type')
+  var castStatus = isStarting ? 'Connecting...' : 'Connected'

  // Show a nice title image, if possible
  var style = {
    backgroundImage: cssBackgroundImagePoster(state)
  }

-  // Show whether we're connected to Chromecast / Airplay
-  var castStatus = isStarting ? 'Connecting...' : 'Connected'
  return hx`
    <div class='letterbox' style=${style}>
      <div class='cast-screen'>
-        <i class='icon'>${isAirplay ? 'airplay' : 'cast'}</i>
-        <div class='cast-type'>${isAirplay ? 'AirPlay' : 'Chromecast'}</div>
+        <i class='icon'>${castIcon}</i>
+        <div class='cast-type'>${castType}</div>
        <div class='cast-status'>${castStatus}</div>
      </div>
    </div>
  `
 }

-// Returns the CSS background-image string for a poster image + dark vignette
-function cssBackgroundImagePoster (state) {
-  var torrentSummary = getPlayingTorrentSummary(state)
-  if (!torrentSummary || !torrentSummary.posterURL) return ''
-  var posterURL = util.getAbsoluteStaticPath(torrentSummary.posterURL)
-  var cleanURL = posterURL.replace(/\\/g, '/')
-  return cssBackgroundImageDarkGradient() + `, url(${cleanURL})`
-}
-
-function cssBackgroundImageDarkGradient () {
-  return 'radial-gradient(circle at center, ' +
-    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
-}
-
-function getPlayingTorrentSummary (state) {
-  var infoHash = state.playing.infoHash
-  return state.saved.torrents.find((x) => x.infoHash === infoHash)
-}
-
 function renderPlayerControls (state) {
  var positionPercent = 100 * state.playing.currentTime / state.playing.duration
  var playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 8px)' }
@@ -246,41 +239,65 @@ function renderPlayerControls (state) {
  // If we've detected a Chromecast or AppleTV, the user can play video there
  var isOnChromecast = state.playing.location.startsWith('chromecast')
  var isOnAirplay = state.playing.location.startsWith('airplay')
-  var chromecastClass, chromecastHandler, airplayClass, airplayHandler
+  var isOnDlna = state.playing.location.startsWith('dlna')
+  var chromecastClass, chromecastHandler, airplayClass, airplayHandler, dlnaClass, dlnaHandler
  if (isOnChromecast) {
    chromecastClass = 'active'
+    dlnaClass = 'disabled'
    airplayClass = 'disabled'
-    chromecastHandler = dispatcher('stopCasting')
+    chromecastHandler = dispatcher('closeDevice')
    airplayHandler = undefined
+    dlnaHandler = undefined
  } else if (isOnAirplay) {
    chromecastClass = 'disabled'
+    dlnaClass = 'disabled'
    airplayClass = 'active'
    chromecastHandler = undefined
-    airplayHandler = dispatcher('stopCasting')
+    airplayHandler = dispatcher('closeDevice')
+    dlnaHandler = undefined
+  } else if (isOnDlna) {
+    chromecastClass = 'disabled'
+    dlnaClass = 'active'
+    airplayClass = 'disabled'
+    chromecastHandler = undefined
+    airplayHandler = undefined
+    dlnaHandler = dispatcher('closeDevice')
  } else {
    chromecastClass = ''
    airplayClass = ''
-    chromecastHandler = dispatcher('openChromecast')
-    airplayHandler = dispatcher('openAirplay')
+    dlnaClass = ''
+    chromecastHandler = dispatcher('openDevice', 'chromecast')
+    airplayHandler = dispatcher('openDevice', 'airplay')
+    dlnaHandler = dispatcher('openDevice', 'dlna')
  }
  if (state.devices.chromecast || isOnChromecast) {
+    var castIcon = isOnChromecast ? 'cast_connected' : 'cast'
    elements.push(hx`
-      <i.icon.chromecast
+      <i.icon.device
        class=${chromecastClass}
        onclick=${chromecastHandler}>
-        cast
+        ${castIcon}
      </i>
    `)
  }
  if (state.devices.airplay || isOnAirplay) {
    elements.push(hx`
-      <i.icon.airplay
+      <i.icon.device
        class=${airplayClass}
        onclick=${airplayHandler}>
        airplay
      </i>
    `)
  }
+  if (state.devices.dlna || isOnDlna) {
+    elements.push(hx`
+      <i.icon.device
+        class=${dlnaClass}
+        onclick=${dlnaHandler}>
+        tv
+      </i>
+    `)
+  }

  // On OSX, the back button is in the title bar of the window; see app.js
  // On other platforms, we render one over the video on mouseover
@@ -315,24 +332,24 @@ function renderPlayerControls (state) {
 // Renders the loading bar. Shows which parts of the torrent are loaded, which
 // can be "spongey" / non-contiguous
 function renderLoadingBar (state) {
-  var torrent = state.client.get(state.playing.infoHash)
-  if (torrent === null) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  if (!torrentSummary.progress) {
    return []
  }
-  var file = torrent.files[state.playing.fileIndex]

  // Find all contiguous parts of the torrent which are loaded
+  var prog = torrentSummary.progress
+  var fileProg = prog.files[state.playing.fileIndex]
  var parts = []
-  var lastPartPresent = false
-  var numParts = file._endPiece - file._startPiece + 1
-  for (var i = file._startPiece; i <= file._endPiece; i++) {
-    var partPresent = torrent.bitfield.get(i)
-    if (partPresent && !lastPartPresent) {
-      parts.push({start: i - file._startPiece, count: 1})
+  var lastPiecePresent = false
+  for (var i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
+    var partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
+    if (partPresent && !lastPiecePresent) {
+      parts.push({start: i - fileProg.startPiece, count: 1})
    } else if (partPresent) {
      parts[parts.length - 1].count++
    }
-    lastPartPresent = partPresent
+    lastPiecePresent = partPresent
  }

  // Output some bars to show which parts of the file are loaded
@@ -340,8 +357,8 @@ function renderLoadingBar (state) {
    <div class='loading-bar'>
      ${parts.map(function (part) {
        var style = {
-          left: (100 * part.start / numParts) + '%',
-          width: (100 * part.count / numParts) + '%'
+          left: (100 * part.start / fileProg.numPieces) + '%',
+          width: (100 * part.count / fileProg.numPieces) + '%'
        }

        return hx`<div class='loading-bar-part' style=${style}></div>`
@@ -349,3 +366,22 @@ function renderLoadingBar (state) {
    </div>
  `
 }
+
+// Returns the CSS background-image string for a poster image + dark vignette
+function cssBackgroundImagePoster (state) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  if (!torrentSummary || !torrentSummary.posterURL) return ''
+  var posterURL = util.getAbsoluteStaticPath(torrentSummary.posterURL)
+  var cleanURL = posterURL.replace(/\\/g, '/')
+  return cssBackgroundImageDarkGradient() + `, url(${cleanURL})`
+}
+
+function cssBackgroundImageDarkGradient () {
+  return 'radial-gradient(circle at center, ' +
+    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
+}
+
+function getPlayingTorrentSummary (state) {
+  var infoHash = state.playing.infoHash
+  return state.saved.torrents.find((x) => x.infoHash === infoHash)
+}
--- a/renderer/views/torrent-list.js
+++ b/renderer/views/torrent-list.js
@@ -27,10 +27,7 @@ function TorrentList (state) {
  function renderTorrent (torrentSummary) {
    // Get ephemeral data (like progress %) directly from the WebTorrent handle
    var infoHash = torrentSummary.infoHash
-    var torrent = state.client
-      ? state.client.torrents.find((x) => x.infoHash === infoHash)
-      : null
-    var isSelected = state.selectedInfoHash === infoHash
+    var isSelected = infoHash && state.selectedInfoHash === infoHash

    // Background image: show some nice visuals, like a frame from the movie, if possible
    var style = {}
@@ -51,39 +48,40 @@ function TorrentList (state) {
    //  playStatus turns the play button into a loading spinner or error icon
    if (torrentSummary.playStatus) classes.push(torrentSummary.playStatus)
    if (isSelected) classes.push('selected')
+    if (!infoHash) classes.push('disabled')
    classes = classes.join(' ')
    return hx`
      <div style=${style} class=${classes}
-        oncontextmenu=${dispatcher('openTorrentContextMenu', infoHash)}
-        onclick=${dispatcher('toggleSelectTorrent', infoHash)}>
-        ${renderTorrentMetadata(torrent, torrentSummary)}
-        ${renderTorrentButtons(torrentSummary)}
-        ${isSelected ? renderTorrentDetails(torrent, torrentSummary) : ''}
+        oncontextmenu=${infoHash && dispatcher('openTorrentContextMenu', infoHash)}
+        onclick=${infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
+        ${renderTorrentMetadata(torrentSummary)}
+        ${infoHash ? renderTorrentButtons(torrentSummary) : ''}
+        ${isSelected ? renderTorrentDetails(torrentSummary) : ''}
      </div>
    `
  }

  // Show name, download status, % complete
-  function renderTorrentMetadata (torrent, torrentSummary) {
+  function renderTorrentMetadata (torrentSummary) {
    var name = torrentSummary.name || 'Loading torrent...'
    var elements = [hx`
      <div class='name ellipsis'>${name}</div>
    `]

-    // If a torrent is paused and we only get the torrentSummary
-    // If it's downloading/seeding then we have more information
-    if (torrent) {
-      var progress = Math.floor(100 * torrent.progress)
-      var downloaded = prettyBytes(torrent.downloaded)
-      var total = prettyBytes(torrent.length || 0)
+    // If it's downloading/seeding then show progress info
+    var prog = torrentSummary.progress
+    if (torrentSummary.status !== 'paused' && prog) {
+      var progress = Math.floor(100 * prog.progress)
+      var downloaded = prettyBytes(prog.downloaded)
+      var total = prettyBytes(prog.length || 0)
      if (downloaded !== total) downloaded += ` / ${total}`

      elements.push(hx`
        <div class='status ellipsis'>
          ${getFilesLength()}
          <span>${getPeers()}</span>
-          <span>↓ ${prettyBytes(torrent.downloadSpeed || 0)}/s</span>
-          <span>↑ ${prettyBytes(torrent.uploadSpeed || 0)}/s</span>
+          <span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
+          <span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
        </div>
      `)
      elements.push(hx`
@@ -97,13 +95,13 @@ function TorrentList (state) {
    return hx`<div class='metadata'>${elements}</div>`

    function getPeers () {
-      var count = torrent.numPeers === 1 ? 'peer' : 'peers'
-      return `${torrent.numPeers} ${count}`
+      var count = prog.numPeers === 1 ? 'peer' : 'peers'
+      return `${prog.numPeers} ${count}`
    }

    function getFilesLength () {
-      if (torrent.ready && torrent.files.length > 1) {
-        return hx`<span class='files'>${torrent.files.length} files</span>`
+      if (torrentSummary.files && torrentSummary.files.length > 1) {
+        return hx`<span class='files'>${torrentSummary.files.length} files</span>`
      }
    }
  }
@@ -139,14 +137,22 @@ function TorrentList (state) {
      downloadTooltip = 'Click to start torrenting.'
    }

-    return hx`
-      <div class='buttons'>
+    // Only show the play button for torrents that contain playable media
+    var playButton
+    if (TorrentPlayer.isPlayableTorrent(torrentSummary)) {
+      playButton = hx`
        <i.btn.icon.play
          title=${playTooltip}
          class=${playClass}
          onclick=${dispatcher('play', infoHash)}>
          ${playIcon}
        </i>
+      `
+    }
+
+    return hx`
+      <div class='buttons'>
+        ${playButton}
        <i.btn.icon.download
          class=${torrentSummary.status}
          title=${downloadTooltip}
@@ -164,19 +170,19 @@ function TorrentList (state) {
  }

  // Show files, per-file download status and play buttons, and so on
-  function renderTorrentDetails (torrent, torrentSummary) {
+  function renderTorrentDetails (torrentSummary) {
    var infoHash = torrentSummary.infoHash
    var filesElement
    if (!torrentSummary.files) {
      // We don't know what files this torrent contains
-      var message = torrent
-        ? 'Downloading torrent data using magnet link...'
-        : 'Failed to download torrent data from magnet link. Click the download button to try again...'
+      var message = torrentSummary.status === 'paused'
+        ? 'Failed to load torrent info. Click the download button to try again...'
+        : 'Downloading torrent info...'
      filesElement = hx`<div class='files warning'>${message}</div>`
    } else {
      // We do know the files. List them and show download stats for each one
      var fileRows = torrentSummary.files.map(
-        (file, index) => renderFileRow(torrent, torrentSummary, file, index))
+        (file, index) => renderFileRow(torrentSummary, file, index))
      filesElement = hx`
        <div class='files'>
          <strong>Files</strong>
@@ -199,20 +205,22 @@ function TorrentList (state) {
  }

  // Show a single torrentSummary file in the details view for a single torrent
-  function renderFileRow (torrent, torrentSummary, file, index) {
+  function renderFileRow (torrentSummary, file, index) {
    // First, find out how much of the file we've downloaded
-    var isDone = file.numPiecesPresent === file.numPieces
-    var progress = Math.round(100 * file.numPiecesPresent / (file.numPieces || 0)) + '%'
+    var isDone = false
+    var progress = ''
+    if (torrentSummary.progress && torrentSummary.progress.files) {
+      var fileProg = torrentSummary.progress.files[index]
+      isDone = fileProg.numPiecesPresent === fileProg.numPieces
+      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+    }

    // Second, render the file as a table row
    var infoHash = torrentSummary.infoHash
    var icon
    var rowClass = ''
    var handleClick
-    if (state.playing.infoHash === infoHash && state.playing.fileIndex === index) {
-      icon = 'pause_arrow' /* playing? add option to pause */
-      handleClick = undefined // TODO: pause audio
-    } else if (TorrentPlayer.isPlayable(file)) {
+    if (TorrentPlayer.isPlayable(file)) {
      icon = 'play_arrow' /* playable? add option to play */
      handleClick = dispatcher('play', infoHash, index)
    } else {
--- a/renderer/webtorrent.html
+++ b/renderer/webtorrent.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+      body {
+        background-color: #282828;
+        margin: 5px;
+        overflow: hidden;
+      }
+      img {
+        width: 140px;
+        height: 140px;
+      }
+    </style>
+  </head>
+  <body>
+    <script async src="webtorrent.js"></script>
+    <img src="../static/WebTorrent.png">
+  </body>
+</html>
--- a/renderer/webtorrent.js
+++ b/renderer/webtorrent.js
@@ -0,0 +1,312 @@
+// To keep the UI snappy, we run WebTorrent in its own hidden window, a separate
+// process from the main window.
+console.time('init')
+
+var WebTorrent = require('webtorrent')
+var defaultAnnounceList = require('create-torrent').announceList
+var deepEqual = require('deep-equal')
+var electron = require('electron')
+var fs = require('fs')
+var mkdirp = require('mkdirp')
+var musicmetadata = require('musicmetadata')
+var networkAddress = require('network-address')
+var path = require('path')
+
+var crashReporter = require('../crash-reporter')
+var config = require('../config')
+var torrentPoster = require('./lib/torrent-poster')
+
+// Report when the process crashes
+crashReporter.init()
+
+// Send & receive messages from the main window
+var ipc = electron.ipcRenderer
+
+// Force use of webtorrent trackers on all torrents
+global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
+  .map((arr) => arr[0])
+  .filter((url) => url.indexOf('wss://') === 0 || url.indexOf('ws://') === 0)
+
+// Connect to the WebTorrent and BitTorrent networks. WebTorrent Desktop is a hybrid
+// client, as explained here: https://webtorrent.io/faq
+var client = window.client = new WebTorrent()
+
+// WebTorrent-to-HTTP streaming sever
+var server = window.server = null
+
+// Used for diffing, so we only send progress updates when necessary
+var prevProgress = window.prevProgress = null
+
+init()
+
+function init () {
+  client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
+  client.on('error', (err) => ipc.send('wt-error', null, err.message))
+
+  ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes) =>
+    startTorrenting(torrentKey, torrentID, path, fileModtimes))
+  ipc.on('wt-stop-torrenting', (e, infoHash) =>
+    stopTorrenting(infoHash))
+  ipc.on('wt-create-torrent', (e, torrentKey, options) =>
+    createTorrent(torrentKey, options))
+  ipc.on('wt-save-torrent-file', (e, torrentKey) =>
+    saveTorrentFile(torrentKey))
+  ipc.on('wt-generate-torrent-poster', (e, torrentKey) =>
+    generateTorrentPoster(torrentKey))
+  ipc.on('wt-get-audio-metadata', (e, infoHash, index) =>
+    getAudioMetadata(infoHash, index))
+  ipc.on('wt-start-server', (e, infoHash, index) =>
+    startServer(infoHash, index))
+  ipc.on('wt-stop-server', (e) =>
+    stopServer())
+
+  ipc.send('ipcReadyWebTorrent')
+
+  setInterval(updateTorrentProgress, 1000)
+}
+
+// Starts a given TorrentID, which can be an infohash, magnet URI, etc. Returns WebTorrent object
+// See https://github.com/feross/webtorrent/blob/master/docs/api.md#clientaddtorrentid-opts-function-ontorrent-torrent-
+function startTorrenting (torrentKey, torrentID, path, fileModtimes) {
+  console.log('starting torrent %s: %s', torrentKey, torrentID)
+  var torrent = client.add(torrentID, {
+    path: path,
+    fileModtimes: fileModtimes
+  })
+  torrent.key = torrentKey
+  addTorrentEvents(torrent)
+  return torrent
+}
+
+function stopTorrenting (infoHash) {
+  var torrent = client.get(infoHash)
+  torrent.destroy()
+}
+
+// Create a new torrent, start seeding
+function createTorrent (torrentKey, options) {
+  console.log('creating torrent %s', torrentKey, options)
+  var torrent = client.seed(options.files, options)
+  torrent.key = torrentKey
+  addTorrentEvents(torrent)
+  ipc.send('wt-new-torrent')
+}
+
+function addTorrentEvents (torrent) {
+  torrent.on('warning', (err) =>
+    ipc.send('wt-warning', torrent.key, err.message))
+  torrent.on('error', (err) =>
+    ipc.send('wt-error', torrent.key, err.message))
+  torrent.on('infoHash', () =>
+    ipc.send('wt-infohash', torrent.key, torrent.infoHash))
+  torrent.on('metadata', torrentMetadata)
+  torrent.on('ready', torrentReady)
+  torrent.on('done', torrentDone)
+
+  function torrentMetadata () {
+    var info = getTorrentInfo(torrent)
+    ipc.send('wt-metadata', torrent.key, info)
+
+    updateTorrentProgress()
+  }
+
+  function torrentReady () {
+    var info = getTorrentInfo(torrent)
+    ipc.send('wt-ready', torrent.key, info)
+    ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info) // TODO: hack
+
+    updateTorrentProgress()
+  }
+
+  function torrentDone () {
+    var info = getTorrentInfo(torrent)
+    ipc.send('wt-done', torrent.key, info)
+
+    updateTorrentProgress()
+
+    torrent.getFileModtimes(function (err, fileModtimes) {
+      if (err) return onError(err)
+      ipc.send('wt-file-modtimes', torrent.key, fileModtimes)
+    })
+  }
+}
+
+// Produces a JSON saveable summary of a torrent
+function getTorrentInfo (torrent) {
+  return {
+    infoHash: torrent.infoHash,
+    magnetURI: torrent.magnetURI,
+    name: torrent.name,
+    path: torrent.path,
+    files: torrent.files.map(getTorrentFileInfo),
+    bytesReceived: torrent.received
+  }
+}
+
+// Produces a JSON saveable summary of a file in a torrent
+function getTorrentFileInfo (file) {
+  return {
+    name: file.name,
+    length: file.length,
+    path: file.path,
+    numPiecesPresent: 0,
+    numPieces: null
+  }
+}
+
+// Every time we resolve a magnet URI, save the torrent file so that we never
+// have to download it again. Never ask the DHT the same question twice.
+function saveTorrentFile (torrentKey) {
+  var torrent = getTorrent(torrentKey)
+  checkIfTorrentFileExists(torrent.infoHash, function (torrentPath, exists) {
+    if (exists) {
+      // We've already saved the file
+      return ipc.send('wt-file-saved', torrentKey, torrentPath)
+    }
+
+    // Otherwise, save the .torrent file, under the app config folder
+    fs.mkdir(config.CONFIG_TORRENT_PATH, function (_) {
+      fs.writeFile(torrentPath, torrent.torrentFile, function (err) {
+        if (err) return console.log('error saving torrent file %s: %o', torrentPath, err)
+        console.log('saved torrent file %s', torrentPath)
+        return ipc.send('wt-file-saved', torrentKey, torrentPath)
+      })
+    })
+  })
+}
+
+// Checks whether we've already resolved a given infohash to a torrent file
+// Calls back with (torrentPath, exists). Logs, does not call back on error
+function checkIfTorrentFileExists (infoHash, cb) {
+  var torrentPath = path.join(config.CONFIG_TORRENT_PATH, infoHash + '.torrent')
+  fs.exists(torrentPath, function (exists) {
+    cb(torrentPath, exists)
+  })
+}
+
+// Save a JPG that represents a torrent.
+// Auto chooses either a frame from a video file, an image, etc
+function generateTorrentPoster (torrentKey) {
+  var torrent = getTorrent(torrentKey)
+  torrentPoster(torrent, function (err, buf, extension) {
+    if (err) return console.log('error generating poster: %o', err)
+    // save it for next time
+    mkdirp(config.CONFIG_POSTER_PATH, function (err) {
+      if (err) return console.log('error creating poster dir: %o', err)
+      var posterFilePath = path.join(config.CONFIG_POSTER_PATH, torrent.infoHash + extension)
+      fs.writeFile(posterFilePath, buf, function (err) {
+        if (err) return console.log('error saving poster: %o', err)
+        // show the poster
+        ipc.send('wt-poster', torrentKey, posterFilePath)
+      })
+    })
+  })
+}
+
+function updateTorrentProgress () {
+  var progress = getTorrentProgress()
+  // TODO: diff torrent-by-torrent, not once for the whole update
+  if (prevProgress && deepEqual(progress, prevProgress, {strict: true})) {
+    return /* don't send heavy object if it hasn't changed */
+  }
+  ipc.send('wt-progress', progress)
+  prevProgress = progress
+}
+
+function getTorrentProgress () {
+  // First, track overall progress
+  var progress = client.progress
+  var hasActiveTorrents = client.torrents.some(function (torrent) {
+    return torrent.progress !== 1
+  })
+
+  // Track progress for every file in each torrent
+  // TODO: ideally this would be tracked by WebTorrent, which could do it
+  // more efficiently than looping over torrent.bitfield
+  var torrentProg = client.torrents.map(function (torrent) {
+    var fileProg = torrent.files && torrent.files.map(function (file, index) {
+      var numPieces = file._endPiece - file._startPiece + 1
+      var numPiecesPresent = 0
+      for (var piece = file._startPiece; piece <= file._endPiece; piece++) {
+        if (torrent.bitfield.get(piece)) numPiecesPresent++
+      }
+      return {
+        startPiece: file._startPiece,
+        endPiece: file._endPiece,
+        numPieces,
+        numPiecesPresent
+      }
+    })
+    return {
+      torrentKey: torrent.key,
+      ready: torrent.ready,
+      progress: torrent.progress,
+      downloaded: torrent.downloaded,
+      downloadSpeed: torrent.downloadSpeed,
+      uploadSpeed: torrent.uploadSpeed,
+      numPeers: torrent.numPeers,
+      length: torrent.length,
+      bitfield: torrent.bitfield,
+      files: fileProg
+    }
+  })
+
+  return {
+    torrents: torrentProg,
+    progress,
+    hasActiveTorrents
+  }
+}
+
+function startServer (infoHash, index) {
+  var torrent = client.get(infoHash)
+  if (torrent.ready) startServerFromReadyTorrent(torrent, index)
+  else torrent.on('ready', () => startServerFromReadyTorrent(torrent, index))
+}
+
+function startServerFromReadyTorrent (torrent, index, cb) {
+  if (server) return
+
+  // start the streaming torrent-to-http server
+  server = torrent.createServer()
+  server.listen(0, function () {
+    var port = server.address().port
+    var urlSuffix = ':' + port + '/' + index
+    var info = {
+      torrentKey: torrent.key,
+      localURL: 'http://localhost' + urlSuffix,
+      networkURL: 'http://' + networkAddress() + urlSuffix
+    }
+
+    ipc.send('wt-server-running', info)
+    ipc.send('wt-server-' + torrent.infoHash, info) // TODO: hack
+  })
+}
+
+function stopServer () {
+  if (!server) return
+  server.destroy()
+  server = null
+}
+
+function getAudioMetadata (infoHash, index) {
+  var torrent = client.get(infoHash)
+  var file = torrent.files[index]
+  musicmetadata(file.createReadStream(), function (err, info) {
+    if (err) return
+    console.log('got audio metadata for %s: %o', file.name, info)
+    ipc.send('wt-audio-metadata', infoHash, index, info)
+  })
+}
+
+// Gets a WebTorrent handle by torrentKey
+// Throws an Error if we're not currently torrenting anything w/ that key
+function getTorrent (torrentKey) {
+  var ret = client.torrents.find((x) => x.key === torrentKey)
+  if (!ret) throw new Error('missing torrent key ' + torrentKey)
+  return ret
+}
+
+function onError (err) {
+  console.log(err)
+}
--- a/static/linux/postinst
+++ b/static/linux/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+chmod +x /opt/webtorrent-desktop/WebTorrent
+ln -s -f /opt/webtorrent-desktop/WebTorrent /usr/bin/webtorrent-desktop
--- a/static/linux/prerm
+++ b/static/linux/prerm
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+rm /usr/bin/webtorrent-desktop
--- a/static/linux/webtorrent-desktop.desktop
+++ b/static/linux/webtorrent-desktop.desktop
@@ -6,7 +6,7 @@ X-GNOME-FullName=$APP_NAME
 Comment=Download and share files over BitTorrent
 Encoding=UTF-8
 Type=Application
-Icon=webtorrent
+Icon=webtorrent-desktop
 Terminal=false
 Path=$APP_PATH
 Exec=$EXEC_PATH %U
Author	SHA1	Message	Date
Feross Aboukhadijeh	d80d8ef1f5	0.3.2	2016-04-07 01:02:07 -07:00
Feross Aboukhadijeh	d49a8e772f	Faster startup time (50ms)	2016-04-07 00:58:37 -07:00
Feross Aboukhadijeh	1947a03e94	Changelog	2016-04-07 00:25:19 -07:00
Feross Aboukhadijeh	bc6ae4523f	Revert "TEMPORARY: Comment out code that requires Electron 0.37.4" This reverts commit `9c550997c9`.	2016-04-06 21:57:11 -07:00
Greenkeeper	442ac9184f	chore(package): update electron-prebuilt to version 0.37.5 http://greenkeeper.io/	2016-04-06 21:52:25 -07:00
Feross Aboukhadijeh	824f4ce3cf	CHANGELOG	2016-04-06 21:29:34 -07:00
Feross Aboukhadijeh	cc324024ba	Add ISSUE_TEMPLATE	2016-04-06 21:29:25 -07:00
grunjol	0921f89eb7	Linux .deb file: update symlink on package update * overwrite symlink on update * fix size and list definition	2016-04-07 00:48:00 -03:00
DC	628c93bc1e	Pause audio reliably when closing the window Before it only paused video...	2016-04-06 05:47:39 -07:00
Feross Aboukhadijeh	25109a7ebb	0.3.1	2016-04-06 05:10:37 -07:00
Feross Aboukhadijeh	e6963d0307	CHANGELOG	2016-04-06 05:09:14 -07:00
DC	9a2f16b29a	Add crash reporting	2016-04-06 05:05:26 -07:00
DC	6a17aa7c76	Cast screen background: cover, don't tile	2016-04-06 04:48:56 -07:00
Feross Aboukhadijeh	80c549ae77	0.3.0	2016-04-06 03:42:36 -07:00
DC	9d4c65d1b1	Queue messages for WebTorrent window until it's ready	2016-04-06 03:28:56 -07:00
DC	2e08eea43d	Remove Developer > Reload It will leave the app in a bad state, now that we hae a separate WebTorrent process	2016-04-06 03:28:56 -07:00
Feross Aboukhadijeh	27914ef13b	Merge branch 'f/ux'	2016-04-06 03:27:57 -07:00
Feross Aboukhadijeh	10d9678946	Shortcut tweak	2016-04-06 03:27:43 -07:00
Feross Aboukhadijeh	d8a150a60d	Torrent list title: Show more of the title	2016-04-06 02:57:20 -07:00
DC	5abc319ecf	Show torrent metadata on 'metadata' event, don't wait for 'ready'	2016-04-06 02:55:41 -07:00
DC	e0f02ace9e	Open Torrent File should only let you select torrent files	2016-04-06 02:55:41 -07:00
DC	28c386d916	Fix file list enabled/disabled logic * Files that are either 100% downloaded OR streamble should be enabled * Disabled files should not be clickable This fixes both bugs.	2016-04-06 02:55:41 -07:00
DC	5022877b04	Stop casting if you hit ESC or Back while casting	2016-04-06 02:55:40 -07:00
DC	aac862cddf	Only show play button for torrents that are playable	2016-04-06 02:55:40 -07:00
DC	08a806a643	Add setBounds logging	2016-04-06 02:55:40 -07:00
DC	5e5d8799a7	Fix playback bug: ensure openPlayer() always calls its callback	2016-04-06 02:55:40 -07:00
Feross Aboukhadijeh	3e079a2fb4	Torrent list title: Show more of the title	2016-04-06 02:54:45 -07:00
Feross Aboukhadijeh	464b41a435	CHANGELOG	2016-04-06 02:43:12 -07:00
DC	3ad815cec4	Add File > Quit for Linux users with broken system trays Works around #303	2016-04-06 01:33:40 -07:00
DC	85b6ca0639	Fix player flakiness * No more pause icon in the file list * Reset state.playng completely after each play * Fixes #318: false "cannot add dupe torrent" error	2016-04-06 00:58:34 -07:00
Feross Aboukhadijeh	8629fc956d	clear cast interval when casting stops; naming * fix ipc logs * minWidth 425 So title "WebTorrent (BETA)" doesn't get cut off * clear cast interval when casting stops; naming Fix #300	2016-04-05 23:12:23 -07:00
Feross Aboukhadijeh	292898de9e	Merge pull request #317 from feross/f/psn Ignore OS X -psn_xxxx command line argument	2016-04-05 22:24:46 -07:00
Feross Aboukhadijeh	c26b6713de	Ignore OS X -psn_xxxx command line argument Fix #214	2016-04-05 22:21:22 -07:00
Feross Aboukhadijeh	cec7556f9a	Merge pull request #316 from feross/f/prevent Prevent killing the WebTorrent process	2016-04-05 19:47:24 -07:00
Feross Aboukhadijeh	d5340bf644	Fix copy magnet URI to clipboard Fox #304	2016-04-05 19:45:16 -07:00
Feross Aboukhadijeh	08948e8258	Prevent killing the WebTorrent process Also, add shortcut for opening webtorrent inspector	2016-04-05 19:31:23 -07:00
DC	6447966e91	Hide DL status on paused torrents Fixes #309	2016-04-05 19:27:39 -07:00
DC	3080001d3d	Make WebTorrent process easier to debug	2016-04-05 19:17:57 -07:00
Feross Aboukhadijeh	b8d9d29e90	Merge pull request #314 from feross/cast-connected Use Chromecast connected icon when applicable	2016-04-05 19:15:17 -07:00
Feross Aboukhadijeh	ef275b8888	Use Chromecast connected icon when applicable	2016-04-05 19:13:00 -07:00
Feross Aboukhadijeh	ce05ae202c	Merge pull request #312 from feross/cast-errors Consistent error handling on all cast devices	2016-04-05 19:12:04 -07:00
Feross Aboukhadijeh	ee7205bb84	Consistent error handling on all cast devices	2016-04-05 19:01:12 -07:00
DC	46a6ded095	Developers menu button to show dev tools	2016-04-05 19:01:00 -07:00
Feross Aboukhadijeh	074c5824e8	Merge pull request #307 from feross/dc/ux Show video controls immediately on mouse move	2016-04-05 18:46:03 -07:00
Feross Aboukhadijeh	6d8f70ac35	dlnacasts@0.0.3	2016-04-05 18:42:17 -07:00
Feross Aboukhadijeh	6329afc6a2	Merge pull request #310 from feross/notif Notification Fixes	2016-04-05 18:39:55 -07:00
DC	b31281c35e	Don't load cast module when seeking	2016-04-05 18:35:32 -07:00
Feross Aboukhadijeh	b3da0fc05c	show notifications even when window is focus	2016-04-05 18:34:30 -07:00
Feross Aboukhadijeh	2549307a7e	style	2016-04-05 18:34:09 -07:00
Feross Aboukhadijeh	cf3b319fc7	Notification: Focus/unminimize/activate window on click Before, we would only focus, but not unminimize or show, etc.	2016-04-05 18:33:48 -07:00
Feross Aboukhadijeh	11f78b2881	Fix torrent name missing in done notification Fix #305	2016-04-05 18:26:27 -07:00
Feross Aboukhadijeh	32e391e21e	use feross/dlnacasts to fix missing mime dep until https://github.com/grunjol/dlnacasts/pull/1 is merged	2016-04-05 18:20:17 -07:00
DC	d2b95163fb	Show video controls immediately on mouse move	2016-04-05 17:58:38 -07:00
Feross Aboukhadijeh	c83f345977	Fixes for PR #299	2016-04-05 16:35:55 -07:00
DC	db9e3e90c5	WebTorrent process * Separate hidden window, with its own renderer process, for WebTorrent (Must be a window. You cannot run WebRTC at all in a Web Worker, and you can't run it well in a node process like the electron main process.) * Disabled the create-torrent-modal for now. That gives us a consistent UX regardless of whether the user dragged files or folders onto the app or opened the Create New Torrent menu item. * Main process routes all messages between the main and webtorrent windows. * The renderer index.js is smaller now (but still too big), with the WebTorrent interface moved to webtorrent.js / it's own process. * The UI should be faster now, and should not lag under load.	2016-04-05 15:36:26 -07:00
Feross Aboukhadijeh	38ce25592f	run `npm publish` as part of release process	2016-04-05 15:19:20 -07:00
Feross Aboukhadijeh	3ac502e1c3	Merge pull request #302 from feross/media-queries Remove media queries	2016-04-05 15:17:55 -07:00
Feross Aboukhadijeh	0bf9eba043	Remove media queries They make the app feel too much like a webpage. I don't like the UI jumping around as I resize the window.	2016-04-05 14:07:05 -07:00
Feross Aboukhadijeh	d6633d94bf	Merge pull request #287 from grunjol/feature-dlna-support Add DLNA support	2016-04-05 13:56:01 -07:00
grunjol	ac07023ca5	inform user about connection/unsupported errors	2016-04-05 13:36:26 -03:00
grunjol	57e5eed47f	fix DLNA icon, calls, remove unneeded depencendies in dlnacasts	2016-04-05 12:23:41 -03:00
grunjol	6aa7058184	add DLNA support	2016-04-05 12:23:40 -03:00
Feross Aboukhadijeh	2509c0c951	Windows: Fix iconUrl path	2016-04-05 04:00:45 -07:00
Feross Aboukhadijeh	b17043230f	Merge pull request #298 from feross/win Add crash reporting	2016-04-04 23:52:28 -07:00
Feross Aboukhadijeh	76487326f1	Move crash report URL to config.js	2016-04-04 23:44:51 -07:00
Feross Aboukhadijeh	997aa7c922	TEMPORARY: Comment out code that requires Electron 0.37.4	2016-04-04 23:27:12 -07:00
Feross Aboukhadijeh	22421e365c	Revert "chore(package): update electron-prebuilt to version 0.37.4" This reverts commit `509e2804e0`.	2016-04-04 23:12:11 -07:00
Feross Aboukhadijeh	7c38f374f3	Setup crash reporter	2016-04-04 23:10:47 -07:00
Feross Aboukhadijeh	c422151ef8	HACK: add setTimeout to uninstaller	2016-04-04 20:55:19 -07:00
Feross Aboukhadijeh	3b805f6cc3	try-catch console.timeEnd() If user refreshes after renderer crashes, the this line throws an exception	2016-04-04 20:40:39 -07:00
Feross Aboukhadijeh	65a3443e7d	Fix clean script	2016-04-04 20:36:54 -07:00
Feross Aboukhadijeh	0d17b69c3a	Merge pull request #297 from feross/win Uninstall handlers on Windows uninstall/npm run clean	2016-04-04 20:34:44 -07:00
Feross Aboukhadijeh	7970066ccd	Uninstall handlers on Windows uninstall/npm run clean	2016-04-04 20:27:48 -07:00
Feross Aboukhadijeh	eddd81e8d7	Merge pull request #295 from feross/win Windows Installer improvements	2016-04-04 19:58:29 -07:00
Feross Aboukhadijeh	60daeb9225	fixpack	2016-04-04 19:36:21 -07:00
Feross Aboukhadijeh	361e811e93	Windows: Final .exe name: WebTorrentSetup-vX.X.X.exe	2016-04-04 19:36:06 -07:00
Feross Aboukhadijeh	38022bb3df	Windows: use feross fork for `setupExe` option	2016-04-04 19:23:10 -07:00
Feross Aboukhadijeh	31a9133eba	Merge pull request #294 from feross/darwin OS X: Name update file with "-darwin.zip"	2016-04-04 18:45:12 -07:00
Feross Aboukhadijeh	663e607797	Windows: Add valid iconUrl – for building on non-Windows platforms	2016-04-04 18:42:46 -07:00
Feross Aboukhadijeh	82c9e8f8ab	Windows packager: use Github URL for remoteRelease	2016-04-04 18:23:27 -07:00
Feross Aboukhadijeh	3d8429fb12	New update URL: /desktop/update	2016-04-04 18:22:58 -07:00
Feross Aboukhadijeh	5d2b5c1c81	OS X: Name update file with "-darwin.zip"	2016-04-04 17:58:59 -07:00
Feross Aboukhadijeh	c20a809014	Windows: use remote releases URL for updates	2016-04-04 17:55:08 -07:00
Feross Aboukhadijeh	b7858a03b5	Windows: don't generate .msi	2016-04-04 17:54:58 -07:00
Feross Aboukhadijeh	27bf803539	Windows: name Setup.exe with version number	2016-04-04 17:54:50 -07:00
Feross Aboukhadijeh	0b64dcf4ec	Windows: Fix protocol registration	2016-04-04 17:52:19 -07:00
Feross Aboukhadijeh	30631fb879	Merge pull request #292 from grunjol/fix-follow-debian-convention Follow debian package name convention	2016-04-04 16:59:23 -07:00
grunjol	6c275a33ea	follow debian package name convention	2016-04-04 20:25:23 -03:00
Feross Aboukhadijeh	fe00d162e1	Merge pull request #290 from feross/deb Name the .deb file consistently	2016-04-04 15:32:54 -07:00
Feross Aboukhadijeh	3599ec077b	Name the .deb file consistently Instead of "webtorrent-desktop_0.2.0-1_amd64.deb", name it "WebTorrent-v0.2.0.deb"	2016-04-04 15:31:24 -07:00
Feross Aboukhadijeh	a65ee51358	Merge pull request #264 from grunjol/feature-debian-package Linux: Create .deb package	2016-04-04 15:09:41 -07:00
Feross Aboukhadijeh	50b8f42312	Merge pull request #289 from feross/fix-tray Windows/Linux: Fix broken Quit option in Tray icon	2016-04-04 13:50:32 -07:00
Feross Aboukhadijeh	ccaf0de63d	Windows/Linux: Fix broken Quit option in Tray icon This also cleans up the code by handling quit in the same way for all platforms, removing the special case in tray.js for darwin. We already have a 'before-quit' handler in main/index.js, so this is now handled there :)	2016-04-04 13:40:27 -07:00
Feross Aboukhadijeh	9d8e79fb35	Windows: Shorter install splash screen	2016-04-04 13:18:59 -07:00
Feross Aboukhadijeh	189ec60f4e	Merge pull request #286 from feross/protocol-handler OS X: Use app.setAsDefaultProtocolClient	2016-04-04 13:17:43 -07:00
Feross Aboukhadijeh	6fcc9c23b8	OS X: Use app.setAsDefaultProtocolClient - OS X: Register as default handler for "magnet" on startup Also: - Log errors in the renderer process, like the rest of errors in the main process - Windows: Less chance of registry write race condition Fix #285	2016-04-04 04:57:23 -07:00
Feross Aboukhadijeh	d0515bb2a2	Windows: register protocol handlers on startup Just like other OSes. There's no reason for there to be a difference.	2016-04-04 04:43:27 -07:00
grunjol	4f79fbfc41	refactor cast module * refactor cast module * fix standard * remove debug dependency	2016-04-04 01:22:02 -07:00
Feross Aboukhadijeh	5ccabe756a	fix: OS X has no tray icon	2016-04-04 01:08:18 -07:00
DC	fb42b84245	Save state when quitting on OSX	2016-04-04 01:08:18 -07:00
DC	ee5b6ea472	PR #278 fixes	2016-04-04 01:08:18 -07:00
DC	609df9eb1e	Torrent warning & error events Fixes #253	2016-04-04 01:08:18 -07:00
DC	20157f39ee	Seed in place, don't copy to /tmp Fixes https://github.com/feross/webtorrent-desktop/issues/254	2016-04-04 01:08:18 -07:00
Feross Aboukhadijeh	c975f2f2d0	Merge pull request #283 from feross/greenkeeper-electron-prebuilt-0.37.4 Update electron-prebuilt to version 0.37.4 🚀	2016-04-03 21:22:54 -07:00
greenkeeperio-bot	c9559419cd	chore(package): update electron-prebuilt to version 0.37.4 http://greenkeeper.io/	2016-04-03 04:08:48 -07:00
grunjol	a064794c87	set error handling in pre and post init script	2016-04-02 09:20:00 -03:00
grunjol	faee840073	update installer version	2016-04-02 09:20:00 -03:00
grunjol	dd8ed77153	add package invocation change for deb/zip package	2016-04-02 09:20:00 -03:00
grunjol	27727a7a97	Linux: create Debian package	2016-04-02 09:20:00 -03:00
Feross Aboukhadijeh	f3771dd645	chore(package): update webtorrent to version 0.90.0 Update webtorrent to version 0.90.0 🚀	2016-04-02 02:03:01 -07:00
greenkeeperio-bot	52d909c374	chore(package): update webtorrent to version 0.90.0 http://greenkeeper.io/	2016-04-02 01:22:56 -07:00
Feross Aboukhadijeh	ae69d186f6	Fixes for PR #279	2016-04-02 00:39:37 -07:00
DC	04b7cdb24f	Don't re-verify unchanged files Keep track of the most recent file modtimes at which we verified that the torrent piece hashes all match.	2016-04-02 00:38:29 -07:00
Feross Aboukhadijeh	8868ec6d68	Update CONTRIBUTING.md	2016-04-01 21:27:47 -07:00
DC	15242666ce	UI: Pending torrent is not necessarily from magnet link	2016-04-01 03:54:17 -07:00
Feross Aboukhadijeh	a5255a3621	webtorrent@0.89	2016-04-01 01:13:39 -07:00
Feross Aboukhadijeh	76072b1be1	fix badge link issue the spaces between badges were linked	2016-04-01 00:31:52 -07:00
Feross Aboukhadijeh	7485750b41	electron-prebuilt@0.37.3	2016-04-01 00:12:58 -07:00
Feross Aboukhadijeh	f7482fce5b	remove debug dependency	2016-04-01 00:09:51 -07:00
Feross Aboukhadijeh	e402fb93fb	webtorrent-app -> webtorrent-desktop	2016-04-01 00:09:45 -07:00
DC	520ab99b21	Toggle show/hide in tray icon Fix state saving on app exit	2016-03-31 08:38:35 -07:00
DC	742061183b	Show new files immediately when seeding Fixes #208	2016-03-31 08:07:55 -07:00
DC	8a16ddb3d0	Don't log mediaTimeUpdate, less noise	2016-03-30 20:48:25 -07:00
DC	af783e0532	Save audio metadata, after extraction Fixes #260	2016-03-30 20:47:04 -07:00