v0.1.1

Merge pull request #250 from rom1504/add_binary
add binary, fix #247
2016-03-28 00:39:15 -07:00 · 2016-03-27 22:05:47 -07:00 · 2016-03-28 02:26:13 +02:00 · 2016-03-27 16:17:35 -07:00 · 2016-03-27 16:17:35 -07:00 · 2016-03-27 03:30:29 -07:00
31 changed files with 1250 additions and 472 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # WebTorrent.app Version History

+## v0.1.1
+
+- Performance improvements
+  - Improve app startup time by over 100%
+  - Reduce the number of DOM updates substantially
+  - Update UI immediately anytime state is changed, instead on 1 second interval
+- Added right-click menu
+  - Save .torrent File
+  - Copy Instant.io Link to Clipboard
+  - Copy Magnet Link to Clipbaord
+- Added keyboard shortcut for volume up (⌘/Ctrl + ↑) and volume down (⌘/Ctrl + ↓)
+- Add desktop launcher shortcuts, like OS X has, for KDE and GNOME (Linux)
+- Add "About" window (Windows, Linux)
+- Better default window size that fits all the default torrents
+- Fixed
+  - Crash when ".local/share/{applications,icons}" path did not exist (Linux)
+  - WebTorrent executable can be moved without breaking torrents in the client
+
+## v0.1.0
+
+- **Windows support!**
+  - Includes auto-updater, just like the OS X version.
+  - Installs desktop and start menu shortcuts.
+- **Audio file support!**
+  - Supports playback of .mp3, .aac, .ogg, .wav
+  - Audio file metadata gets shown in the UI
+- Top menu is no longer automatically hidden (Windows)
+- When magnet links are opened from third-party apps, the WebTorrent window now gets focus.
+- Subtler app sounds.
+- Fix for an issue that caused some magnet links to fail to open.
+
+**NOTE:** OS X users must install v0.1.0 manually because the app bundle ID was changed in this release, and the auto-updater cannot handle this condition.
+
+Thanks to @dcposch, @ngoldman, and @feross for contributing to this release.
+
 ## v0.0.1

 - Wait 10 seconds (instead of 60 seconds) after app launch before checking for updates.
--- a/README.md
+++ b/README.md
@@ -18,11 +18,15 @@
        <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>
 </p>

 ## Install

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

 ## Screenshot

@@ -58,10 +62,20 @@ To build for one platform:
 $ npm run package -- [platform]
 ```

-Where `[platform]` is `--darwin`, `--linux`, or `--win32`.
+Where `[platform]` is `darwin`, `linux`, or `win32`.

-To package a Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
-to be installed. On OS X, it is installable via [Homebrew](http://brew.sh/).
+#### Windows build notes
+
+To package the Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
+to be installed.
+
+On OS X, first install [XQuartz](http://www.xquartz.org/), then run:
+
+```
+brew install wine
+```
+
+(Requires the [Homebrew](http://brew.sh/) package manager.)

 ### Code Style

--- a/bin/cmd.js
+++ b/bin/cmd.js
@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+var electron = require('electron-prebuilt')
+var proc = require('child_process')
+var path = require('path')
+
+var child = proc.spawn(electron, [path.join(__dirname, '..')], {stdio: 'inherit'})
+child.on('close', function (code) {
+  process.exit(code)
+})
--- a/bin/package.js
+++ b/bin/package.js
@@ -10,16 +10,17 @@ var electronPackager = require('electron-packager')
 var fs = require('fs')
 var path = require('path')
 var pkg = require('../package.json')
+var rimraf = require('rimraf')

 var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION

 function build () {
  var platform = process.argv[2]
-  if (platform === '--darwin') {
+  if (platform === 'darwin') {
    buildDarwin(printDone)
-  } else if (platform === '--win32') {
+  } else if (platform === 'win32') {
    buildWin32(printDone)
-  } else if (platform === '--linux') {
+  } else if (platform === 'linux') {
    buildLinux(printDone)
  } else {
    buildDarwin(function (err, buildPath) {
@@ -59,7 +60,7 @@ var all = {

  // Pattern which specifies which files to ignore when copying files to create the
  // package(s).
-  ignore: /^\/dist|\/(appveyor.yml|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|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,
@@ -75,21 +76,21 @@ var all = {
  prune: true,

  // The Electron version with which the app is built (without the leading 'v')
-  version: pkg.devDependencies['electron-prebuilt']
+  version: pkg.dependencies['electron-prebuilt']
 }

 var darwin = {
  platform: 'darwin',

  // The bundle identifier to use in the application's plist (OS X only).
-  'app-bundle-id': 'io.webtorrent.app',
+  'app-bundle-id': 'io.webtorrent.webtorrent',

  // The application category type, as shown in the Finder via "View" -> "Arrange by
  // Application Category" when viewing the Applications directory (OS X only).
  'app-category-type': 'public.app-category.utilities',

  // The bundle identifier to use in the application helper's plist (OS X only).
-  'helper-bundle-id': 'io.webtorrent.app.helper',
+  'helper-bundle-id': 'io.webtorrent.webtorrent-helper',

  // Application icon.
  icon: config.APP_ICON + '.icns'
@@ -137,9 +138,7 @@ var linux = {
 build()

 function buildDarwin (cb) {
-  var appDmg = require('appdmg')
  var plist = require('plist')
-  var sign = require('electron-osx-sign')

  electronPackager(Object.assign({}, all, darwin), function (err, buildPath) {
    if (err) return cb(err)
@@ -185,6 +184,9 @@ function buildDarwin (cb) {
    cp.execSync(`cp ${config.APP_FILE_ICON + '.icns'} ${resourcesPath}`)

    if (process.platform === 'darwin') {
+      var appDmg = require('appdmg')
+      var sign = require('electron-osx-sign')
+
      /*
       * Sign the app with Apple Developer ID certificate. We sign the app for 2 reasons:
       *   - So the auto-updater (Squirrrel.Mac) can check that app updates are signed by
@@ -208,13 +210,17 @@ function buildDarwin (cb) {
        if (err) return cb(err)

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

        // Create a .dmg (OS X disk image) file, for easy user installation.
        var dmgOpts = {
          basepath: config.ROOT_PATH,
-          target: path.join(buildPath[0], BUILD_NAME + '.dmg'),
+          target: targetPath,
          specification: {
            title: config.APP_NAME,
            icon: config.APP_ICON + '.icns',
@@ -239,6 +245,7 @@ function buildDarwin (cb) {
          if (info.type === 'step-begin') console.log(info.title + '...')
        })
        dmg.on('finish', function (info) {
+          console.log('Created OS X disk image (.dmg) file.')
          cb(null, buildPath)
        })
      })
@@ -247,7 +254,33 @@ function buildDarwin (cb) {
 }

 function buildWin32 (cb) {
-  electronPackager(Object.assign({}, all, win32), cb)
+  var installer = require('electron-winstaller')
+
+  electronPackager(Object.assign({}, all, win32), function (err, buildPath) {
+    if (err) return cb(err)
+
+    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
+      usePackageJson: false,
+      loadingGif: path.join(config.STATIC_PATH, 'loading.gif')
+    }).then(function () {
+      console.log('Created Windows installer.')
+      cb(null, buildPath)
+    }).catch(cb)
+  })
 }

 function buildLinux (cb) {
--- a/config.js
+++ b/config.js
@@ -2,37 +2,65 @@ var applicationConfigPath = require('application-config-path')
 var path = require('path')

 var APP_NAME = 'WebTorrent'
+var APP_TEAM = 'The WebTorrent Project'
 var APP_VERSION = require('./package.json').version

 module.exports = {
-  APP_COPYRIGHT: 'Copyright © 2014-2016 The WebTorrent Project',
+  APP_COPYRIGHT: 'Copyright © 2014-2016 ' + APP_TEAM,
  APP_FILE_ICON: path.join(__dirname, 'static', 'WebTorrentFile'),
  APP_ICON: path.join(__dirname, 'static', 'WebTorrent'),
  APP_NAME: APP_NAME,
+  APP_TEAM: APP_TEAM,
  APP_VERSION: APP_VERSION,
+  APP_WINDOW_TITLE: APP_NAME + ' (BETA)',

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

  CONFIG_PATH: applicationConfigPath(APP_NAME),
  CONFIG_POSTER_PATH: path.join(applicationConfigPath(APP_NAME), 'Posters'),
  CONFIG_TORRENT_PATH: path.join(applicationConfigPath(APP_NAME), 'Torrents'),

-  INDEX: 'file://' + path.join(__dirname, 'renderer', 'index.html'),
-
  IS_PRODUCTION: isProduction(),

  ROOT_PATH: __dirname,
  STATIC_PATH: path.join(__dirname, 'static'),

-  SOUND_ADD: 'file://' + path.join(__dirname, 'static', 'sound', 'add.wav'),
-  SOUND_DELETE: 'file://' + path.join(__dirname, 'static', 'sound', 'delete.wav'),
-  SOUND_DISABLE: 'file://' + path.join(__dirname, 'static', 'sound', 'disable.wav'),
-  SOUND_DONE: 'file://' + path.join(__dirname, 'static', 'sound', 'done.wav'),
-  SOUND_ENABLE: 'file://' + path.join(__dirname, 'static', 'sound', 'enable.wav'),
-  SOUND_ERROR: 'file://' + path.join(__dirname, 'static', 'sound', 'error.wav'),
-  SOUND_PLAY: 'file://' + path.join(__dirname, 'static', 'sound', 'play.wav'),
-  SOUND_STARTUP: 'file://' + path.join(__dirname, 'static', 'sound', 'startup.wav')
+  SOUND_ADD: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'add.wav'),
+    volume: 0.2
+  },
+  SOUND_DELETE: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'delete.wav'),
+    volume: 0.1
+  },
+  SOUND_DISABLE: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'disable.wav'),
+    volume: 0.2
+  },
+  SOUND_DONE: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'done.wav'),
+    volume: 0.2
+  },
+  SOUND_ENABLE: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'enable.wav'),
+    volume: 0.2
+  },
+  SOUND_ERROR: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'error.wav'),
+    volume: 0.2
+  },
+  SOUND_PLAY: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'play.wav'),
+    volume: 0.2
+  },
+  SOUND_STARTUP: {
+    url: 'file://' + path.join(__dirname, 'static', 'sound', 'startup.wav'),
+    volume: 0.4
+  },
+
+  WINDOW_ABOUT: 'file://' + path.join(__dirname, 'renderer', 'about.html'),
+  WINDOW_MAIN: 'file://' + path.join(__dirname, 'renderer', 'main.html')
 }

 function isProduction () {
--- a/main/register-handlers.js
+++ b/main/register-handlers.js
@@ -1,46 +1,86 @@
+module.exports = {
+  init
+}
+
+var path = require('path')
+
 var log = require('./log')

-module.exports = function () {
+function init () {
  if (process.platform === 'win32') {
-    var path = require('path')
-    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)
+    initWindows()
  }
  if (process.platform === 'linux') {
-    installDesktopFile()
-    installDesktopIcon()
+    initLinux()
  }
 }

-function installDesktopFile () {
-  var config = require('../config')
-  var fs = require('fs')
-  var path = require('path')
-  var os = require('os')
-
-  var templatePath = path.join(config.STATIC_PATH, 'webtorrent.desktop')
-  var desktopFile = fs.readFileSync(templatePath, 'utf8')
-
-  desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
-  desktopFile = desktopFile.replace(/\$APP_PATH/g, path.dirname(process.execPath))
-  desktopFile = desktopFile.replace(/\$EXEC_PATH/g, process.execPath)
-
-  var desktopFilePath = path.join(os.homedir(), '.local', 'share', 'applications', 'webtorrent.desktop')
-  fs.writeFileSync(desktopFilePath, desktopFile)
+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 installDesktopIcon () {
+function initLinux () {
  var config = require('../config')
  var fs = require('fs')
-  var path = require('path')
+  var mkdirp = require('mkdirp')
  var os = require('os')
+  var path = require('path')

-  var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
-  var iconFile = fs.readFileSync(iconStaticPath)
+  installDesktopFile()
+  installIconFile()

-  var iconFilePath = path.join(os.homedir(), '.local', 'share', 'icons', 'webtorrent.png')
-  fs.writeFileSync(iconFilePath, iconFile)
+  function installDesktopFile () {
+    var templatePath = path.join(config.STATIC_PATH, 'webtorrent.desktop')
+    fs.readFile(templatePath, 'utf8', writeDesktopFile)
+  }
+
+  function writeDesktopFile (err, desktopFile) {
+    if (err) return console.error(err.message)
+
+    var appPath = config.IS_PRODUCTION ? path.dirname(process.execPath) : config.ROOT_PATH
+    var execPath = process.execPath + (config.IS_PRODUCTION ? '' : ' \.')
+    var tryExecPath = process.execPath
+
+    desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
+    desktopFile = desktopFile.replace(/\$APP_PATH/g, appPath)
+    desktopFile = desktopFile.replace(/\$EXEC_PATH/g, execPath)
+    desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, tryExecPath)
+
+    var desktopFilePath = path.join(
+      os.homedir(),
+      '.local',
+      'share',
+      'applications',
+      'webtorrent.desktop'
+    )
+    mkdirp(path.dirname(desktopFilePath))
+    fs.writeFile(desktopFilePath, desktopFile, function (err) {
+      if (err) return console.error(err.message)
+    })
+  }
+
+  function installIconFile () {
+    var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
+    fs.readFile(iconStaticPath, writeIconFile)
+  }
+
+  function writeIconFile (err, iconFile) {
+    if (err) return console.error(err.message)
+
+    var iconFilePath = path.join(
+      os.homedir(),
+      '.local',
+      'share',
+      'icons',
+      'webtorrent.png'
+    )
+    mkdirp(path.dirname(iconFilePath))
+    fs.writeFile(iconFilePath, iconFile, function (err) {
+      if (err) return console.error(err.message)
+    })
+  }
 }

 /**
--- a/main/index.js
+++ b/main/index.js
@@ -4,100 +4,128 @@ var app = electron.app

 var autoUpdater = require('./auto-updater')
 var config = require('../config')
+var handlers = require('./handlers')
 var ipc = require('./ipc')
 var log = require('./log')
 var menu = require('./menu')
-var registerProtocolHandler = require('./register-handlers')
 var shortcuts = require('./shortcuts')
+var squirrelWin32 = require('./squirrel-win32')
 var windows = require('./windows')

-// Prevent multiple instances of the app from running at the same time. New instances
-// signal this instance and exit.
-var shouldQuit = app.makeSingleInstance(function (newArgv) {
-  newArgv = sliceArgv(newArgv)
-
-  if (app.ipcReady) {
-    log('Second app instance attempted to open but was prevented')
-
-    newArgv.forEach(function (torrentId) {
-      windows.main.send('dispatch', 'onOpen', torrentId)
-    })
-
-    if (windows.main.isMinimized()) {
-      windows.main.restore()
-    }
-    windows.main.focus()
-  } else {
-    argv.push(...newArgv)
-  }
-})
-
-if (shouldQuit) {
-  app.quit()
-}
-
+var shouldQuit = false
 var argv = sliceArgv(process.argv)

-app.on('open-file', onOpen)
-app.on('open-url', onOpen)
-app.on('will-finish-launching', function () {
-  autoUpdater.init()
-  setupCrashReporter()
-})
+if (process.platform === 'win32') {
+  shouldQuit = squirrelWin32.handleEvent(argv[0])
+  argv = argv.filter((arg) => arg.indexOf('--squirrel') === -1)
+}

-app.ipcReady = false // main window has finished loading and IPC is ready
-app.isQuitting = false
-
-app.on('ready', function () {
-  menu.init()
-  windows.createMainWindow()
-  shortcuts.init()
-  registerProtocolHandler()
-})
-
-app.on('ipcReady', function () {
-  log('IS_PRODUCTION:', config.IS_PRODUCTION)
-  if (argv.length) {
-    log('command line args:', process.argv)
-  }
-  argv.forEach(function (torrentId) {
-    windows.main.send('dispatch', 'onOpen', torrentId)
-  })
-})
-
-app.on('before-quit', function () {
-  app.isQuitting = true
-})
-
-app.on('activate', function () {
-  if (windows.main) {
-    windows.main.show()
-  } else {
-    windows.createMainWindow(menu)
-  }
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') {
+if (!shouldQuit) {
+  // Prevent multiple instances of app from running at same time. New instances signal
+  // this instance and quit.
+  shouldQuit = app.makeSingleInstance(onAppOpen)
+  if (shouldQuit) {
    app.quit()
  }
-})
+}

-ipc.init()
+if (!shouldQuit) {
+  init()
+}
+
+function init () {
+  app.ipcReady = false // main window has finished loading and IPC is ready
+  app.isQuitting = false
+
+  // Open handlers must be added as early as possible
+  app.on('open-file', onOpen)
+  app.on('open-url', onOpen)
+
+  ipc.init()
+
+  app.on('will-finish-launching', function () {
+    autoUpdater.init()
+    setupCrashReporter()
+  })
+
+  app.on('ready', function () {
+    menu.init()
+    windows.createMainWindow()
+    shortcuts.init()
+    if (process.platform !== 'win32') handlers.init()
+  })
+
+  app.on('ipcReady', function () {
+    log('Command line args:', argv)
+    processArgv(argv)
+  })
+
+  app.on('before-quit', function () {
+    app.isQuitting = true
+  })
+
+  app.on('activate', function () {
+    windows.createMainWindow()
+  })
+
+  app.on('window-all-closed', function () {
+    if (process.platform !== 'darwin') {
+      app.quit()
+    }
+  })
+}

 function onOpen (e, torrentId) {
  e.preventDefault()
+
  if (app.ipcReady) {
    windows.main.send('dispatch', 'onOpen', torrentId)
+    // Magnet links opened from Chrome won't focus the app without a setTimeout. The
+    // confirmation dialog Chrome shows causes Chrome to steal back the focus.
+    // Electron issue: https://github.com/atom/electron/issues/4338
+    setTimeout(function () {
+      windows.focusWindow(windows.main)
+    }, 100)
  } else {
    argv.push(torrentId)
  }
 }

+function onAppOpen (newArgv) {
+  newArgv = sliceArgv(newArgv)
+
+  if (app.ipcReady) {
+    log('Second app instance opened, but was prevented:', newArgv)
+    windows.focusWindow(windows.main)
+
+    processArgv(newArgv)
+  } else {
+    argv.push(...newArgv)
+  }
+}
+
 function sliceArgv (argv) {
  return argv.slice(config.IS_PRODUCTION ? 1 : 2)
 }

+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)
+    }
+  })
+}
+
 function setupCrashReporter () {
  // require('crash-reporter').start({
  //   productName: 'WebTorrent',
--- a/main/ipc.js
+++ b/main/ipc.js
@@ -1,5 +1,5 @@
 module.exports = {
-  init: init
+  init
 }

 var debug = require('debug')('webtorrent-app:ipcMain')
@@ -18,14 +18,16 @@ var powerSaveBlockID = 0

 function init () {
  ipcMain.on('ipcReady', function (e) {
-    console.timeEnd('init')
    app.ipcReady = true
    app.emit('ipcReady')
+    setTimeout(function () {
+      windows.main.show()
+      console.timeEnd('init')
+    }, 50)
  })

-  ipcMain.on('showOpenTorrentFile', function (e) {
-    menu.showOpenTorrentFile()
-  })
+  ipcMain.on('showOpenTorrentFile', menu.showOpenTorrentFile)
+  ipcMain.on('showCreateTorrent', menu.showCreateTorrent)

  ipcMain.on('setBounds', function (e, bounds, maximize) {
    setBounds(bounds, maximize)
@@ -58,6 +60,9 @@ function init () {

  ipcMain.on('blockPowerSave', blockPowerSave)
  ipcMain.on('unblockPowerSave', unblockPowerSave)
+
+  ipcMain.on('onPlayerOpen', menu.onPlayerOpen)
+  ipcMain.on('onPlayerClose', menu.onPlayerClose)
 }

 function setBounds (bounds, maximize) {
--- a/main/menu.js
+++ b/main/menu.js
@@ -1,10 +1,13 @@
 module.exports = {
-  init: init,
-  onToggleFullScreen: onToggleFullScreen,
-  onWindowHide: onWindowHide,
-  onWindowShow: onWindowShow,
-  showOpenTorrentFile: showOpenTorrentFile,
-  toggleFullScreen: toggleFullScreen
+  init,
+  onToggleFullScreen,
+  onWindowHide,
+  onWindowShow,
+  onPlayerOpen,
+  onPlayerClose,
+  showCreateTorrent,
+  showOpenTorrentFile,
+  toggleFullScreen
 }

 var debug = require('debug')('webtorrent-app:menu')
@@ -43,6 +46,18 @@ function toggleFloatOnTop (flag) {
  }
 }

+function increaseVolume () {
+  if (windows.main) {
+    windows.main.send('dispatch', 'changeVolume', 0.1)
+  }
+}
+
+function decreaseVolume () {
+  if (windows.main) {
+    windows.main.send('dispatch', 'changeVolume', -0.1)
+  }
+}
+
 function toggleDevTools () {
  debug('toggleDevTools')
  if (windows.main) {
@@ -74,6 +89,16 @@ function onWindowHide () {
  getMenuItem('Float on Top').enabled = false
 }

+function onPlayerOpen () {
+  getMenuItem('Increase Volume').enabled = true
+  getMenuItem('Decrease Volume').enabled = true
+}
+
+function onPlayerClose () {
+  getMenuItem('Increase Volume').enabled = false
+  getMenuItem('Decrease Volume').enabled = false
+}
+
 function onToggleFullScreen (isFullScreen) {
  isFullScreen = isFullScreen != null ? isFullScreen : windows.main.isFullScreen()
  windows.main.setMenuBarVisibility(!isFullScreen)
@@ -195,6 +220,21 @@ function getAppMenuTemplate () {
        {
          type: 'separator'
        },
+        {
+          label: 'Increase Volume',
+          accelerator: 'CmdOrCtrl+Up',
+          click: increaseVolume,
+          enabled: false
+        },
+        {
+          label: 'Decrease Volume',
+          accelerator: 'CmdOrCtrl+Down',
+          click: decreaseVolume,
+          enabled: false
+        },
+        {
+          type: 'separator'
+        },
        {
          label: 'Developer',
          submenu: [
@@ -260,12 +300,12 @@ function getAppMenuTemplate () {
  ]

  if (process.platform === 'darwin') {
-    var name = app.getName()
+    // WebTorrent menu (OS X)
    template.unshift({
-      label: name,
+      label: config.APP_NAME,
      submenu: [
        {
-          label: 'About ' + name,
+          label: 'About ' + config.APP_NAME,
          role: 'about'
        },
        {
@@ -280,7 +320,7 @@ function getAppMenuTemplate () {
          type: 'separator'
        },
        {
-          label: 'Hide ' + name,
+          label: 'Hide ' + config.APP_NAME,
          accelerator: 'Command+H',
          role: 'hide'
        },
@@ -299,12 +339,12 @@ function getAppMenuTemplate () {
        {
          label: 'Quit',
          accelerator: 'Command+Q',
-          click: function () { app.quit() }
+          click: () => app.quit()
        }
      ]
    })

-    // Window menu
+    // Window menu (OS X)
    template[4].submenu.push(
      {
        type: 'separator'
@@ -314,6 +354,17 @@ function getAppMenuTemplate () {
        role: 'front'
      }
    )
+  } else {
+    // Help menu (Windows, Linux)
+    template[4].submenu.push(
+      {
+        type: 'separator'
+      },
+      {
+        label: 'About ' + config.APP_NAME,
+        click: windows.createAboutWindow
+      }
+    )
  }

  return template
--- a/main/shortcuts.js
+++ b/main/shortcuts.js
@@ -1,5 +1,5 @@
 module.exports = {
-  init: init
+  init
 }

 var electron = require('electron')
--- a/main/squirrel-win32.js
+++ b/main/squirrel-win32.js
@@ -0,0 +1,134 @@
+module.exports = {
+  handleEvent
+}
+
+var cp = require('child_process')
+var electron = require('electron')
+var fs = require('fs')
+var os = require('os')
+var path = require('path')
+var pathExists = require('path-exists')
+
+var app = electron.app
+
+var handlers = require('./handlers')
+
+var exeName = path.basename(process.execPath)
+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()
+
+    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)
+    })
+    return true
+  }
+
+  if (cmd === '--squirrel-updated') {
+    // App was updated. (Called on new version of app)
+    updateShortcuts(function () {
+      app.quit()
+    })
+    return true
+  }
+
+  if (cmd === '--squirrel-uninstall') {
+    // App was just uninstalled. Undo anything we did in the --squirrel-install and
+    // --squirrel-updated handlers
+    removeShortcuts(function () {
+      app.quit()
+    })
+    return true
+  }
+
+  if (cmd === '--squirrel-obsolete') {
+    // App will be updated. (Called on outgoing version of app)
+    app.quit()
+    return true
+  }
+
+  if (cmd === '--squirrel-firstrun') {
+    // This is called on the app's first run. Do not quit, allow startup to continue.
+    return false
+  }
+
+  return false
+}
+
+// Spawn a command and invoke the callback when it completes with an error and the output
+// from standard out.
+function spawn (command, args, cb) {
+  var stdout = ''
+
+  var child
+  try {
+    child = cp.spawn(command, args)
+  } catch (err) {
+    // Spawn can throw an error
+    process.nextTick(function () {
+      cb(error, stdout)
+    })
+    return
+  }
+
+  child.stdout.on('data', function (data) {
+    stdout += data
+  })
+
+  var error = null
+  child.on('error', function (processError) {
+    error = processError
+  })
+  child.on('close', function (code, signal) {
+    if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
+    if (error) error.stdout = stdout
+    cb(error, stdout)
+  })
+}
+
+// Spawn Squirrel's Update.exe with the given arguments and invoke the callback when the
+// command completes.
+function spawnUpdate (args, cb) {
+  spawn(updateDotExe, args, cb)
+}
+
+// Create desktop/start menu shortcuts using the Squirrel Update.exe command line API
+function createShortcuts (cb) {
+  spawnUpdate(['--createShortcut', exeName], cb)
+}
+
+// Update desktop/start menu shortcuts using the Squirrel Update.exe command line API
+function updateShortcuts (cb) {
+  var homeDir = os.homedir()
+  if (homeDir) {
+    var desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
+    // Check if the desktop shortcut has been previously deleted and and keep it deleted
+    // if it was
+    pathExists(desktopShortcutPath).then(function (desktopShortcutExists) {
+      createShortcuts(function () {
+        if (desktopShortcutExists) {
+          cb()
+        } else {
+          // Remove the unwanted desktop shortcut that was recreated
+          fs.unlink(desktopShortcutPath, cb)
+        }
+      })
+    })
+  } else {
+    createShortcuts(cb)
+  }
+}
+
+// Remove desktop/start menu shortcuts using the Squirrel Update.exe command line API
+function removeShortcuts (cb) {
+  spawnUpdate(['--removeShortcut', exeName], cb)
+}
--- a/main/windows.js
+++ b/main/windows.js
@@ -1,6 +1,9 @@
 var windows = module.exports = {
+  about: null,
  main: null,
-  createMainWindow: createMainWindow
+  createAboutWindow: createAboutWindow,
+  createMainWindow: createMainWindow,
+  focusWindow: focusWindow
 }

 var electron = require('electron')
@@ -10,30 +13,64 @@ var app = electron.app
 var config = require('../config')
 var menu = require('./menu')

+function createAboutWindow () {
+  if (windows.about) {
+    return focusWindow(windows.about)
+  }
+  var win = windows.about = new electron.BrowserWindow({
+    backgroundColor: '#ECECEC',
+    show: false,
+    center: true,
+    resizable: false,
+    icon: config.APP_ICON + '.png',
+    title: process.platform !== 'darwin'
+      ? 'About ' + config.APP_WINDOW_TITLE
+      : '',
+    useContentSize: true, // Specify web page size without OS chrome
+    width: 300,
+    height: 170,
+    minimizable: false,
+    maximizable: false,
+    fullscreen: false,
+    skipTaskbar: true
+  })
+  win.loadURL(config.WINDOW_ABOUT)
+
+  // No window menu
+  win.setMenu(null)
+
+  win.webContents.on('did-finish-load', function () {
+    win.show()
+  })
+
+  win.once('closed', function () {
+    windows.about = null
+  })
+}
+
 function createMainWindow () {
+  if (windows.main) {
+    return focusWindow(windows.main)
+  }
  var win = windows.main = new electron.BrowserWindow({
-    autoHideMenuBar: true, // Hide top menu bar unless Alt key is pressed (Windows, Linux)
    backgroundColor: '#282828',
    darkTheme: true, // Forces dark theme (GTK+3)
    icon: config.APP_ICON + '.png',
    minWidth: 375,
    minHeight: 38 + (120 * 2), // header height + 2 torrents
    show: false, // Hide window until DOM finishes loading
-    title: config.APP_NAME,
+    title: config.APP_WINDOW_TITLE,
    titleBarStyle: 'hidden-inset', // Hide OS chrome, except traffic light buttons (OS X)
+    useContentSize: true, // Specify web page size without OS chrome
    width: 450,
    height: 38 + (120 * 4) // header height + 4 torrents
  })
-  win.loadURL(config.INDEX)
+  win.loadURL(config.WINDOW_MAIN)

  win.webContents.on('dom-ready', function () {
    menu.onToggleFullScreen()
  })

-  win.webContents.on('did-finish-load', function () {
-    win.show()
-  })
-
  win.on('blur', menu.onWindowHide)
  win.on('focus', menu.onWindowShow)

@@ -52,3 +89,10 @@ function createMainWindow () {
    windows.main = null
  })
 }
+
+function focusWindow (win) {
+  if (win.isMinimized()) {
+    win.restore()
+  }
+  win.show() // shows and gives focus
+}
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "webtorrent-app",
  "description": "WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.",
-  "version": "0.0.1",
+  "version": "0.1.1",
  "author": {
    "name": "Feross Aboukhadijeh",
    "email": "feross@feross.org",
@@ -19,27 +19,31 @@
    "debug": "^2.2.0",
    "drag-drop": "^2.11.0",
    "electron-localshortcut": "^0.6.0",
+    "electron-prebuilt": "0.37.2",
    "hyperx": "^2.0.2",
    "main-loop": "^3.2.0",
    "mkdirp": "^0.5.1",
+    "musicmetadata": "^2.0.2",
    "network-address": "^1.1.0",
+    "path-exists": "^2.1.0",
    "prettier-bytes": "^1.0.1",
    "upload-element": "^1.0.1",
    "virtual-dom": "^2.1.1",
-    "webtorrent": "^0.86.0",
+    "webtorrent": "^0.87.1",
    "winreg": "^1.0.1"
  },
  "devDependencies": {
-    "appdmg": "^0.3.6",
    "electron-osx-sign": "^0.3.0",
    "electron-packager": "^5.0.0",
-    "electron-prebuilt": "0.37.2",
-    "gh-release": "^2.0.2",
-    "path-exists": "^2.1.0",
+    "electron-winstaller": "^2.0.5",
+    "gh-release": "^2.0.3",
    "plist": "^1.2.0",
    "rimraf": "^2.5.2",
    "standard": "^6.0.5"
  },
+  "optionalDependencies": {
+    "appdmg": "^0.3.6"
+  },
  "homepage": "https://webtorrent.io",
  "keywords": [
    "electron",
@@ -55,10 +59,13 @@
  "scripts": {
    "clean": "node ./bin/clean.js",
    "debug": "DEBUG=* electron .",
-    "package": "npm prune && npm dedupe && node ./bin/package.js",
-    "size": "npm run package -- --darwin && du -ch dist/WebTorrent-darwin-x64 | grep total",
+    "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-app": "./bin/cmd.js"
  }
 }
--- a/renderer/about.html
+++ b/renderer/about.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+      body {
+        background-color: #ECECEC;
+        font-family: BlinkMacSystemFont, 'Helvetica Neue', Helvetica, sans-serif;
+        text-align: center;
+        overflow: hidden;
+        font-size: 16px;
+        -webkit-user-select: none;
+      }
+      img {
+        width: 65px;
+        height: 65px;
+      }
+      h1 {
+        font-size: 0.9em;
+        -webkit-user-select: text;
+      }
+      p {
+        font-size: 0.8em;
+        -webkit-user-select: text;
+      }
+    </style>
+  </head>
+  <body>
+    <img src="../static/WebTorrent.png">
+    <h1>WebTorrent</h1>
+    <p>Version <script>document.write(require('../package.json').version)</script></p>
+    <p><script>document.write(require('../config').APP_COPYRIGHT)</script></p>
+  </body>
+</html>
--- a/renderer/index.css
+++ b/renderer/index.css
@@ -49,34 +49,6 @@ table {
  background-color: rgb(40, 40, 40);
 }

-.loading {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.loading .icon {
-  font-size: 42px;
-  display: block;
-  text-align: center;
-  animation: spin-ccw 2s infinite linear;
-}
-
-@keyframes spin {
-  from { transform: rotate(0deg); }
-  to   { transform: rotate(360deg); }
-}
-
-@keyframes spin-ccw {
-  from { transform: rotate(360deg); }
-  to   { transform: rotate(0deg); }
-}
-
@keyframes fadein {
  from { opacity: 0; }
  to   { opacity: 1; }
@@ -181,10 +153,10 @@ i:not(.disabled):hover {
  left: 0;
  top: 0;
  right: 0;
-  z-index: 1000;
  transition: opacity 0.15s ease-out;
  font-size: 14px;
  line-height: 1.5em;
+  z-index: 1;
 }

 .app:not(.is-focused) .header {
@@ -456,8 +428,7 @@ input {
  background-color: #F44336;
 }

-.torrent.timeout .play,
-.torrent.unplayable .play {
+.torrent.timeout .play {
  padding-top: 8px;
 }

@@ -732,17 +703,45 @@ body.drag .torrent-placeholder span {
  font-weight: bold;
 }

+/*
+ * AUDIO DETAILS
+ */
+
+.audio-metadata {
+  width: 500px;
+  max-width: 100%;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  align-self: center;
+  margin: 0 auto;
+  font-weight: bold;
+  font-size: 24px;
+  line-height: 2;
+}
+
+.audio-metadata .audio-title {
+  font-size: 32px;
+}
+
+.audio-metadata label {
+  display:inline-block;
+  width: 100px;
+  text-align: right;
+  font-weight: normal;
+  margin-right: 25px;
+}
+
 /*
 * ERRORS
 */

 .error-popover {
  position: fixed;
-  z-index: 1001;
  top: 36px;
  margin: 0;
  width: 100%;
  overflow: hidden;
+  z-index: 1;
 }

 .app.hide-header .error-popover {
--- a/renderer/index.js
+++ b/renderer/index.js
@@ -8,27 +8,35 @@ var EventEmitter = require('events')
 var fs = require('fs')
 var mainLoop = require('main-loop')
 var mkdirp = require('mkdirp')
+var musicmetadata = require('musicmetadata')
 var networkAddress = require('network-address')
 var path = require('path')
 var remote = require('remote')
-var WebTorrent = require('webtorrent')

 var createElement = require('virtual-dom/create-element')
 var diff = require('virtual-dom/diff')
 var patch = require('virtual-dom/patch')

 var App = require('./views/app')
-var Cast = require('./lib/cast')
 var errors = require('./lib/errors')
 var config = require('../config')
 var TorrentPlayer = require('./lib/torrent-player')
 var torrentPoster = require('./lib/torrent-poster')
+var util = require('./util')
+var {setDispatch} = require('./lib/dispatcher')
+setDispatch(dispatch)
+
+// These two dependencies are the slowest-loading, so we lazy load them
+// This cuts time from icon click to rendered window from ~550ms to ~150ms on my laptop
+var WebTorrent = null
+var Cast = null

 // Electron apps have two processes: a main process (node) runs first and starts
 // a renderer process (essentially a Chrome window). We're in the renderer process,
 // and this IPC channel receives from and sends messages to the main process
 var ipcRenderer = electron.ipcRenderer
 var clipboard = electron.clipboard
+var dialog = remote.require('dialog')

 // For easy debugging in Developer Tools
 var state = global.state = require('./state')
@@ -52,20 +60,11 @@ loadState(init)
 function init () {
  state.location.go({ url: 'home' })

-  // Connect to the WebTorrent and BitTorrent networks
-  // WebTorrent.app is a hybrid client, as explained here: https://webtorrent.io/faq
-  state.client = new WebTorrent()
-  state.client.on('warning', onWarning)
-  state.client.on('error', function (err) {
-    // TODO: WebTorrent should have semantic errors
-    if (err.message.startsWith('There is already a swarm')) {
-      onError(new Error('Couldn\'t add duplicate torrent'))
-    } else {
-      onError(err)
-    }
-  })
-  resumeTorrents() /* restart everything we were torrenting last time the app ran */
-  setInterval(updateTorrentProgress, 1000)
+  // Lazily load the WebTorrent, Chromecast, and Airplay modules
+  window.setTimeout(function () {
+    lazyLoadClient()
+    lazyLoadCast()
+  }, 750)

  // The UI is built with virtual-dom, a minimalist library extracted from React
  // The concepts--one way data flow, a pure function that renders state to a
@@ -78,23 +77,10 @@ function init () {
  })
  document.body.appendChild(vdomLoop.target)

-  // Calling update() updates the UI given the current state
-  // Do this at least once a second to show latest state for each torrent
-  // (eg % downloaded) and to keep the cursor in sync when playing a video
-  setInterval(function () {
-    update()
-    updateClientProgress()
-  }, 1000)
-
+  // Save state on exit
  window.addEventListener('beforeunload', saveState)

-  // listen for messages from the main process
-  setupIpc()
-
  // OS integrations:
-  // ...Chromecast and Airplay
-  Cast.init(update)
-
  // ...drag and drop a torrent or video file to play or seed
  dragDrop('body', (files) => dispatch('onOpen', files))

@@ -128,16 +114,65 @@ function init () {
    update()
  })

+  // Listen for messages from the main process
+  setupIpc()
+
  // Done! Ideally we want to get here <100ms after the user clicks the app
-  document.querySelector('.loading').remove() /* TODO: no spinner once fast enough */
-  playInterfaceSound(config.SOUND_STARTUP)
+  playInterfaceSound('STARTUP')
+
  console.timeEnd('init')
 }

+// Lazily loads the WebTorrent module and creates the WebTorrent client
+function lazyLoadClient () {
+  if (!WebTorrent) initWebtorrent()
+  return state.client
+}
+
+// Lazily loads Chromecast and Airplay support
+function lazyLoadCast () {
+  if (!Cast) {
+    Cast = require('./lib/cast')
+    Cast.init(update) // Search the local network for Chromecast and Airplays
+  }
+  return Cast
+}
+
+// Load the WebTorrent module, connect to both the WebTorrent and BitTorrent
+// networks, resume torrents, start monitoring torrent progress
+function initWebtorrent () {
+  WebTorrent = require('webtorrent')
+
+  // Connect to the WebTorrent and BitTorrent networks
+  // WebTorrent.app is a hybrid client, as explained here: https://webtorrent.io/faq
+  state.client = new WebTorrent()
+  state.client.on('warning', onWarning)
+  state.client.on('error', function (err) {
+    // TODO: WebTorrent should have semantic errors
+    if (err.message.startsWith('There is already a swarm')) {
+      onError(new Error('Couldn\'t add duplicate torrent'))
+    } else {
+      onError(err)
+    }
+  })
+
+  // Restart everything we were torrenting last time the app ran
+  resumeTorrents()
+
+  // Calling update() updates the UI given the current state
+  // Do this at least once a second to give  every file in every torrentSummary
+  // a progress bar and to keep the cursor in sync when playing a video
+  setInterval(function () {
+    if (!updateTorrentProgress()) {
+      update() // If we didn't just update(), do so now, for the video cursor
+    }
+  }, 1000)
+}
+
 // This is the (mostly) pure function from state -> UI. Returns a virtual DOM
 // tree. Any events, such as button clicks, will turn into calls to dispatch()
 function render (state) {
-  return App(state, dispatch)
+  return App(state)
 }

 // Calls render() to go from state -> UI, then applies to vdom to the real DOM.
@@ -163,70 +198,73 @@ function updateElectron () {

 // Events from the UI never modify state directly. Instead they call dispatch()
 function dispatch (action, ...args) {
-  if (['videoMouseMoved', 'playbackJump'].indexOf(action) === -1) {
-    console.log('dispatch: %s %o', action, args) /* log user interactions, but don't spam */
+  // Log dispatch calls, for debugging
+  if (action !== 'mediaMouseMoved') {
+    console.log('dispatch: %s %o', action, args)
  }
+
  if (action === 'onOpen') {
    onOpen(args[0] /* files */)
  }
  if (action === 'addTorrent') {
    addTorrent(args[0] /* torrent */)
  }
+  if (action === 'showCreateTorrent') {
+    ipcRenderer.send('showCreateTorrent')
+  }
  if (action === 'showOpenTorrentFile') {
    ipcRenderer.send('showOpenTorrentFile')
  }
  if (action === 'seed') {
    seed(args[0] /* files */)
  }
-  if (action === 'play') {
-    state.location.go({
-      url: 'player',
-      onbeforeload: function (cb) {
-        // TODO: handle audio. video only for now.
-        openPlayer(args[0] /* torrentSummary */, args[1] /* index */, cb)
-      },
-      onbeforeunload: closePlayer
-    })
-  }
  if (action === 'openFile') {
-    openFile(args[0] /* torrentSummary */, args[1] /* index */)
+    openFile(args[0] /* infoHash */, args[1] /* index */)
  }
  if (action === 'openFolder') {
-    openFolder(args[0] /* torrentSummary */)
+    openFolder(args[0] /* infoHash */)
  }
  if (action === 'toggleTorrent') {
-    toggleTorrent(args[0] /* torrentSummary */)
+    toggleTorrent(args[0] /* infoHash */)
  }
  if (action === 'deleteTorrent') {
-    deleteTorrent(args[0] /* torrentSummary */)
+    deleteTorrent(args[0] /* infoHash */)
  }
  if (action === 'toggleSelectTorrent') {
    toggleSelectTorrent(args[0] /* infoHash */)
  }
+  if (action === 'openTorrentContextMenu') {
+    openTorrentContextMenu(args[0] /* infoHash */)
+  }
  if (action === 'openChromecast') {
-    Cast.openChromecast()
+    lazyLoadCast().openChromecast()
  }
  if (action === 'openAirplay') {
-    Cast.openAirplay()
+    lazyLoadCast().openAirplay()
  }
  if (action === 'stopCasting') {
-    Cast.stopCasting()
+    lazyLoadCast().stopCasting()
  }
  if (action === 'setDimensions') {
    setDimensions(args[0] /* dimensions */)
  }
  if (action === 'back') {
    state.location.back()
-    update()
  }
  if (action === 'forward') {
    state.location.forward()
-    update()
  }
  if (action === 'playPause') {
    playPause()
  }
  if (action === 'play') {
+    state.location.go({
+      url: 'player',
+      onbeforeload: function (cb) {
+        openPlayer(args[0] /* infoHash */, args[1] /* index */, cb)
+      },
+      onbeforeunload: closePlayer
+    })
    playPause(false)
  }
  if (action === 'pause') {
@@ -235,46 +273,67 @@ function dispatch (action, ...args) {
  if (action === 'playbackJump') {
    jumpToTime(args[0] /* seconds */)
  }
-  if (action === 'videoPlaying') {
-    state.video.isPaused = false
+  if (action === 'changeVolume') {
+    changeVolume(args[0] /* increase */)
+  }
+  if (action === 'mediaPlaying') {
+    state.playing.isPaused = false
    ipcRenderer.send('blockPowerSave')
  }
-  if (action === 'videoPaused') {
-    state.video.isPaused = true
+  if (action === 'mediaPaused') {
+    state.playing.isPaused = true
    ipcRenderer.send('unblockPowerSave')
  }
  if (action === 'toggleFullScreen') {
-    ipcRenderer.send('toggleFullScreen', args[0])
-    update()
+    ipcRenderer.send('toggleFullScreen', args[0] /* optional bool */)
  }
-  if (action === 'videoMouseMoved') {
-    state.video.mouseStationarySince = new Date().getTime()
-    update()
+  if (action === 'mediaMouseMoved') {
+    state.playing.mouseStationarySince = new Date().getTime()
  }
  if (action === 'exitModal') {
    state.modal = null
+  }
+
+  // Update the virtual-dom, unless it's just a mouse move event
+  if (action !== 'mediaMouseMoved') {
    update()
  }
 }

 // Plays or pauses the video. If isPaused is undefined, acts as a toggle
 function playPause (isPaused) {
-  if (isPaused === state.video.isPaused) {
+  if (isPaused === state.playing.isPaused) {
    return // Nothing to do
  }
  // Either isPaused is undefined, or it's the opposite of the current state. Toggle.
-  if (Cast.isCasting()) {
+  if (lazyLoadCast().isCasting()) {
    Cast.playPause()
  }
-  state.video.isPaused = !state.video.isPaused
+  state.playing.isPaused = !state.playing.isPaused
  update()
 }

 function jumpToTime (time) {
-  if (Cast.isCasting()) {
+  if (lazyLoadCast().isCasting()) {
    Cast.seek(time)
  } else {
-    state.video.jumpToTime = time
+    state.playing.jumpToTime = time
+    update()
+  }
+}
+
+function changeVolume (delta) {
+  // change volume with delta value
+  setVolume(state.playing.volume + delta)
+}
+
+function setVolume (volume) {
+  // check if its in [0.0 - 1.0] range
+  volume = Math.max(0, Math.min(1, volume))
+  if (lazyLoadCast().isCasting()) {
+    Cast.setVolume(volume)
+  } else {
+    state.playing.setVolume = volume
    update()
  }
 }
@@ -337,18 +396,6 @@ function saveState () {
  })
 }

-function updateClientProgress () {
-  var progress = state.client.progress
-  var activeTorrentsExist = state.client.torrents.some(function (torrent) {
-    return torrent.progress !== 1
-  })
-  // Hide progress bar when client has no torrents, or progress is 100%
-  if (!activeTorrentsExist || progress === 1) {
-    progress = -1
-  }
-  state.dock.progress = progress
-}
-
 function onOpen (files) {
  if (!Array.isArray(files)) files = [ files ]

@@ -392,7 +439,9 @@ function getTorrentSummary (infoHash) {
 // Get an active torrent from state.client.torrents
 // Returns undefined if we are not currently torrenting that infoHash
 function getTorrent (infoHash) {
-  return state.client.torrents.find((x) => x.infoHash === infoHash)
+  var pending = state.pendingTorrents[infoHash]
+  if (pending) return pending
+  return lazyLoadClient().torrents.find((x) => x.infoHash === infoHash)
 }

 // Adds a torrent to the list, starts downloading/seeding. TorrentID can be a
@@ -418,27 +467,34 @@ function addTorrentToList (torrent) {
    state.saved.torrents.push({
      status: 'new',
      name: torrent.name,
-      magnetURI: torrent.magnetURI,
-      infoHash: torrent.infoHash
+      infoHash: torrent.infoHash,
+      magnetURI: torrent.magnetURI
    })
    saveState()
-    playInterfaceSound(config.SOUND_ADD)
+    playInterfaceSound('ADD')
  }
 }

 // Starts downloading and/or seeding a given torrentSummary. Returns WebTorrent object
 function startTorrentingSummary (torrentSummary) {
  var s = torrentSummary
-  if (s.torrentPath) return startTorrentingID(s.torrentPath, s.path)
-  else if (s.magnetURI) return startTorrentingID(s.magnetURI, s.path)
-  else return startTorrentingID(s.infoHash, s.path)
+  if (s.torrentPath) {
+    var torrentPath = util.getAbsoluteStaticPath(s.torrentPath)
+    var ret = startTorrentingID(torrentPath, s.path)
+    if (s.infoHash) state.pendingTorrents[s.infoHash] = ret
+    return ret
+  } else if (s.magnetURI) {
+    return startTorrentingID(s.magnetURI, s.path)
+  } else {
+    return startTorrentingID(s.infoHash, s.path)
+  }
 }

 // 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 startTorrentingID (torrentID, path) {
-  console.log('Starting torrent ' + torrentID)
-  var torrent = state.client.add(torrentID, {
+  console.log('starting torrent ' + torrentID)
+  var torrent = lazyLoadClient().add(torrentID, {
    path: path || state.saved.downloadPath // Use downloads folder
  })
  addTorrentEvents(torrent)
@@ -454,13 +510,17 @@ function stopTorrenting (infoHash) {
 // Creates a torrent for a local file and starts seeding it
 function seed (files) {
  if (files.length === 0) return
-  var torrent = state.client.seed(files)
+  var torrent = lazyLoadClient().seed(files)
  addTorrentToList(torrent)
  addTorrentEvents(torrent)
 }

 function addTorrentEvents (torrent) {
-  torrent.on('infoHash', update)
+  torrent.on('infoHash', function () {
+    var infoHash = torrent.infoHash
+    if (state.pendingTorrents[infoHash]) delete state.pendingTorrents[infoHash]
+    update()
+  })
  torrent.on('ready', torrentReady)
  torrent.on('done', torrentDone)

@@ -470,7 +530,6 @@ function addTorrentEvents (torrent) {
    torrentSummary.status = 'downloading'
    torrentSummary.ready = true
    torrentSummary.name = torrentSummary.displayName || torrent.name
-    torrentSummary.infoHash = torrent.infoHash
    torrentSummary.path = torrent.path

    // Summarize torrent files
@@ -506,12 +565,27 @@ function addTorrentEvents (torrent) {
 }

 function updateTorrentProgress () {
+  var changed = false
+
+  // First, track overall progress
+  var progress = lazyLoadClient().progress
+  var activeTorrentsExist = lazyLoadClient().torrents.some(function (torrent) {
+    return torrent.progress !== 1
+  })
+  // Hide progress bar when client has no torrents, or progress is 100%
+  if (!activeTorrentsExist || progress === 1) {
+    progress = -1
+  }
+  // Show progress bar under the WebTorrent taskbar icon, on OSX
+  if (state.dock.progress !== progress) changed = true
+  state.dock.progress = progress
+
+  // Track progress for every file in each torrentSummary
  // TODO: ideally this would be tracked by WebTorrent, which could do it
  // more efficiently than looping over torrent.bitfield
-  var changed = false
-  state.client.torrents.forEach(function (torrent) {
+  lazyLoadClient().torrents.forEach(function (torrent) {
    var torrentSummary = getTorrentSummary(torrent.infoHash)
-    if (!torrentSummary) return
+    if (!torrentSummary || !torrent.ready) return
    torrent.files.forEach(function (file, index) {
      var numPieces = file._endPiece - file._startPiece + 1
      var numPiecesPresent = 0
@@ -529,6 +603,7 @@ function updateTorrentProgress () {
  })

  if (changed) update()
+  return changed
 }

 function generateTorrentPoster (torrent, torrentSummary) {
@@ -541,7 +616,7 @@ function generateTorrentPoster (torrent, torrentSummary) {
      fs.writeFile(posterFilePath, buf, function (err) {
        if (err) return onWarning(err)
        // show the poster
-        torrentSummary.posterURL = 'file:///' + posterFilePath
+        torrentSummary.posterURL = posterFilePath
        update()
      })
    })
@@ -572,8 +647,8 @@ function saveTorrentFile (torrentSummary, torrent) {
    // 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)
+        if (err) return console.log('error saving torrent file %s: %o', torrentPath, err)
+        console.log('saved torrent file %s', torrentPath)
        torrentSummary.torrentPath = torrentPath
        saveState()
      })
@@ -601,21 +676,25 @@ function startServer (torrentSummary, index, cb) {

 function startServerFromReadyTorrent (torrent, index, cb) {
  // automatically choose which file in the torrent to play, if necessary
-  if (!index) {
-    // filter out file formats that the <video> tag definitely can't play
-    var files = torrent.files.filter(TorrentPlayer.isPlayable)
-    if (files.length === 0) return cb(new errors.UnplayableError())
-    // use largest file
-    var largestFile = files.reduce(function (a, b) {
-      return a.length > b.length ? a : b
-    })
-    index = torrent.files.indexOf(largestFile)
-  }
+  if (index === undefined) index = pickFileToPlay(torrent.files)
+  if (index === undefined) return cb(new errors.UnplayableError())
+  var file = torrent.files[index]

  // update state
  state.playing.infoHash = torrent.infoHash
  state.playing.fileIndex = index
+  state.playing.type = TorrentPlayer.isVideo(file) ? 'video' : 'audio'
+  state.playing.audioInfo = null

+  // if it's audio, parse out the metadata (artist, title, etc)
+  musicmetadata(file.createReadStream(), function (err, info) {
+    if (err) return
+    console.log('got audio metadata for %s: %v', file.name, info)
+    state.playing.audioInfo = info
+    update()
+  })
+
+  // either way, start a streaming torrent-to-http server
  var server = torrent.createServer()
  server.listen(0, function () {
    var port = server.address().port
@@ -629,6 +708,28 @@ function startServerFromReadyTorrent (torrent, index, cb) {
  })
 }

+// Picks the default file to play from a list of torrent or torrentSummary files
+// Returns an index or undefined, if no files are playable
+function pickFileToPlay (files) {
+  // first, try to find the biggest video file
+  var videoFiles = files.filter(TorrentPlayer.isVideo)
+  if (videoFiles.length > 0) {
+    var largestVideoFile = videoFiles.reduce(function (a, b) {
+      return a.length > b.length ? a : b
+    })
+    return files.indexOf(largestVideoFile)
+  }
+
+  // if there are no videos, play the first audio file
+  var audioFiles = files.filter(TorrentPlayer.isAudio)
+  if (audioFiles.length > 0) {
+    return files.indexOf(audioFiles[0])
+  }
+
+  // no video or audio means nothing is playable
+  return undefined
+}
+
 function stopServer () {
  if (!state.server) return
  state.server.server.destroy()
@@ -638,15 +739,16 @@ function stopServer () {
 }

 // Opens the video player
-function openPlayer (torrentSummary, index, cb) {
-  var torrent = state.client.get(torrentSummary.infoHash)
-  if (!torrent || !torrent.done) playInterfaceSound(config.SOUND_PLAY)
+function openPlayer (infoHash, index, cb) {
+  var torrentSummary = getTorrentSummary(infoHash)
+  var torrent = lazyLoadClient().get(infoHash)
+  if (!torrent || !torrent.done) playInterfaceSound('PLAY')
  torrentSummary.playStatus = 'requested'
  update()

  var timeout = setTimeout(function () {
    torrentSummary.playStatus = 'timeout' /* no seeders available? */
-    playInterfaceSound(config.SOUND_ERROR)
+    playInterfaceSound('ERROR')
    update()
  }, 10000) /* give it a few seconds */

@@ -654,7 +756,7 @@ function openPlayer (torrentSummary, index, cb) {
    clearTimeout(timeout)
    if (err) {
      torrentSummary.playStatus = 'unplayable'
-      playInterfaceSound(config.SOUND_ERROR)
+      playInterfaceSound('ERROR')
      update()
      return onError(err)
    }
@@ -665,22 +767,42 @@ function openPlayer (torrentSummary, index, cb) {
    if (timedOut) return update()

    // otherwise, play the video
-    state.window.title = torrentSummary.name
+    state.window.title = torrentSummary.files[state.playing.fileIndex].name
    update()
+
+    ipcRenderer.send('onPlayerOpen')
+
    cb()
  })
 }

-function openFile (torrentSummary, index) {
-  var torrent = state.client.get(torrentSummary.infoHash)
+function closePlayer (cb) {
+  state.window.title = config.APP_WINDOW_TITLE
+  update()
+
+  if (state.window.isFullScreen) {
+    dispatch('toggleFullScreen', false)
+  }
+  restoreBounds()
+  stopServer()
+  update()
+
+  ipcRenderer.send('unblockPowerSave')
+  ipcRenderer.send('onPlayerClose')
+
+  cb()
+}
+
+function openFile (infoHash, index) {
+  var torrent = lazyLoadClient().get(infoHash)
  if (!torrent) return

  var filePath = path.join(torrent.path, torrent.files[index].path)
  ipcRenderer.send('openItem', filePath)
 }

-function openFolder (torrentSummary) {
-  var torrent = state.client.get(torrentSummary.infoHash)
+function openFolder (infoHash) {
+  var torrent = lazyLoadClient().get(infoHash)
  if (!torrent) return

  var folderPath = path.join(torrent.path, torrent.name)
@@ -694,36 +816,20 @@ function openFolder (torrentSummary) {
  })
 }

-function closePlayer (cb) {
-  state.window.title = config.APP_NAME
-  update()
-
-  if (state.window.isFullScreen) {
-    dispatch('toggleFullScreen', false)
-  }
-  restoreBounds()
-  stopServer()
-  update()
-
-  ipcRenderer.send('unblockPowerSave')
-
-  cb()
-}
-
-function toggleTorrent (torrentSummary) {
+function toggleTorrent (infoHash) {
+  var torrentSummary = getTorrentSummary(infoHash)
  if (torrentSummary.status === 'paused') {
    torrentSummary.status = 'new'
    startTorrentingSummary(torrentSummary)
-    playInterfaceSound(config.SOUND_ENABLE)
+    playInterfaceSound('ENABLE')
  } else {
    torrentSummary.status = 'paused'
    stopTorrenting(torrentSummary.infoHash)
-    playInterfaceSound(config.SOUND_DISABLE)
+    playInterfaceSound('DISABLE')
  }
 }

-function deleteTorrent (torrentSummary) {
-  var infoHash = torrentSummary.infoHash
+function deleteTorrent (infoHash) {
  var torrent = getTorrent(infoHash)
  if (torrent) torrent.destroy()

@@ -731,7 +837,7 @@ function deleteTorrent (torrentSummary) {
  if (index > -1) state.saved.torrents.splice(index, 1)
  saveState()
  state.location.clearForward() // prevent user from going forward to a deleted torrent
-  playInterfaceSound(config.SOUND_DELETE)
+  playInterfaceSound('DELETE')
 }

 function toggleSelectTorrent (infoHash) {
@@ -740,6 +846,48 @@ function toggleSelectTorrent (infoHash) {
  update()
 }

+function openTorrentContextMenu (infoHash) {
+  var torrentSummary = getTorrentSummary(infoHash)
+  var menu = new remote.Menu()
+  menu.append(new remote.MenuItem({
+    label: 'Save Torrent File As...',
+    click: () => saveTorrentFileAs(torrentSummary)
+  }))
+
+  menu.append(new remote.MenuItem({
+    label: 'Copy Instant.io Link to Clipboard',
+    click: () => clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
+  }))
+
+  menu.append(new remote.MenuItem({
+    label: 'Copy Magnet Link to Clipboard',
+    click: () => clipboard.writeText(torrentSummary.magnetURI)
+  }))
+
+  menu.popup(remote.getCurrentWindow())
+}
+
+function saveTorrentFileAs (torrentSummary) {
+  var newFileName = `${path.parse(torrentSummary.name).name}.torrent`
+  var opts = {
+    title: 'Save Torrent File',
+    defaultPath: path.join(state.saved.downloadPath, newFileName),
+    filters: [
+      { name: 'Torrent Files', extensions: ['torrent'] },
+      { name: 'All Files', extensions: ['*'] }
+    ]
+  }
+  dialog.showSaveDialog(remote.getCurrentWindow(), opts, (savePath) => {
+    var torrentPath = util.getAbsoluteStaticPath(torrentSummary.torrentPath)
+    fs.readFile(torrentPath, function (err, torrentFile) {
+      if (err) return onError(err)
+      fs.writeFile(savePath, torrentFile, function (err) {
+        if (err) return onError(err)
+      })
+    })
+  })
+}
+
 // Set window dimensions to match video dimensions or fill the screen
 function setDimensions (dimensions) {
  // Don't modify the window size if it's already maximized
@@ -785,7 +933,7 @@ function restoreBounds () {

 function onError (err) {
  console.error(err.stack || err)
-  playInterfaceSound(config.SOUND_ERROR)
+  playInterfaceSound('ERROR')
  state.errors.push({
    time: new Date().getTime(),
    message: err.message || err
@@ -809,12 +957,15 @@ function showDoneNotification (torrent) {
    window.focus()
  }

-  playInterfaceSound(config.SOUND_DONE)
+  playInterfaceSound('DONE')
 }

-function playInterfaceSound (url) {
+function playInterfaceSound (name) {
+  var sound = config[`SOUND_${name}`]
+  if (!sound) throw new Error('Invalid sound name')
+
  var audio = new window.Audio()
-  audio.volume = 0.3
-  audio.src = url
+  audio.volume = sound.volume
+  audio.src = sound.url
  audio.play()
 }
--- a/renderer/lib/cast.js
+++ b/renderer/lib/cast.js
@@ -14,6 +14,7 @@ module.exports = {
  stopCasting,
  playPause,
  seek,
+  setVolume,
  isCasting
 }

@@ -56,15 +57,19 @@ function addAirplayEvents () {}
 function pollCastStatus (state) {
  if (state.playing.location === 'chromecast') {
    state.devices.chromecast.status(function (err, status) {
-      if (err) return console.log('Error getting %s status: %o', state.playing.location, err)
-      state.video.isPaused = status.playerState === 'PAUSED'
-      state.video.currentTime = status.currentTime
+      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) {
-      state.video.isPaused = status.rate === 0
-      state.video.currentTime = status.position
+      state.playing.isPaused = status.rate === 0
+      state.playing.currentTime = status.position
+      // TODO: get airplay volume, implementation needed. meanwhile set value in setVolume
+      // According to docs is in [-30 - 0] (db) range
+      // should be converted to [0 - 1] using (val / 30 + 1)
      update()
    })
  }
@@ -122,7 +127,7 @@ function stopCasting () {

 function stoppedCasting () {
  state.playing.location = 'local'
-  state.video.jumpToTime = state.video.currentTime
+  state.playing.jumpToTime = state.playing.currentTime
  update()
 }

@@ -137,11 +142,11 @@ function playPause () {
  var device
  if (state.playing.location === 'chromecast') {
    device = state.devices.chromecast
-    if (!state.video.isPaused) device.pause(castCallback)
+    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.video.isPaused) device.rate(0, castCallback)
+    if (!state.playing.isPaused) device.rate(0, castCallback)
    else device.rate(1, castCallback)
  }
 }
@@ -154,6 +159,17 @@ function seek (time) {
  }
 }

+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)
+  }
+}
+
 function castCallback () {
  console.log(state.playing.location + ' callback: %o', arguments)
 }
--- a/renderer/lib/dispatcher.js
+++ b/renderer/lib/dispatcher.js
@@ -0,0 +1,36 @@
+module.exports = {
+  setDispatch,
+  dispatch,
+  dispatcher
+}
+
+// Memoize most of our event handlers, which are functions in the form
+// () => dispatch(<args>)
+// ... this prevents virtual-dom from updating every listener on every update()
+var _dispatchers = {}
+var _dispatch = () => {}
+
+function setDispatch (dispatch) {
+  _dispatch = dispatch
+}
+
+// Get a _memoized event handler that calls dispatch()
+// All args must be JSON-able
+function dispatcher (...args) {
+  var json = JSON.stringify(args)
+  var handler = _dispatchers[json]
+  if (!handler) {
+    _dispatchers[json] = (e) => {
+      // 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
+      _dispatch.apply(null, args)
+    }
+  }
+  return handler
+}
+
+function dispatch (...args) {
+  _dispatch.apply(null, args)
+}
--- a/renderer/lib/torrent-player.js
+++ b/renderer/lib/torrent-player.js
@@ -1,5 +1,7 @@
 module.exports = {
-  isPlayable: isPlayable
+  isPlayable,
+  isVideo,
+  isAudio
 }

 var path = require('path')
@@ -8,6 +10,15 @@ var path = require('path')
 * Determines whether a file in a torrent is audio/video we can play
 */
 function isPlayable (file) {
-  var extname = path.extname(file.name)
-  return ['.mp4', '.m4v', '.webm', '.mov', '.mkv'].indexOf(extname) !== -1
+  return isVideo(file) || isAudio(file)
+}
+
+function isVideo (file) {
+  var ext = path.extname(file.name)
+  return ['.mp4', '.m4v', '.webm', '.mov', '.mkv'].indexOf(ext) !== -1
+}
+
+function isAudio (file) {
+  var ext = path.extname(file.name)
+  return ['.mp3', '.aac', '.ogg', '.wav'].indexOf(ext) !== -1
 }
--- a/renderer/index.html
+++ b/renderer/index.html
@@ -6,7 +6,6 @@
    <link rel="stylesheet" href="index.css" charset="utf-8">
  </head>
  <body>
-    <div class="loading"><i class="icon">sync</i></div>
    <script async src="index.js"></script>
  </body>
 </html>
--- a/renderer/state.js
+++ b/renderer/state.js
@@ -17,24 +17,25 @@ module.exports = {
    bounds: null, /* {x, y, width, height } */
    isFocused: true,
    isFullScreen: false,
-    title: config.APP_NAME /* current window title */
+    title: config.APP_WINDOW_TITLE
  },
  selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
-  playing: { /* the torrent and file we're currently streaming */
+  playing: { /* the media (audio or video) that we're currently playing */
    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' */
-  },
-  devices: { /* playback devices like Chromecast and AppleTV */
-    airplay: null, /* airplay client. finds and manages AppleTVs */
-    chromecast: null /* chromecast client. finds and manages Chromecasts */
-  },
-  video: { /* state of the video player screen */
+    location: 'local', /* 'local', 'chromecast', 'airplay' */
+    type: null, /* 'audio' or 'video' */
    currentTime: 0, /* seconds */
    duration: 1, /* seconds */
    isPaused: true,
    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
@@ -64,9 +65,10 @@ module.exports = {
      {
        status: 'paused',
        infoHash: '88594aaacbde40ef3e2510c47374ec0aa396c08e',
+        magnetURI: 'magnet:?xt=urn:btih:88594aaacbde40ef3e2510c47374ec0aa396c08e&dn=bbb_sunflower_1080p_30fps_normal.mp4&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.publicbt.com%3A80%2Fannounce&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=http%3A%2F%2Fdistribution.bbb3d.renderfarming.net%2Fvideo%2Fmp4%2Fbbb_sunflower_1080p_30fps_normal.mp4',
        displayName: 'Big Buck Bunny',
-        posterURL: path.join(config.ROOT_PATH, 'static', 'bigBuckBunny.jpg'),
-        torrentPath: path.join(config.ROOT_PATH, 'static', 'bigBuckBunny.torrent'),
+        posterURL: 'bigBuckBunny.jpg',
+        torrentPath: 'bigBuckBunny.torrent',
        files: [
          {
            'name': 'bbb_sunflower_1080p_30fps_normal.mp4',
@@ -79,9 +81,10 @@ module.exports = {
      {
        status: 'paused',
        infoHash: '6a9759bffd5c0af65319979fb7832189f4f3c35d',
+        magnetURI: 'magnet:?xt=urn:btih:6a9759bffd5c0af65319979fb7832189f4f3c35d&dn=sintel.mp4&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel-1024-surround.mp4',
        displayName: 'Sintel',
-        posterURL: path.join(config.ROOT_PATH, 'static', 'sintel.jpg'),
-        torrentPath: path.join(config.ROOT_PATH, 'static', 'sintel.torrent'),
+        posterURL: 'sintel.jpg',
+        torrentPath: 'sintel.torrent',
        files: [
          {
            'name': 'sintel.mp4',
@@ -94,9 +97,10 @@ module.exports = {
      {
        status: 'paused',
        infoHash: '02767050e0be2fd4db9a2ad6c12416ac806ed6ed',
+        magnetURI: 'magnet:?xt=urn:btih:02767050e0be2fd4db9a2ad6c12416ac806ed6ed&dn=tears_of_steel_1080p.webm&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io',
        displayName: 'Tears of Steel',
-        posterURL: path.join(config.ROOT_PATH, 'static', 'tearsOfSteel.jpg'),
-        torrentPath: path.join(config.ROOT_PATH, 'static', 'tearsOfSteel.torrent'),
+        posterURL: 'tearsOfSteel.jpg',
+        torrentPath: 'tearsOfSteel.torrent',
        files: [
          {
            'name': 'tears_of_steel_1080p.webm',
--- a/renderer/util.js
+++ b/renderer/util.js
@@ -0,0 +1,9 @@
+var path = require('path')
+
+var config = require('../config')
+
+exports.getAbsoluteStaticPath = function (filePath) {
+  return path.isAbsolute(filePath)
+    ? filePath
+    : path.join(config.STATIC_PATH, filePath)
+}
--- a/renderer/views/app.js
+++ b/renderer/views/app.js
@@ -18,9 +18,9 @@ function App (state, dispatch) {
  // * The video is paused
  // * The video is playing remotely on Chromecast or Airplay
  var hideControls = state.location.current().url === 'player' &&
-    state.video.mouseStationarySince !== 0 &&
-    new Date().getTime() - state.video.mouseStationarySince > 2000 &&
-    !state.video.isPaused &&
+    state.playing.mouseStationarySince !== 0 &&
+    new Date().getTime() - state.playing.mouseStationarySince > 2000 &&
+    !state.playing.isPaused &&
    state.playing.location === 'local'

  // Hide the header on Windows/Linux when in the player
--- a/renderer/views/header.js
+++ b/renderer/views/header.js
@@ -4,7 +4,9 @@ var h = require('virtual-dom/h')
 var hyperx = require('hyperx')
 var hx = hyperx(h)

-function Header (state, dispatch) {
+var {dispatcher} = require('../lib/dispatcher')
+
+function Header (state) {
  return hx`
    <div class='header'>
      ${getTitle()}
@@ -12,13 +14,13 @@ function Header (state, dispatch) {
        <i.icon.back
          class=${state.location.hasBack() ? '' : 'disabled'}
          title='Back'
-          onclick=${() => dispatch('back')}>
+          onclick=${dispatcher('back')}>
          chevron_left
        </i>
        <i.icon.forward
          class=${state.location.hasForward() ? '' : 'disabled'}
          title='Forward'
-          onclick=${() => dispatch('forward')}>
+          onclick=${dispatcher('forward')}>
          chevron_right
        </i>
      </div>
@@ -40,7 +42,7 @@ function Header (state, dispatch) {
        <i
          class='icon add'
          title='Add torrent'
-          onclick=${() => dispatch('showOpenTorrentFile')}>
+          onclick=${dispatcher('showOpenTorrentFile')}>
          add
        </i>
      `
--- a/renderer/views/open-torrent-address-modal.js
+++ b/renderer/views/open-torrent-address-modal.js
@@ -4,7 +4,9 @@ var h = require('virtual-dom/h')
 var hyperx = require('hyperx')
 var hx = hyperx(h)

-function OpenTorrentAddressModal (state, dispatch) {
+var {dispatch} = require('../lib/dispatcher')
+
+function OpenTorrentAddressModal (state) {
  return hx`
    <div class='open-torrent-address-modal'>
      <p><strong>Enter torrent address or magnet link</strong></p>
@@ -15,17 +17,17 @@ function OpenTorrentAddressModal (state, dispatch) {
      </p>
    </div>
  `
-
-  function handleKeyPress (e) {
-    if (e.which === 13) handleOK() /* hit Enter to submit */
-  }
-
-  function handleOK () {
-    dispatch('exitModal')
-    dispatch('addTorrent', document.querySelector('#add-torrent-url').value)
-  }
-
-  function handleCancel () {
-    dispatch('exitModal')
-  }
+}
+
+function handleKeyPress (e) {
+  if (e.which === 13) handleOK() /* hit Enter to submit */
+}
+
+function handleOK () {
+  dispatch('exitModal')
+  dispatch('addTorrent', document.querySelector('#add-torrent-url').value)
+}
+
+function handleCancel () {
+  dispatch('exitModal')
 }
--- a/renderer/views/player.js
+++ b/renderer/views/player.js
@@ -4,58 +4,87 @@ var h = require('virtual-dom/h')
 var hyperx = require('hyperx')
 var hx = hyperx(h)

+var util = require('../util')
+var {dispatch, dispatcher} = require('../lib/dispatcher')
+
 // Shows a streaming video player. Standard features + Chromecast + Airplay
-function Player (state, dispatch) {
+function Player (state) {
  // Show the video as large as will fit in the window, play immediately
  // If the video is on Chromecast or Airplay, show a title screen instead
  var showVideo = state.playing.location === 'local'
  return hx`
    <div
      class='player'
-      onmousemove=${() => dispatch('videoMouseMoved')}>
-      ${showVideo ? renderVideo(state, dispatch) : renderCastScreen(state, dispatch)}
-      ${renderPlayerControls(state, dispatch)}
+      onmousemove=${dispatcher('mediaMouseMoved')}>
+      ${showVideo ? renderMedia(state) : renderCastScreen(state)}
+      ${renderPlayerControls(state)}
    </div>
  `
 }

-function renderVideo (state, dispatch) {
+function renderMedia (state) {
+  if (!state.server) return
+
  // Unfortunately, play/pause can't be done just by modifying HTML.
  // Instead, grab the DOM node and play/pause it if necessary
-  var videoElement = document.querySelector('video')
-  if (videoElement !== null) {
-    if (state.video.isPaused && !videoElement.paused) {
-      videoElement.pause()
-    } else if (!state.video.isPaused && videoElement.paused) {
-      videoElement.play()
+  var mediaType = state.playing.type /* 'audio' or 'video' */
+  var mediaElement = document.querySelector(mediaType) /* get the <video> or <audio> tag */
+  if (mediaElement !== null) {
+    if (state.playing.isPaused && !mediaElement.paused) {
+      mediaElement.pause()
+    } else if (!state.playing.isPaused && mediaElement.paused) {
+      mediaElement.play()
    }
    // When the user clicks or drags on the progress bar, jump to that position
-    if (state.video.jumpToTime) {
-      videoElement.currentTime = state.video.jumpToTime
-      state.video.jumpToTime = null
+    if (state.playing.jumpToTime) {
+      mediaElement.currentTime = state.playing.jumpToTime
+      state.playing.jumpToTime = null
    }
-    state.video.currentTime = videoElement.currentTime
-    state.video.duration = videoElement.duration
+    // set volume
+    if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
+      mediaElement.volume = state.playing.setVolume
+      state.playing.setVolume = null
+    }
+
+    state.playing.currentTime = mediaElement.currentTime
+    state.playing.duration = mediaElement.duration
+    state.playing.volume = mediaElement.volume
  }

+  // Create the <audio> or <video> tag
+  var mediaTag = hx`
+    <div
+      src='${state.server.localURL}'
+      ondblclick=${dispatcher('toggleFullScreen')}
+      onloadedmetadata=${onLoadedMetadata}
+      onended=${onEnded}
+      onplay=${dispatcher('mediaPlaying')}
+      onpause=${dispatcher('mediaPaused')}
+      autoplay>
+    </div>
+  `
+  mediaTag.tagName = mediaType
+
+  // Show the media.
+  // Video fills the window, centered with black bars if necessary
+  // Audio gets a static poster image and a summary of the file metadata.
+  var isAudio = mediaType === 'audio'
+  var style = {
+    backgroundImage: isAudio ? cssBackgroundImagePoster(state) : ''
+  }
  return hx`
    <div
      class='letterbox'
-      onmousemove=${() => dispatch('videoMouseMoved')}>
-      <video
-        src='${state.server.localURL}'
-        ondblclick=${() => dispatch('toggleFullScreen')}
-        onloadedmetadata=${onLoadedMetadata}
-        onended=${onEnded}
-        onplay=${() => dispatch('videoPlaying')}
-        onpause=${() => dispatch('videoPaused')}
-        autoplay>
-      </video>
+      style=${style}
+      onmousemove=${dispatcher('mediaMouseMoved')}>
+      ${mediaTag}
+      ${renderAudioMetadata(state)}
    </div>
  `

  // As soon as the video loads enough to know the video dimensions, resize the window
  function onLoadedMetadata (e) {
+    if (mediaType !== 'video') return
    var video = e.target
    var dimensions = {
      width: video.videoWidth,
@@ -66,23 +95,47 @@ function renderVideo (state, dispatch) {

  // When the video completes, pause the video instead of looping
  function onEnded (e) {
-    state.video.isPaused = true
+    state.playing.isPaused = true
  }
 }

-function renderCastScreen (state, dispatch) {
+function renderAudioMetadata (state) {
+  if (!state.playing.audioInfo) return
+  var info = state.playing.audioInfo
+
+  // Get audio track info
+  var title = info.title
+  if (!title) {
+    var torrentSummary = getPlayingTorrentSummary(state)
+    title = torrentSummary.files[state.playing.fileIndex].name
+  }
+  var artist = info.artist && info.artist[0]
+  var album = info.album
+  if (album && info.year && !album.includes(info.year)) {
+    album += ' (' + info.year + ')'
+  }
+  var track
+  if (info.track && info.track.no && info.track.of) {
+    track = info.track.no + ' of ' + info.track.of
+  }
+
+  // Show a small info box in the middle of the screen
+  var elems = [hx`<div class='audio-title'><label></label>${title}</div>`]
+  if (artist) elems.push(hx`<div class='audio-artist'><label>Artist</label>${artist}</div>`)
+  if (album) elems.push(hx`<div class='audio-album'><label>Album</label>${album}</div>`)
+  if (track) elems.push(hx`<div class='audio-track'><label>Track</label>${track}</div>`)
+  return hx`<div class='audio-metadata'>${elems}</div>`
+}
+
+function renderCastScreen (state) {
  var isChromecast = state.playing.location.startsWith('chromecast')
  var isAirplay = state.playing.location.startsWith('airplay')
  var isStarting = state.playing.location.endsWith('-pending')
  if (!isChromecast && !isAirplay) throw new Error('Unimplemented cast type')

  // Show a nice title image, if possible
-  var style = {}
-  var infoHash = state.playing.infoHash
-  var torrentSummary = state.saved.torrents.find((x) => x.infoHash === infoHash)
-  if (torrentSummary && torrentSummary.posterURL) {
-    var cleanURL = torrentSummary.posterURL.replace(/\\/g, '/')
-    style.backgroundImage = `radial-gradient(circle at center, rgba(0,0,0,0.4) 0%,rgba(0,0,0,1) 100%), url(${cleanURL})`
+  var style = {
+    backgroundImage: cssBackgroundImagePoster(state)
  }

  // Show whether we're connected to Chromecast / Airplay
@@ -98,8 +151,24 @@ function renderCastScreen (state, dispatch) {
  `
 }

-function renderPlayerControls (state, dispatch) {
-  var positionPercent = 100 * state.video.currentTime / state.video.duration
+// 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 'radial-gradient(circle at center, ' +
+    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)' +
+    `, url(${cleanURL})`
+}
+
+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)' }

  var elements = [
@@ -115,7 +184,7 @@ function renderPlayerControls (state, dispatch) {
    `,
    hx`
      <i class='icon fullscreen'
-        onclick=${() => dispatch('toggleFullScreen')}>
+        onclick=${dispatcher('toggleFullScreen')}>
        ${state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
      </i>
    `
@@ -128,18 +197,18 @@ function renderPlayerControls (state, dispatch) {
  if (isOnChromecast) {
    chromecastClass = 'active'
    airplayClass = 'disabled'
-    chromecastHandler = () => dispatch('stopCasting')
+    chromecastHandler = dispatcher('stopCasting')
    airplayHandler = undefined
  } else if (isOnAirplay) {
    chromecastClass = 'disabled'
    airplayClass = 'active'
    chromecastHandler = undefined
-    airplayHandler = () => dispatch('stopCasting')
+    airplayHandler = dispatcher('stopCasting')
  } else {
    chromecastClass = ''
    airplayClass = ''
-    chromecastHandler = () => dispatch('openChromecast')
-    airplayHandler = () => dispatch('openAirplay')
+    chromecastHandler = dispatcher('openChromecast')
+    airplayHandler = dispatcher('openAirplay')
  }
  if (state.devices.chromecast || isOnChromecast) {
    elements.push(hx`
@@ -165,7 +234,7 @@ function renderPlayerControls (state, dispatch) {
  if (process.platform !== 'darwin') {
    elements.push(hx`
      <i.icon.back
-        onclick=${() => dispatch('back')}>
+        onclick=${dispatcher('back')}>
        chevron_left
      </i>
    `)
@@ -173,8 +242,8 @@ function renderPlayerControls (state, dispatch) {

  // Finally, the big button in the center plays or pauses the video
  elements.push(hx`
-    <i class='icon play-pause' onclick=${() => dispatch('playPause')}>
-      ${state.video.isPaused ? 'play_arrow' : 'pause'}
+    <i class='icon play-pause' onclick=${dispatcher('playPause')}>
+      ${state.playing.isPaused ? 'play_arrow' : 'pause'}
    </i>
  `)

@@ -182,10 +251,10 @@ function renderPlayerControls (state, dispatch) {

  // Handles a click or drag to scrub (jump to another position in the video)
  function handleScrub (e) {
-    dispatch('videoMouseMoved')
+    dispatch('mediaMouseMoved')
    var windowWidth = document.querySelector('body').clientWidth
    var fraction = e.clientX / windowWidth
-    var position = fraction * state.video.duration /* seconds */
+    var position = fraction * state.playing.duration /* seconds */
    dispatch('playbackJump', position)
  }
 }
@@ -197,15 +266,16 @@ function renderLoadingBar (state) {
  if (torrent === null) {
    return []
  }
+  var file = torrent.files[state.playing.fileIndex]

  // Find all contiguous parts of the torrent which are loaded
  var parts = []
  var lastPartPresent = false
-  var numParts = torrent.pieces.length
-  for (var i = 0; i < numParts; i++) {
+  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, count: 1})
+      parts.push({start: i - file._startPiece, count: 1})
    } else if (partPresent) {
      parts[parts.length - 1].count++
    }
--- a/renderer/views/torrent-list.js
+++ b/renderer/views/torrent-list.js
@@ -5,9 +5,12 @@ var hyperx = require('hyperx')
 var hx = hyperx(h)
 var prettyBytes = require('prettier-bytes')

-var TorrentPlayer = require('../lib/torrent-player')
+var util = require('../util')

-function TorrentList (state, dispatch) {
+var TorrentPlayer = require('../lib/torrent-player')
+var {dispatcher} = require('../lib/dispatcher')
+
+function TorrentList (state) {
  var torrentRows = state.saved.torrents.map(
    (torrentSummary) => renderTorrent(torrentSummary))
  return hx`
@@ -24,7 +27,9 @@ function TorrentList (state, dispatch) {
  function renderTorrent (torrentSummary) {
    // Get ephemeral data (like progress %) directly from the WebTorrent handle
    var infoHash = torrentSummary.infoHash
-    var torrent = state.client.torrents.find((x) => x.infoHash === infoHash)
+    var torrent = state.client
+      ? state.client.torrents.find((x) => x.infoHash === infoHash)
+      : null
    var isSelected = state.selectedInfoHash === infoHash

    // Background image: show some nice visuals, like a frame from the movie, if possible
@@ -33,9 +38,10 @@ function TorrentList (state, dispatch) {
      var gradient = isSelected
        ? 'linear-gradient(to bottom, rgba(0, 0, 0, 0.8) 0%, rgba(0, 0, 0, 0.4) 100%)'
        : 'linear-gradient(to bottom, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0) 100%)'
+      var posterURL = util.getAbsoluteStaticPath(torrentSummary.posterURL)
      // Work around a Chrome bug (reproduced in vanilla Chrome, not just Electron):
      // Backslashes in URLS in CSS cause bizarre string encoding issues
-      var cleanURL = torrentSummary.posterURL.replace(/\\/g, '/')
+      var cleanURL = posterURL.replace(/\\/g, '/')
      style.backgroundImage = gradient + `, url('${cleanURL}')`
    }

@@ -47,7 +53,9 @@ function TorrentList (state, dispatch) {
    if (isSelected) classes.push('selected')
    classes = classes.join(' ')
    return hx`
-      <div style=${style} class=${classes} onclick=${() => dispatch('toggleSelectTorrent', infoHash)}>
+      <div style=${style} class=${classes}
+        oncontextmenu=${dispatcher('openTorrentContextMenu', infoHash)}
+        onclick=${dispatcher('toggleSelectTorrent', infoHash)}>
        ${renderTorrentMetadata(torrent, torrentSummary)}
        ${renderTorrentButtons(torrentSummary)}
        ${isSelected ? renderTorrentDetails(torrent, torrentSummary) : ''}
@@ -103,9 +111,12 @@ function TorrentList (state, dispatch) {
  // Download button toggles between torrenting (DL/seed) and paused
  // Play button starts streaming the torrent immediately, unpausing if needed
  function renderTorrentButtons (torrentSummary) {
-    var playIcon, playTooltip
+    var infoHash = torrentSummary.infoHash
+
+    var playIcon, playTooltip, playClass
    if (torrentSummary.playStatus === 'unplayable') {
-      playIcon = 'warning'
+      playIcon = 'play_arrow'
+      playClass = 'disabled'
      playTooltip = 'Sorry, WebTorrent can\'t play any of the files in this torrent. ' +
        'View details and click on individual files to open them in another program.'
    } else if (torrentSummary.playStatus === 'timeout') {
@@ -131,34 +142,30 @@ function TorrentList (state, dispatch) {
    return hx`
      <div class='buttons'>
        <i.btn.icon.play
-          title='${playTooltip}'
-          onclick=${(e) => handleButton('play', e)}>
+          title=${playTooltip}
+          class=${playClass}
+          onclick=${dispatcher('play', infoHash)}>
          ${playIcon}
        </i>
        <i.btn.icon.download
-          class='${torrentSummary.status}'
-          title='${downloadTooltip}'
-          onclick=${(e) => handleButton('toggleTorrent', e)}>
+          class=${torrentSummary.status}
+          title=${downloadTooltip}
+          onclick=${dispatcher('toggleTorrent', infoHash)}>
          ${downloadIcon}
        </i>
        <i
          class='icon delete'
          title='Remove torrent'
-          onclick=${(e) => handleButton('deleteTorrent', e)}>
+          onclick=${dispatcher('deleteTorrent', infoHash)}>
          close
        </i>
      </div>
    `
-
-    function handleButton (action, e) {
-      // Prevent propagation so that we don't select/unselect the torrent
-      e.stopPropagation()
-      dispatch(action, torrentSummary)
-    }
  }

  // Show files, per-file download status and play buttons, and so on
  function renderTorrentDetails (torrent, torrentSummary) {
+    var infoHash = torrentSummary.infoHash
    var filesElement
    if (!torrentSummary.files) {
      // We don't know what files this torrent contains
@@ -173,7 +180,10 @@ function TorrentList (state, dispatch) {
      filesElement = hx`
        <div class='files'>
          <strong>Files</strong>
-          <span class='open-folder' onclick=${handleOpenFolder}>Open folder</span>
+          <span class='open-folder'
+            onclick=${dispatcher('openFolder', infoHash)}>
+            Open folder
+          </span>
          <table>
            ${fileRows}
          </table>
@@ -186,11 +196,6 @@ function TorrentList (state, dispatch) {
        ${filesElement}
      </div>
    `
-
-    function handleOpenFolder (e) {
-      e.stopPropagation()
-      dispatch('openFolder', torrentSummary)
-    }
  }

  // Show a single torrentSummary file in the details view for a single torrent
@@ -200,15 +205,20 @@ function TorrentList (state, dispatch) {
    var progress = Math.round(100 * file.numPiecesPresent / (file.numPieces || 0)) + '%'

    // Second, render the file as a table row
+    var infoHash = torrentSummary.infoHash
    var icon
    var rowClass = ''
-    if (state.playing.infoHash === torrentSummary.infoHash && state.playing.fileIndex === index) {
+    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)) {
      icon = 'play_arrow' /* playable? add option to play */
+      handleClick = dispatcher('play', infoHash, index)
    } else {
      icon = 'description' /* file icon, opens in OS default app */
      rowClass = isDone ? '' : 'disabled'
+      handleClick = dispatcher('openFile', infoHash, index)
    }
    return hx`
      <tr onclick=${handleClick} class='${rowClass}'>
@@ -220,17 +230,5 @@ function TorrentList (state, dispatch) {
        <td class='col-size'>${prettyBytes(file.length)}</td>
      </tr>
    `
-
-    // Finally, let the user click on the row to play media or open files
-    function handleClick (e) {
-      e.stopPropagation()
-      if (icon === 'pause_arrow') {
-        throw new Error('Unimplemented') // TODO: pause audio
-      } else if (icon === 'play_arrow') {
-        dispatch('play', torrentSummary, index)
-      } else if (isDone) {
-        dispatch('openFile', torrentSummary, index)
-      }
-    }
  }
 }
--- a/static/loading.gif
+++ b/static/loading.gif
--- a/static/sintel.torrent
+++ b/static/sintel.torrent
--- a/static/sound/play.wav
+++ b/static/sound/play.wav
--- a/static/webtorrent.desktop
+++ b/static/webtorrent.desktop
@@ -10,7 +10,24 @@ Icon=webtorrent
 Terminal=false
 Path=$APP_PATH
 Exec=$EXEC_PATH %U
-TryExec=$EXEC_PATH
+TryExec=$TRY_EXEC_PATH
 StartupNotify=false
 Categories=Network;FileTransfer;P2P;
 MimeType=application/x-bittorrent;x-scheme-handler/magnet;
+
+Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
+
+[Desktop Action CreateNewTorrent]
+Name=Create New Torrent...
+Exec=$EXEC_PATH -n
+Path=$APP_PATH
+
+[Desktop Action OpenTorrentFile]
+Name=Open Torrent File...
+Exec=$EXEC_PATH -o
+Path=$APP_PATH
+
+[Desktop Action OpenTorrentAddress]
+Name=Open Torrent Address...
+Exec=$EXEC_PATH -u
+Path=$APP_PATH
Author	SHA1	Message	Date
DC	ab55852bb0	v0.1.1	2016-03-28 00:39:15 -07:00
Feross Aboukhadijeh	46bc1bacdd	Merge pull request #250 from rom1504/add_binary add binary, fix #247	2016-03-27 22:05:47 -07:00
Romain Beaumont	391a2004f4	add binary, fix #247 cmd.js is mostly taken from node_modules/electron-prebuilt/cli.js (what the node_modules/.bin/electron symlink points to)	2016-03-28 02:26:13 +02:00
DC	2341749074	Track progress for currently playing file. Fixes #244	2016-03-27 16:17:35 -07:00
DC	ac7431292e	Show filename in window title. Fix #245 Also fix error popover z index	2016-03-27 16:17:35 -07:00
Feross Aboukhadijeh	127b1577ac	check for updates 5 seconds after startup	2016-03-27 03:30:29 -07:00
Feross Aboukhadijeh	7562a3856d	Merge pull request #240 from feross/changelog Update CHANGELOG	2016-03-27 03:27:14 -07:00
Feross Aboukhadijeh	bc9ef95790	Update CHANGELOG	2016-03-27 03:13:38 -07:00
DC	3617c17300	Memoize event handlers Stop virtualdom from swapping out every event handler on every update	2016-03-27 02:58:26 -07:00
Feross Aboukhadijeh	8e344bed20	Merge pull request #239 from feross/absolute-path-urls Resolve posterURL and torrentPath at runtime	2016-03-27 02:12:41 -07:00
Feross Aboukhadijeh	eb59c11f85	Resolve posterURL and torrentPath at runtime Fixes bug where posters and torrent files can’t be found in the built app.	2016-03-27 02:10:58 -07:00
Feross Aboukhadijeh	339f472473	Merge pull request #237 from feross/fix-233 Fixes for PR #233	2016-03-27 01:16:56 -07:00
Feross Aboukhadijeh	75412388e5	Save .torrent dialog: Add "All Files" option	2016-03-27 01:10:45 -07:00
Feross Aboukhadijeh	aad3acfe91	Right click -> "Save torrent file" without using streams For #233	2016-03-27 01:06:58 -07:00
Feross Aboukhadijeh	b9c012a587	Make right click -> "copy magnet uri" work for default torrents For #233	2016-03-27 01:06:36 -07:00
Feross Aboukhadijeh	d5bea54a83	sintel.torrent: Use webtorrent.io torrent	2016-03-27 00:58:50 -07:00
Feross Aboukhadijeh	c7ee0aab01	Merge pull request #233 from Flet/torrent-context-menu add context menu with share/save actions	2016-03-27 00:39:15 -07:00
Feross Aboukhadijeh	9b8a9e5aa3	Merge pull request #236 from feross/fix-mac-flash Fix OS X flash of white	2016-03-27 00:31:08 -07:00
Feross Aboukhadijeh	40cec3a2f6	Delay lazy load of client This works great on my slow Macbook 12”, so I assume it will work without lag on most other people’s computers.	2016-03-27 00:28:33 -07:00
Feross Aboukhadijeh	589880f1e3	OS X: Prevent white flash on window open We got the window to run less JS but now it’s shown by the main process too soon! This fixes that with a setTimeout. Perhaps when this issue is fixed (https://github.com/atom/electron/issues/861) we can remove the timeout.	2016-03-27 00:27:28 -07:00
Feross Aboukhadijeh	6465c23127	Merge pull request #235 from feross/about-window Windows/Linux: Add About Window (#220)	2016-03-26 23:53:37 -07:00
Feross Aboukhadijeh	203d058280	About window: increase size slightly	2016-03-26 23:43:24 -07:00
Feross Aboukhadijeh	a116bf976a	About window: only allow text selection	2016-03-26 23:43:24 -07:00
Feross Aboukhadijeh	aa117054fb	About window: font-size tweaks	2016-03-26 23:43:24 -07:00
Feross Aboukhadijeh	5335bf39b5	Windows/Linux: Hide menu on About Window	2016-03-26 23:43:24 -07:00
Feross Aboukhadijeh	b263a69716	Windows/Linux: Add About Window (#220 )	2016-03-26 23:43:24 -07:00
DC	906da4d977	Speed up init() by >= 2x Lazy load the WebTorrent, Chromecast, and Airplay modules	2016-03-26 23:31:32 -07:00
Dan Flettre	6c07c4763d	add context menu with share/save actions	2016-03-26 23:10:27 -05:00
Feross Aboukhadijeh	1e6e101c4e	Merge pull request #232 from feross/ui-responsiveness UI responds instantly to torrent enable/disable (#208)	2016-03-26 20:40:12 -07:00
Feross Aboukhadijeh	4a627b6f03	UI responds instantly to torrent enable/disable (#208 )	2016-03-26 20:36:57 -07:00
Feross Aboukhadijeh	a2b9a178b7	Merge pull request #231 from feross/shortcut-fix Keyboard shortcuts: volume shortcuts should be local	2016-03-26 20:07:30 -07:00
Feross Aboukhadijeh	9ef1d0a605	Keyboard shortcuts: volume shortcuts should be local `globalShortcut` will register the shortcut at the OS level, even when the app is not focused. Using `localShortcut` would work, but let's put it in the top menu instead, where all the other shortcuts are.	2016-03-26 20:04:29 -07:00
Feross Aboukhadijeh	0cf89600c0	es6ify	2016-03-26 19:58:04 -07:00
DC	3928564314	Add (BETA) to window title Also fix a bug: fix relative paths to the default torrents.	2016-03-26 18:11:40 -07:00
DC	0d5ff2d964	Use relative paths for default torrents This keeps them working if a user opens the app from DMG, then installs it to a different path and opens it again	2016-03-26 16:15:24 -07:00
Feross Aboukhadijeh	b85f0b9489	Merge pull request #202 from grunjol/feature-volume-management-clean Add volume management	2016-03-25 23:46:59 -07:00
Feross Aboukhadijeh	5b6e4ac394	Merge pull request #226 from feross/fix-ubuntu-crash Linux: Ensure ".local/share/{applications,icons}" exists; plus perf fix	2016-03-25 22:58:16 -07:00
Feross Aboukhadijeh	59a1bc03f2	Perf: Remove all *Sync methods for Linux startup	2016-03-25 21:47:49 -07:00
Feross Aboukhadijeh	01e27b2691	Linux: Ensure ".local/share/{applications,icons}" exists	2016-03-25 18:56:22 -07:00
Feross Aboukhadijeh	656e811e84	Merge pull request #203 from grunjol/feature-unity-desktop-shortcuts Add unity launcher icons	2016-03-25 18:50:02 -07:00
Feross Aboukhadijeh	db60b99982	window useContentSize	2016-03-25 17:50:29 -07:00
Feross Aboukhadijeh	180d756dc0	OS X packager: Fix missing DMG background image Remove previous DMG file. This somehow fixes the issue.	2016-03-25 17:50:29 -07:00
Feross Aboukhadijeh	a029ea3b0a	Revert "Merge pull request #205 from feross/compress" This reverts commit `bd04d76adf`, reversing changes made to `73d5a4e1ab`.	2016-03-25 17:50:29 -07:00
grunjol	4673354703	fixes #116 Add Unity launcher icons	2016-03-25 16:31:12 -03:00
Nate Goldman	ded599328a	add version badge, update release info	2016-03-25 11:45:53 -07:00
Nate Goldman	7dfc6fd98c	fix package arg	2016-03-25 11:43:13 -07:00
Feross Aboukhadijeh	e0ed255fb4	improve v0.1.0. changelog	2016-03-25 04:14:18 -07:00
Feross Aboukhadijeh	d8f97c3b58	put package.json name back to webtorrent-app webtorrent-www relies on this name. I originally changed it because I thought the windows install builder was using it, but I pass all the options into that explicitly now, and even pass an option to prevent it from using package.json, so this should be okay.	2016-03-25 04:07:31 -07:00
Feross Aboukhadijeh	753cca7dfb	remove duplicate path-exists dep	2016-03-25 03:57:16 -07:00
Feross Aboukhadijeh	7d61968f64	0.1.0	2016-03-25 03:52:35 -07:00
Feross Aboukhadijeh	8637de27b9	Changelog: v0.1.0	2016-03-25 03:51:03 -07:00
Feross Aboukhadijeh	447413e4b9	delete commented out code	2016-03-25 03:40:18 -07:00
Feross Aboukhadijeh	82c8ad7562	windows build: don't use implicit package.json values	2016-03-25 03:37:18 -07:00
Feross Aboukhadijeh	f2bbd97eeb	Merge pull request #218 from feross/windows-installer Create Windows .exe installer	2016-03-25 03:35:43 -07:00
Feross Aboukhadijeh	c788b3358a	Windows: fix magnet link handling	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	b0672cce9e	npm install before packaging	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	0681169653	Windows: base Squirrel shortcut code on Nylas N1	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	ae6b86d233	Make install.gif not blink	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	8bba565609	Windows: create desktop/start menu shortcuts on install/update	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	78f08487c4	delay install splash screen so user sees it	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	bdf7110135	Move --squirrel-xxxx handling to new file	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	9d35ece954	Windows/linux: Don't autohide top menu bar (it's important)	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	00e4cc1864	Prevent --squirrel arguments from getting added as torrents	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	ad09012587	Windows installer: include icon url, setup icon, loading gif	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	8b5de572f1	package: conditionally require darwin packages	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	20c6b81047	simplify arguments to `npm run package`	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	aecead4a2d	Windows: Create installer .exe file	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	7b02edca0f	OS X packager: build to dist/ folder	2016-03-25 03:33:39 -07:00
Feross Aboukhadijeh	109094d0e1	Merge pull request #217 from feross/greenkeeper-webtorrent-0.87.1 Update webtorrent to version 0.87.1 🚀	2016-03-24 20:09:02 -07:00
greenkeeperio-bot	e0856a5274	chore(package): update webtorrent to version 0.87.1 http://greenkeeper.io/	2016-03-24 19:58:13 -07:00
Feross Aboukhadijeh	c8886fb606	Merge pull request #213 from feross/magnet-focus Show, unminimize, and focus window after opening magnet link (fix #210)	2016-03-24 02:59:39 -07:00
Feross Aboukhadijeh	fd5f4dd139	Show, unminimize, and focus window after opening magnet link (fix #210 ) Requires a workaround for this Electron issue: https://github.com/atom/electron/issues/4338	2016-03-24 02:56:34 -07:00
Feross Aboukhadijeh	0a51da13a4	docs: improve windows build notes	2016-03-24 02:54:49 -07:00
Feross Aboukhadijeh	5540ed9ce1	fix: exception when adding magnet links	2016-03-24 02:54:49 -07:00
Feross Aboukhadijeh	b6516dc40f	Merge pull request #212 from feross/header-fix fix invisible header bug	2016-03-23 23:20:49 -07:00
Nate Goldman	8b57e13735	fix #211 - invisible header bug	2016-03-23 23:16:33 -07:00
Feross Aboukhadijeh	cb3dd716dd	Merge pull request #209 from feross/subtler-app-sounds Sounds: subtler sounds	2016-03-23 21:18:23 -07:00
Feross Aboukhadijeh	4895fb930c	Sounds: subtler sounds This change sets different sounds to different volume levels, and replaces the Play sound with one that sounds different than the Add sound.	2016-03-23 20:44:40 -07:00
Feross Aboukhadijeh	1f2985bbc3	Merge pull request #207 from feross/ignore-appdmg Package: remove optionalDependency "appdmg" from final bundle	2016-03-23 20:28:55 -07:00
Feross Aboukhadijeh	32ad0f0926	Package: remove optionalDependency "appdmg" from final bundle	2016-03-23 20:27:38 -07:00
Feross Aboukhadijeh	3e448da0ba	Merge pull request #206 from feross/osx-bundle-id OS X: pick a better bundle ID	2016-03-23 19:35:16 -07:00
Feross Aboukhadijeh	219e717021	OS X: pick a better bundle ID The old bundle ID ended in .app, which OS X will interpret as an executable app. This meant that our preferences folder was treated like an app, lol.	2016-03-23 19:32:54 -07:00
Feross Aboukhadijeh	1885b6a89e	Merge pull request #205 from feross/compress losslessly compress images (w/ ImageOptim)	2016-03-23 19:28:29 -07:00
Feross Aboukhadijeh	d8a5b8a701	losslessly compress images (w/ ImageOptim)	2016-03-23 19:26:56 -07:00
DC	d41e08b209	Fix magnet link progress bug	2016-03-23 06:43:13 -07:00
grunjol	fc6d8e7b7d	add volume management	2016-03-23 09:01:07 -03:00
Feross Aboukhadijeh	9518670c7b	Merge pull request #201 from feross/readme update readme with link to releases	2016-03-22 20:43:29 -07:00
Nate Goldman	eff0b6eb23	Update README.md	2016-03-22 15:30:56 -07:00
DC	f56af6402c	Audio metadata	2016-03-22 03:52:27 -07:00
DC	ebcc814ca7	WebTorrent can now play audio	2016-03-22 02:26:28 -07:00
Feross Aboukhadijeh	f7029c811c	fix zip bundle Before this change, the zip command would include the full path on my machine in the zip file, i.e. /Users/feross/…	2016-03-22 00:02:16 -07:00