VLC support

.gitignore

@@ -1,4 +1,2 @@
-node_modules/
-build/
-dist/
-npm-debug.log*
+node_modules
+dist

.nodemonignore

@@ -1,2 +0,0 @@
-build/
-dist/

.travis.yml

@@ -1,4 +1,4 @@
 language: node_js
 node_js:
   - 'node'
-install: npm install standard depcheck walk-sync
+install: npm install standard

AUTHORS.md

@@ -2,36 +2,14 @@
 
 #### Ordered by first contribution.
 
-- Feross Aboukhadijeh (feross@feross.org)
-- DC (dcposch@dcpos.ch)
-- Nate Goldman (nate@ngoldman.me)
-- Chris Morris (chris@chrismorris.org)
-- Giuseppe Crinò (giuscri@gmail.com)
-- Romain Beaumont (romain.rom1@gmail.com)
-- Dan Flettre (fletd01@yahoo.com)
-- Liam Gray (liam.r.gray@gmail.com)
-- Rémi Jouannet (remijouannet@users.noreply.github.com)
-- Evan Miller (miller.evan815@gmail.com)
-- Alex (alxmorais8@msn.com)
-- Diego Rodríguez Baquero (diegorbaquero@gmail.com)
-- Karlo Luis Martinez Martos (karlo.luis.m@gmail.com)
-- gabriel (furstenheim@gmail.com)
-- Rolando Guedes (rolando.guedes@3gnt.net)
-- Benjamin Tan (demoneaux@gmail.com)
-- Mathias Rasmussen (mathiasvr@gmail.com)
-- Sergey Bargamon (sergey@bargamon.ru)
-- Thomas Watson Steen (w@tson.dk)
-- anonymlol (anonymlol7@gmail.com)
-- Gediminas Petrikas (gedas18@gmail.com)
-- Alberto Miranda (codealchemist@gmail.com)
-- Adam Gotlib (gotlib.adam+dev@gmail.com)
-- Rémi Jouannet (remijouannet@gmail.com)
-- Andrea Tupini (tupini07@gmail.com)
-- grunjol (grunjol@gmail.com)
-- Jason Kurian (jasonk92@gmail.com)
-- Vamsi Krishna Avula (vamsi_ism@outlook.com)
-- Noam Okman (noamokman@gmail.com)
-- PurgingPanda (t3ch0wn3r@gmail.com)
-- Kai Curtis (morecode@kcurtis.com)
+- Feross Aboukhadijeh <feross@feross.org>
+- DC <dcposch@dcpos.ch>
+- Nate Goldman <nate@ngoldman.me>
+- Chris Morris <chris@chrismorris.org>
+- Giuseppe Crinò <giuscri@gmail.com>
+- Romain Beaumont <romain.rom1@gmail.com>
+- Dan Flettre <fletd01@yahoo.com>
+- Liam Gray <liam.r.gray@gmail.com>
+- grunjol <grunjol@argenteam.net>
 
 #### Generated by bin/update-authors.sh.

CHANGELOG.md

@@ -1,354 +1,16 @@
 # WebTorrent Desktop Version History
 
-## v0.16.0 - 2016-09-18
+## UNRELEASED
 
 ### Added
-- **Windows 64-bit support!** ([#931](https://github.com/feross/webtorrent-desktop/pull/931))
-  - Existing 32-bit users will update to 64-bit automatically in next release
-  - 64-bit reduces likelihood of out-of-memory errors by increasing the address space
-
-## v0.15.0 - 2016-09-16
-
-### Added
-- Option to start automatically on login
-- Add integration tests
-- Add more detailed telemetry to diagnose "buffer allocation failed"
-
-### Changed
-- Disable playback controls while in external player (#909)
-
-### Fixed
-- Fix several uncaught errors (#889, #891, #892)
-- Update to the latest webtorrent.js, fixing some more uncaught errors
-- Clicking on the "torrent finished" notification works again (#912)
-
-## v0.14.0 - 2016-09-03
-
-### Added
-- Autoplay through all files in a torrent (#871)
-- Torrents now have a progress bar (#844)
-
-### Changed
-- Modals now use Material UI
-- Torrent list style improvements
-
-### Fixed
-- Fix App.js crash in Linux (#882)
-- Fix error on Windows caused by `setBadge` (#867)
-- Don't crash when restarting after adding a magnet link (#869)
-- Restore playback state when reopening player (#877)
-
-## v0.13.1 - 2016-08-31
-
-### Fixed
-- Fixed the Create Torrent page
-
-## v0.13.0 - 2016-08-31
-
-### Added
-- Support .m4a audio
-- Better telemetry: log error versions, report more types of errors
-
-### Changed
-- New look - Material UI. Rewrote Create Torrent and Preferences pages.
-
-### Fixed
-- Fixed telemetry [object Object] and [object HTMLMediaElement] bugs
-- Don't render player controls when playing externally, eg in VLC
-- Don't play notification sounds during media playback
-
-## v0.12.0 - 2016-08-23
-
-### Added
-
-- Custom external media player
-- Linux: add system-wide launcher and icons for Debian, including Ubuntu
-
 ### Changed
 
-- Telemetry improvements: redact stacktraces, log app version
+- Use Squirrel.Windows 1.3.0
+  - Fix installing when the app is already installed
+  - Don't kill unrelated processes on uninstall
 
 ### Fixed
 
-- Fix playback and download of default torrents ("missing path" error) (#804)
-- Fix Delete Torrent + Data for newly added magnet links
-- Fix jumpToTime error (#804)
-
-## v0.11.0 - 2016-08-19
-
-### Added
-- New Preference to "Set WebTorrent as default handler for torrents and magnet links" (#771)
-- New Preference to "Always play in VLC" (#674)
-- Check for missing default download path and torrent folders on start up (#776)
-
-### Changed
-
-- Do not automatically set WebTorrent as the default handler for torrents (#771)
-- Torrents can only be created from the home screen (#770)
-- Update Electron to 1.3.3 (#772)
-
-### Fixed
-
-- Allow modifying the default tracker list on the Create Torrent page (#775)
-- Prevent opening multiple stacked Preference windows or Create Torrent windows (#770)
-- Windows: Player window auto-resize does not match video aspect ratio (#565)
-- Missing page title on Create Torrent page
-
-## v0.10.0 - 2016-08-05
-
-### Added
-
-- Drag-and-drop magnet links (selected text) is now supported (#284)
-- Windows: Add "User Tasks" shortcuts to app icon in Start Menu (#114)
-- Linux: Show badge count for completed torrent downloads
-
-### Changed
-
-- Change WebTorrent Desktop peer ID prefix to 'WD' to distinguish from WebTorrent in the browser, 'WW' (#688)
-- Switch UI to React to improve UI rendering speed (#729)
-  - The primary bottleneck was actually `hyperx`, not `virtual-dom`.
-- Update Electron to 1.3.2 (#738) (#739) (#740) (#747) (#756)
-  - Mac 10.9: Fix the fullscreen button showing
-  - Mac 10.9: Fix window having border
-  - Mac 10.9: Fix occasional crash
-  - Mac: Update Squirrel.Mac to 0.2.1 (fixes situations in which updates would not get applied)
-  - Mac: Fix window not showing in Window menu
-  - Mac: Fix context menu always choosing first item by default
-  - Linux: Fix startup crashes (some Linux distros)
-  - Linux: Fix menubar not hiding after entering fullscreen (some Linux distros)
-- Improved location history (back/forward buttons) to fix rare exceptions (#687) (#748)
-  - Location history abstraction released independently as [`location-history`](https://www.npmjs.com/package/location-history)
-
-### Fixed
-
-- When streaming to VLC, set VLC window title to torrent file name (#746)
-- Fix "Cannot read property 'numPiecesPresent' of undefined" exception (#695)
-- Fix rare case where config file could not be completely written (#733)
-
-## v0.9.0 - 2016-07-20
-
-### Added
-
-- Save selected subtitles
-- Ask for confirmation before deleting torrents
-- Support Debian Jessie
-
-### Changed
-
-- Only send telemetry in production
-- Clean up the code. Split main.js, refactor lots of things
-
-### Fixed
-
-- Fix state.playing.jumpToTime behavior
-- Remove torrent file and poster image when deleting a torrent
-
-## v0.8.1 - 2016-06-24
-
-### Added
-
-- New URI handler: stream-magnet
-
-### Fixed
-
-- DLNA crashing bug
-
-## v0.8.0 - 2016-06-23
-
-### Added
-
-- Cast menu: choose which Chromecast, Airplay, or DLNA device you want to use
-- Telemetry: send basic data, plus stats on how often the play button works
-- Make posters from jpeg files, not just jpg
-- Support .wmv video via Play in VLC
-- Windows thumbnail bar with a play/pause button
-
-### Changed
-
-- Nicer modal styles
-
-### Fixed
-
-- Windows tray icon now stays in the right state
-
-## v0.7.2 - 2016-06-02
-
-### Fixed
-
-- Fix exception that affects users upgrading from v0.5.1 or older
-  - Ensure `state.saved.prefs` configuration exists
-- Fix window title on "About WebTorrent" window
-
-## v0.7.1 - 2016-06-02
-
-### Changed
-
-- Change "Step Forward" keyboard shortcut to `Alt+Left` (Windows)
-- Change "Step Backward" keyboard shortcut to to `Alt+Right` (Windows)
-
-### Fixed
-
-- First time startup bug -- invalid torrent/poster paths
-
-## v0.7.0 - 2016-06-02
-
-### Added
-
-- Improved AirPlay support -- using the new [`airplayer`](https://www.npmjs.com/package/airplayer) package
-- Remember volume setting in player, for as long as the app is open
-
-### Changed
-
-- Add (+) button now also accepts non .torrent files and creates a torrent from
-  those files
-- Show prompt text in title bar for open dialogs (OS X)
-- Upgrade Electron to 1.2.1
-  - Improve window resizing when aspect ratio is enforced (OS X)
-  - Use .ico format for better icon rendering quality (Windows)
-  - Fix crash reporter not working (Windows)
-
-### Fixed
-
-- Re-enable WebRTC (web peers)! (OS X, Windows)
-  - Windows support was disabled in v0.6.1 to work around a bug in Electron
-  - OS X support was disabled in v0.4.0 to work around a 100% CPU bug
-- Fix subtitle selector radio button UI size glitch
-- Fix race condition causing exeption on app startup
-- Fix duplicate torrent detection in some cases
-- Fix "gray screen" exception caused by incorrect file list order
-- Fix torrent loading message UI misalignment
-
-### Known issues
-
-- When upgrading to WebTorrent Desktop v0.7.0, some torrent metadata (file list,
-  selected files, whether torrent is streamable) will be cleared. Just start the
-  torrent to re-populate the metadata.
-
-## v0.6.1 - 2016-05-26
-
-### Fixed
-
-- Disable WebRTC to work around Electron crash (Windows)
-  - Will be re-enabled in the next version of WebTorrent, which will be based on
-    the next version of Electron, where the bug is fixed.
-- Fix crash when updating from WebTorrent 0.5.x in some situtations (#583)
-- Fix crash when dropping files onto the dock icon (OS X)
-- Fix keyboard shortcuts Space and ESC being captured globally (#585)
-- Fix crash, show error when drag-dropping hidden files (#586)
-
-## v0.6.0 - 2016-05-24
-
-### Added
-
-- Added Preferences page to set Download folder
-- Save video position, resume playback from saved position
-- Add additional video player keyboard shortcuts (#275)
-- Use `poster.jpg` file as the poster image if available (#558)
-- Associate .torrent files to WebTorrent Desktop (OS X) (#553)
-- Add support for pasting `instant.io` links (#559)
-- Add announcement feature
-
-### Changed
-
-- Nicer player UI
-- Reduce startup jank, improve startup time (#568)
-- Cleanup unsupported codec detection (#569, #570)
-- Cleaner look for the torrent file list
-- Improve subtitle positioning (#551)
-
-### Fixed
-
-- Fix Uncaught TypeError: Cannot read property 'update' of undefined (#567)
-- Fix bugs in LocationHistory
-  - When player is active, and magnet link is pasted, go back to list
-  - After deleting torrent, remove just the player from forward stack
-  - After creating torrent, remove create torrent page from forward stack
-  - Cancel button on create torrent page should only go back one page
-
-## v0.5.1 - 2016-05-18
-
-### Fixed
-
-- Fix auto-updater (OS X, Windows).
-
-## v0.5.0 - 2016-05-17
-
-### Added
-
-- Select/deselect individual files to torrent.
-- Automatically include subtitle files (.srt, .vtt) from torrent in the subtitles menu.
-- "Add Subtitle File..." menu item.
-
-### Changed
-
-- When manually adding subtitle track(s), always switch to the new track.
-
-### Fixed
-
-- Magnet links throw exception on app launch. (OS X)
-- Multi-file torrents would not seed in-place, were copied to Downloads folder.
-- Missing 'About WebTorrent' menu item. (Windows)
-- Rare exception. ("Cannot create BrowserWindow before app is ready")
-
-## v0.4.0 - 2016-05-13
-
-### Added
-
-- Better Windows support!
-  - Windows 32-bit build.
-  - Windows Portable App build.
-  - Windows app signing, for fewer install warnings.
-- Better Linux support!
-  - Linux 32-bit build.
-- Subtitles support!
-  - .srt and .vtt file support.
-  - Drag-and-drop files on video, or choose from file selector.
-  - Multiple subtitle files support.
-- Stream to VLC when the audio codec is unplayable (e.g. AC3, EAC3).
-- "Show in Folder" item in context menu.
-- Volume slider, with mute/unmute button.
-- New "Create torrent" page to modify:
-  - Torrent comment.
-  - Trackers.
-  - Private torrent flag.
-- Use mouse wheel to increase/decrease volume.
-- Bounce the Downloads stack when download completes. (OS X)
-- New default torrent on first launch: The WIRED CD.
-
-### Changed
-
-- Improve app startup time by 40%.
-- UI tweaks: Reduce font size, reduce torrent list item height.
-- Add Playback menu for playback-related functionality.
-- Fix installing when the app is already installed. (Windows)
-- Don't kill unrelated processes on uninstall. (Windows)
-- Set "sheet offset" correctly for create torrent dialog. (OS X)
-- Remove OS X-style Window menu. (Linux, Windows)
-- Remove "Add Fake Airplay/Chromecast" menu items.
-
-### Fixed
-
-- Disable WebRTC to fix 100% CPU usage/crashes caused by Chromium issue. This is
-  temporary. (OS X)
-- When fullscreen, make controls use the full window. (OS X)
-- Support creating torrents that contain .torrent files.
-- Block power save while casting to a remote device.
-- Do not block power save when the space key is pressed from the torrent list.
-- Support playing .mpg and .ogv extensions in the app.
-- Fix video centering for multi-screen setups.
-- Show an error when adding a duplicate torrent.
-- Show an error when adding an invalid magnet link.
-- Do not stop music when tabbing to another program (OS X)
-- Properly size the Windows volume mixer icon.
-- Default to the user's OS-defined, localized "Downloads" folder.
-- Enforce minimimum window size when resizing player to prevent window disappearing.
-- Fix rare race condition error on app quit.
-- Don't use zero-byte torrent "poster" images.
-
-Thanks to @grunjol, @rguedes, @furstenheim, @karloluis, @DiegoRBaquero, @alxhotel,
-@AgentEpsilon, @remijouannet, Rolando Guedes, @dcposch, and @feross for contributing
-to this release!
-
 ## v0.3.3 - 2016-04-07
 
 ### Fixed

CONTRIBUTING.md

@@ -73,23 +73,3 @@ By making a contribution to this project, I certify that:
   record of the contribution (including all personal information I submit with it,
   including my sign-off) is maintained indefinitely and may be redistributed consistent
   with this project or the open source license(s) involved.
-
-## Smoke Tests
-
-Before a release, check that the following basic use cases work correctly:
-
-1. Click "Play" to stream a built-in torrent (e.g. Sintel)
-  - Ensure that seeking to undownloaded region works and plays immediately.
-  - Ensure that sintel.mp4 gets downloaded to `~/Downloads`.
-
-2. Check that the auto-updater works
-  - Open the console and check for the line "No update available" to indicate
-
-3. Add a new .torrent file via drag-and-drop.
-  - Ensure that it gets added to the list and starts downloading
-
-4. Remove a torrent from the client
-  - Ensure that the file is removed from `~/Downloads`
-
-5. Create and seed a new a torrent via drag-and-drop.
-  - Ensure that the torrent gets created and seeding begins.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) WebTorrent, LLC
+Copyright (c) Feross Aboukhadijeh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -7,7 +7,7 @@
   <br>
 </h1>
 
-<h4 align="center">The streaming torrent app. For Mac, Windows, and Linux.</h4>
+<h4 align="center">The streaming torrent client. For OS X, Windows, and Linux.</h4>
 
 <p align="center">
   <a href="https://gitter.im/feross/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="Gitter"></a>
@@ -17,70 +17,31 @@
 
 ## Install
 
-Download the latest version of WebTorrent Desktop from
-[the official website](https://webtorrent.io/desktop/) or the
-[GitHub releases](https://github.com/feross/webtorrent-desktop/releases) page.
+**WebTorrent Desktop** is still under very active development. You can download the latest version from the [releases](https://github.com/feross/webtorrent-desktop/releases) page.
 
-**WebTorrent Desktop** is under very active development. You can try out the
-current (unstable) development version by cloning the Git repo. See the
-instructions below in the ["How to Contribute"](#how-to-contribute) section.
-
-## Screenshots
+## Screenshot
 
 <p align="center">
-  <img src="https://webtorrent.io/img/screenshot-player3.png" alt="screenshot" align="center">
-  <img src="https://webtorrent.io/img/screenshot-main.png" width="612" height="749" alt="screenshot" align="center">
+  <img src="https://webtorrent.io/img/screenshot-main.png" width="562" height="630" alt="screenshot" align="center">
 </p>
 
 ## How to Contribute
 
-### Get the code
+### Install dependencies
 
 ```
-$ git clone https://github.com/feross/webtorrent-desktop.git
-$ cd webtorrent-desktop
 $ npm install
 ```
 
-### Run the app
+### Run app
 
 ```
 $ npm start
 ```
 
-### Watch the code
+### Package app
 
-Restart the app automatically every time code changes. Useful during development.
-
-```
-$ npm run watch
-```
-
-### Run linters
-
-```
-$ npm test
-```
-
-### Run integration tests
-
-```
-$ npm run integration-test
-```
-
-The integration tests use Spectron and Tape. They click through the app, taking screenshots and comparing each one to a reference. Why screenshots?
-
-* Ad-hoc checking makes the tests a lot more work to write
-* Even diffing the whole HTML is not as thorough as screenshot diffing. For example, it wouldn't catch an bug where hitting ESC from a video doesn't correctly restore window size.
-* Chrome's own integration tests use screenshot diffing iirc
-* Small UI changes will break a few tests, but the fix is as easy as deleting the offending screenshots and running the tests, which will recreate them with the new look.
-* The resulting Github PR will then show, pixel by pixel, the exact UI changes that were made! Ses https://github.com/blog/817-behold-image-view-modes
-
-For MacOS, you'll need a Retina screen for the integration tests to pass.
-
-### Package the app
-
-Builds app binaries for Mac, Linux, and Windows.
+Builds app binaries for OS X, Linux, and Windows.
 
 ```
 $ npm run package
@@ -89,34 +50,30 @@ $ npm run package
 To build for one platform:
 
 ```
-$ npm run package -- [platform] [options]
+$ npm run package -- [platform]
 ```
 
 Where `[platform]` is `darwin`, `linux`, `win32`, or `all` (default).
 
 The following optional arguments are available:
 
-- `--sign` - Sign the application (Mac, Windows)
+- `--sign` - Sign the application (OS X, Windows)
 - `--package=[type]` - Package single output type.
    - `deb` - Debian package
    - `zip` - Linux zip file
-   - `dmg` - Mac disk image
+   - `dmg` - OS X disk image
    - `exe` - Windows installer
    - `portable` - Windows portable app
    - `all` - All platforms (default)
 
-Note: Even with the `--package` option, the auto-update files (.nupkg for Windows,
-*-darwin.zip for Mac) will always be produced.
+Note: Even with the `--package` option, the auto-update files (.nupkg for Windows, *-darwin.zip for OS X) will always be produced.
 
 #### Windows build notes
 
-The Windows app can be packaged from **any** platform.
+To package the Windows app from non-Windows platforms, [Wine](https://www.winehq.org/) needs
+to be installed.
 
-Note: Windows code signing only works from **Windows**, for now.
-
-Note: To package the Windows app from non-Windows platforms,
-[Wine](https://www.winehq.org/) needs to be installed. For example on Mac, first
-install [XQuartz](http://www.xquartz.org/), then run:
+On OS X, first install [XQuartz](http://www.xquartz.org/), then run:
 
 ```
 brew install wine
@@ -124,27 +81,10 @@ brew install wine
 
 (Requires the [Homebrew](http://brew.sh/) package manager.)
 
-#### Mac build notes
-
-The Mac app can only be packaged from **macOS**.
-
-#### Linux build notes
-
-The Linux app can be packaged from **any** platform.
-
-### Privacy
-
-WebTorrent Desktop collects some basic usage stats to help us make the app better.
-For example, we track how well the play button works. How often does it succeed?
-Time out? Show a missing codec error?
-
-The app never sends any personally identifying information, nor does it track which
-torrents you add.
-
 ### Code Style
 
 [![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
 
 ## License
 
-MIT. Copyright (c) [WebTorrent, LLC](https://webtorrent.io).
+MIT. Copyright (c) [Feross Aboukhadijeh](http://feross.org).

bin/clean.js

@@ -5,28 +5,17 @@
  * Useful for developers.
  */
 
-var fs = require('fs')
 var os = require('os')
 var path = require('path')
+var pathExists = require('path-exists')
 var rimraf = require('rimraf')
 
-var config = require('../src/config')
-var handlers = require('../src/main/handlers')
+var config = require('../config')
+var handlers = require('../main/handlers')
 
-// First, remove generated files
-rimraf.sync('build/')
-rimraf.sync('dist/')
-
-// Remove any saved configuration
 rimraf.sync(config.CONFIG_PATH)
 
-// Remove any temporary files
-var tmpPath
-try {
-  tmpPath = path.join(fs.statSync('/tmp') && '/tmp', 'webtorrent')
-} catch (err) {
-  tmpPath = path.join(os.tmpDir(), 'webtorrent')
-}
+var tmpPath = path.join(pathExists.sync('/tmp') ? '/tmp' : os.tmpDir(), 'webtorrent')
 rimraf.sync(tmpPath)
 
 // Uninstall .torrent file and magnet link handlers

bin/cmd.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-var electron = require('electron')
+var electron = require('electron-prebuilt')
 var cp = require('child_process')
 var path = require('path')
 
 var child = cp.spawn(electron, [path.join(__dirname, '..')], {stdio: 'inherit'})
 child.on('close', function (code) {
-  process.exitCode = code
+  process.exit(code)
 })

bin/extra-lint.js

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-
-const walkSync = require('walk-sync')
-const fs = require('fs')
-const path = require('path')
-
-let hasErrors = false
-
-// Find all Javascript source files
-var files = walkSync('src', {globs: ['**/*.js']})
-console.log('Running extra-lint on ' + files.length + ' files...')
-
-// Read each file, line by line
-files.forEach(function (file) {
-  var filepath = path.join('src', file)
-  var lines = fs.readFileSync(filepath, 'utf8').split('\n')
-
-  lines.forEach(function (line, i) {
-    var error
-
-    // Consistent JSX tag closing
-    if (line.match(/' {2}\/> *$/) ||
-      line.match('[^ ]/> *$') ||
-      line.match(' > *$')) {
-      error = 'JSX tag spacing'
-    }
-
-    // No lines over 100 characters
-    if (line.length > 100) {
-      error = 'Line >100 chars'
-    }
-
-    if (line.match(/^var /) || line.match(/ var /)) {
-      error = 'Use const or let'
-    }
-
-    if (error) {
-      let name = path.basename(file)
-      console.log('%s:%d - %s:\n%s', name, i + 1, error, line)
-      hasErrors = true
-    }
-  })
-})
-
-if (hasErrors) process.exit(1)
-else console.log('Looks good!')

bin/open-config.js

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-
-var config = require('../src/config')
-var open = require('open')
-
-open(config.CONFIG_PATH)

bin/package.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * Builds app binaries for Mac, Linux, and Windows.
+ * Builds app binaries for OS X, Linux, and Windows.
  */
 
 var cp = require('child_process')
@@ -9,17 +9,25 @@ var electronPackager = require('electron-packager')
 var fs = require('fs')
 var minimist = require('minimist')
 var mkdirp = require('mkdirp')
-var os = require('os')
 var path = require('path')
 var rimraf = require('rimraf')
 var series = require('run-series')
 var zip = require('cross-zip')
 
-var config = require('../src/config')
+var config = require('../config')
 var pkg = require('../package.json')
 
 var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
-var BUILD_PATH = path.join(config.ROOT_PATH, 'build')
+
+/*
+ * Path to folder with the following files:
+ *   - Windows Authenticode private key and cert (authenticode.p12)
+ *   - Windows Authenticode password file (authenticode.txt)
+ */
+var CERT_PATH = process.platform === 'win32'
+  ? 'D:'
+  : '/Volumes/Certs'
+
 var DIST_PATH = path.join(config.ROOT_PATH, 'dist')
 
 var argv = minimist(process.argv.slice(2), {
@@ -37,12 +45,6 @@ var argv = minimist(process.argv.slice(2), {
 
 function build () {
   rimraf.sync(DIST_PATH)
-  rimraf.sync(BUILD_PATH)
-
-  console.log('Babel: Building JSX...')
-  cp.execSync('npm run build', { NODE_ENV: 'production', stdio: 'inherit' })
-  console.log('Babel: Built JSX.')
-
   var platform = argv._[0]
   if (platform === 'darwin') {
     buildDarwin(printDone)
@@ -62,12 +64,15 @@ function build () {
 }
 
 var all = {
+  // Build 64 bit binaries only.
+  arch: 'x64',
+
   // The human-readable copyright line for the app. Maps to the `LegalCopyright` metadata
-  // property on Windows, and `NSHumanReadableCopyright` on Mac.
+  // property on Windows, and `NSHumanReadableCopyright` on OS X.
   'app-copyright': config.APP_COPYRIGHT,
 
   // The release version of the application. Maps to the `ProductVersion` metadata
-  // property on Windows, and `CFBundleShortVersionString` on Mac.
+  // property on Windows, and `CFBundleShortVersionString` on OS X.
   'app-version': pkg.version,
 
   // Package the application's source code into an archive, using Electron's archive
@@ -80,16 +85,16 @@ var all = {
   'asar-unpack': 'WebTorrent*',
 
   // The build version of the application. Maps to the FileVersion metadata property on
-  // Windows, and CFBundleVersion on Mac. Note: Windows requires the build version to
-  // start with a number. We're using the version of the underlying WebTorrent library.
-  'build-version': require('webtorrent/package.json').version,
+  // Windows, and CFBundleVersion on OS X. We're using the short git hash (e.g. 'e7d837e')
+  // Windows requires the build version to start with a number :/ so we stick on a prefix
+  'build-version': '0-' + cp.execSync('git rev-parse --short HEAD').toString().replace('\n', ''),
 
   // The application source directory.
   dir: config.ROOT_PATH,
 
   // Pattern which specifies which files to ignore when copying files to create the
   // package(s).
-  ignore: /^\/src|^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
+  ignore: /^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
 
   // The application name.
   name: config.APP_NAME,
@@ -105,24 +110,20 @@ var all = {
   prune: true,
 
   // The Electron version with which the app is built (without the leading 'v')
-  version: require('electron/package.json').version
+  version: pkg.dependencies['electron-prebuilt']
 }
 
 var darwin = {
-  // Build for Mac
   platform: 'darwin',
 
-  // Build x64 binaries only.
-  arch: 'x64',
-
-  // The bundle identifier to use in the application's plist (Mac only).
+  // The bundle identifier to use in the application's plist (OS X only).
   '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 (Mac only).
+  // 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 (Mac only).
+  // The bundle identifier to use in the application helper's plist (OS X only).
   'helper-bundle-id': 'io.webtorrent.webtorrent-helper',
 
   // Application icon.
@@ -130,12 +131,8 @@ var darwin = {
 }
 
 var win32 = {
-  // Build for Windows.
   platform: 'win32',
 
-  // Build ia32 and x64 binaries.
-  arch: 'all',
-
   // Object hash of application metadata to embed into the executable (Windows only)
   'version-string': {
 
@@ -164,10 +161,9 @@ var win32 = {
 }
 
 var linux = {
-  // Build for Linux.
   platform: 'linux',
 
-  // Build ia32 and x64 binaries.
+  // Build 32/64 bit binaries.
   arch: 'all'
 
   // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
@@ -178,10 +174,10 @@ build()
 function buildDarwin (cb) {
   var plist = require('plist')
 
-  console.log('Mac: Packaging electron...')
+  console.log('OS X: Packaging electron...')
   electronPackager(Object.assign({}, all, darwin), function (err, buildPath) {
     if (err) return cb(err)
-    console.log('Mac: Packaged electron. ' + buildPath)
+    console.log('OS X: Packaged electron. ' + buildPath[0])
 
     var appPath = path.join(buildPath[0], config.APP_NAME + '.app')
     var contentsPath = path.join(appPath, 'Contents')
@@ -189,6 +185,8 @@ function buildDarwin (cb) {
     var infoPlistPath = path.join(contentsPath, 'Info.plist')
     var infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))
 
+    // TODO: Use new `extend-info` and `extra-resource` opts to electron-packager,
+    // available as of v6.
     infoPlist.CFBundleDocumentTypes = [
       {
         CFBundleTypeExtensions: [ 'torrent' ],
@@ -213,31 +211,6 @@ function buildDarwin (cb) {
         CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
         CFBundleURLName: 'BitTorrent Magnet URL',
         CFBundleURLSchemes: [ 'magnet' ]
-      },
-      {
-        CFBundleTypeRole: 'Editor',
-        CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
-        CFBundleURLName: 'BitTorrent Stream-Magnet URL',
-        CFBundleURLSchemes: [ 'stream-magnet' ]
-      }
-    ]
-
-    infoPlist.UTExportedTypeDeclarations = [
-      {
-        UTTypeConformsTo: [
-          'public.data',
-          'public.item',
-          'com.bittorrent.torrent'
-        ],
-        UTTypeDescription: 'BitTorrent Document',
-        UTTypeIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
-        UTTypeIdentifier: 'org.bittorrent.torrent',
-        UTTypeReferenceURL: 'http://www.bittorrent.org/beps/bep_0000.html',
-        UTTypeTagSpecification: {
-          'com.apple.ostype': 'TORR',
-          'public.filename-extension': [ 'torrent' ],
-          'public.mime-type': 'application/x-bittorrent'
-        }
       }
     ]
 
@@ -268,9 +241,9 @@ function buildDarwin (cb) {
        *   - So the auto-updater (Squirrrel.Mac) can check that app updates are signed by
        *     the same author as the current version.
        *   - So users will not a see a warning about the app coming from an "Unidentified
-       *     Developer" when they open it for the first time (Mac Gatekeeper).
+       *     Developer" when they open it for the first time (OS X Gatekeeper).
        *
-       * To sign an Mac app for distribution outside the App Store, the following are
+       * To sign an OS X app for distribution outside the App Store, the following are
        * required:
        *   - Xcode
        *   - Xcode Command Line Tools (xcode-select --install)
@@ -282,10 +255,10 @@ function buildDarwin (cb) {
         verbose: true
       }
 
-      console.log('Mac: Signing app...')
+      console.log('OS X: Signing app...')
       sign(signOpts, function (err) {
         if (err) return cb(err)
-        console.log('Mac: Signed app.')
+        console.log('OS X: Signed app.')
         cb(null)
       })
     }
@@ -300,24 +273,24 @@ function buildDarwin (cb) {
 
     function packageZip () {
       // Create .zip file (used by the auto-updater)
-      console.log('Mac: Creating zip...')
+      console.log('OS X: Creating zip...')
 
       var inPath = path.join(buildPath[0], config.APP_NAME + '.app')
       var outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip')
-      zip.zipSync(inPath, outPath)
+      zip(inPath, outPath)
 
-      console.log('Mac: Created zip.')
+      console.log('OS X: Created zip.')
     }
 
     function packageDmg (cb) {
-      console.log('Mac: Creating dmg...')
+      console.log('OS X: Creating dmg...')
 
       var appDmg = require('appdmg')
 
       var targetPath = path.join(DIST_PATH, BUILD_NAME + '.dmg')
       rimraf.sync(targetPath)
 
-      // Create a .dmg (Mac disk image) file, for easy user installation.
+      // Create a .dmg (OS X disk image) file, for easy user installation.
       var dmgOpts = {
         basepath: config.ROOT_PATH,
         target: targetPath,
@@ -340,12 +313,12 @@ function buildDarwin (cb) {
       }
 
       var dmg = appDmg(dmgOpts)
-      dmg.once('error', cb)
+      dmg.on('error', cb)
       dmg.on('progress', function (info) {
         if (info.type === 'step-begin') console.log(info.title + '...')
       })
-      dmg.once('finish', function (info) {
-        console.log('Mac: Created dmg.')
+      dmg.on('finish', function (info) {
+        console.log('OS X: Created dmg.')
         cb(null)
       })
     }
@@ -354,24 +327,11 @@ function buildDarwin (cb) {
 
 function buildWin32 (cb) {
   var installer = require('electron-winstaller')
+
   console.log('Windows: Packaging electron...')
-
-  /*
-   * Path to folder with the following files:
-   *   - Windows Authenticode private key and cert (authenticode.p12)
-   *   - Windows Authenticode password file (authenticode.txt)
-   */
-  var CERT_PATH
-  try {
-    fs.accessSync('D:')
-    CERT_PATH = 'D:'
-  } catch (err) {
-    CERT_PATH = path.join(os.homedir(), 'Desktop')
-  }
-
   electronPackager(Object.assign({}, all, win32), function (err, buildPath) {
     if (err) return cb(err)
-    console.log('Windows: Packaged electron. ' + buildPath)
+    console.log('Windows: Packaged electron. ' + buildPath[0])
 
     var signWithParams
     if (process.platform === 'win32') {
@@ -388,25 +348,18 @@ function buildWin32 (cb) {
     }
 
     var tasks = []
-    buildPath.forEach(function (filesPath) {
-      var destArch = filesPath.split('-').pop()
-
-      if (argv.package === 'exe' || argv.package === 'all') {
-        tasks.push((cb) => packageInstaller(filesPath, destArch, cb))
-      }
-      if (argv.package === 'portable' || argv.package === 'all') {
-        tasks.push((cb) => packagePortable(filesPath, destArch, cb))
-      }
-    })
+    if (argv.package === 'exe' || argv.package === 'all') {
+      tasks.push((cb) => packageInstaller(cb))
+    }
+    if (argv.package === 'portable' || argv.package === 'all') {
+      tasks.push((cb) => packagePortable(cb))
+    }
     series(tasks, cb)
 
-    function packageInstaller (filesPath, destArch, cb) {
-      console.log(`Windows: Creating ${destArch} installer...`)
-
-      var archStr = destArch === 'ia32' ? '-ia32' : ''
-
+    function packageInstaller (cb) {
+      console.log('Windows: Creating installer...')
       installer.createWindowsInstaller({
-        appDirectory: filesPath,
+        appDirectory: buildPath[0],
         authors: config.APP_TEAM,
         description: config.APP_NAME,
         exe: config.APP_NAME + '.exe',
@@ -416,87 +369,31 @@ function buildWin32 (cb) {
         noMsi: true,
         outputDirectory: DIST_PATH,
         productName: config.APP_NAME,
-        /**
-         * Only create delta updates for the Windows x64 build because 90% of our
-         * users have Windows x64 and the delta files take a *very* long time to
-         * generate. Also, the ia32 files on GitHub have non-standard Squirrel
-         * names (i.e. RELEASES-ia32 instead of RELEASES) and so Squirrel won't
-         * find them unless we proxy the requests.
-         */
-        remoteReleases: destArch === 'x64'
-          ? config.GITHUB_URL
-          : undefined,
-        /**
-         * If you hit a "GitHub API rate limit exceeded" error, set this token!
-         */
-        remoteToken: process.env.WEBTORRENT_GITHUB_API_TOKEN,
-        setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + archStr + '.exe',
+        remoteReleases: config.GITHUB_URL,
+        setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
         setupIcon: config.APP_ICON + '.ico',
         signWithParams: signWithParams,
         title: config.APP_NAME,
         usePackageJson: false,
         version: pkg.version
-      })
-      .then(function () {
-        console.log(`Windows: Created ${destArch} installer.`)
-
-        /**
-         * Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
-         * versions of the app)
-         */
-        fs.readdirSync(DIST_PATH)
-          .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
-          .forEach((filename) => {
-            fs.unlinkSync(path.join(DIST_PATH, filename))
-          })
-
-        if (destArch === 'ia32') {
-          console.log('Windows: Renaming ia32 installer files...')
-
-          // RELEASES -> RELEASES-ia32
-          var relPath = path.join(DIST_PATH, 'RELEASES-ia32')
-          fs.renameSync(
-            path.join(DIST_PATH, 'RELEASES'),
-            relPath
-          )
-
-          // WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
-          fs.renameSync(
-            path.join(DIST_PATH, `${BUILD_NAME}-full.nupkg`),
-            path.join(DIST_PATH, `${BUILD_NAME}-ia32-full.nupkg`)
-          )
-
-          // Change file name inside RELEASES-ia32 to match renamed file
-          var relContent = fs.readFileSync(relPath, 'utf8')
-          var relContent32 = relContent.replace(/full\.nupkg$/, '-ia32-full.nupkg')
-          fs.writeFileSync(relPath, relContent32)
-
-          if (relContent === relContent32) {
-            // Sanity check
-            throw new Error('Fixing RELEASE-ia32 failed. Replacement did not modify the file.')
-          }
-
-          console.log('Windows: Renamed ia32 installer files.')
-        }
-
+      }).then(function () {
+        console.log('Windows: Created installer.')
         cb(null)
-      })
-      .catch(cb)
+      }).catch(cb)
     }
 
-    function packagePortable (filesPath, destArch, cb) {
-      console.log(`Windows: Creating ${destArch} portable app...`)
+    function packagePortable (cb) {
+      // Create Windows portable app
+      console.log('Windows: Creating portable app...')
 
-      var portablePath = path.join(filesPath, 'Portable Settings')
+      var portablePath = path.join(buildPath[0], 'Portable Settings')
       mkdirp.sync(portablePath)
 
-      var archStr = destArch === 'ia32' ? '-ia32' : ''
+      var inPath = path.join(DIST_PATH, path.basename(buildPath[0]))
+      var outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
+      zip(inPath, outPath)
 
-      var inPath = path.join(DIST_PATH, path.basename(filesPath))
-      var outPath = path.join(DIST_PATH, BUILD_NAME + '-win' + archStr + '.zip')
-      zip.zipSync(inPath, outPath)
-
-      console.log(`Windows: Created ${destArch} portable app.`)
+      console.log('Windows: Created portable app.')
       cb(null)
     }
   })
@@ -506,7 +403,7 @@ function buildLinux (cb) {
   console.log('Linux: Packaging electron...')
   electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
     if (err) return cb(err)
-    console.log('Linux: Packaged electron. ' + buildPath)
+    console.log('Linux: Packaged electron. ' + buildPath[0])
 
     var tasks = []
     buildPath.forEach(function (filesPath) {
@@ -534,7 +431,7 @@ function buildLinux (cb) {
       info: {
         arch: destArch === 'x64' ? 'amd64' : 'i386',
         targetDir: DIST_PATH,
-        depends: 'gconf2, libgtk2.0-0, libnss3, libxss1',
+        depends: 'libc6 (>= 2.4)',
         scripts: {
           postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
           prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
@@ -545,11 +442,6 @@ function buildLinux (cb) {
       dest: destPath,
       expand: true,
       cwd: filesPath
-    }, {
-      src: ['./**'],
-      dest: path.join('/usr', 'share'),
-      expand: true,
-      cwd: path.join(config.STATIC_PATH, 'linux', 'share')
     }], function (err) {
       if (err) return cb(err)
       console.log(`Linux: Created ${destArch} deb.`)
@@ -561,11 +453,9 @@ function buildLinux (cb) {
     // Create .zip file for Linux
     console.log(`Linux: Creating ${destArch} zip...`)
 
-    var archStr = destArch === 'ia32' ? '-ia32' : ''
-
     var inPath = path.join(DIST_PATH, path.basename(filesPath))
-    var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux' + archStr + '.zip')
-    zip.zipSync(inPath, outPath)
+    var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux-' + destArch + '.zip')
+    zip(inPath, outPath)
 
     console.log(`Linux: Created ${destArch} zip.`)
     cb(null)

bin/release-_post.sh

@@ -1,10 +1,9 @@
 #!/bin/sh
 set -e
 
-npm run update-authors
 git diff --exit-code
 npm run package -- --sign
 git push
 git push --tags
 npm publish
-npm run gh-release
+gh-release

bin/release-_pre.sh

@@ -2,7 +2,10 @@
 set -e
 
 git pull
+npm run update-authors
+git diff --exit-code
 rm -rf node_modules/
 npm install
+npm prune
 npm dedupe
 npm test

bin/update-authors.sh

@@ -2,17 +2,15 @@
 
 # Update AUTHORS.md based on git history.
 
-git log --reverse --format='%aN (%aE)' | perl -we '
+git log --reverse --format='%aN <%aE>' | perl -we '
 BEGIN {
   %seen = (), @authors = ();
 }
 while (<>) {
   next if $seen{$_};
-  next if /(support\@greenkeeper.io)/;
-  next if /(ungoldman\@gmail.com)/;
-  next if /(dc\@DCs-MacBook.local)/;
-  next if /(rolandoguedes\@gmail.com)/;
-  next if /(grunjol\@users.noreply.github.com)/;
+  next if /<support\@greenkeeper.io>/;
+  next if /<ungoldman\@gmail.com>/;
+  next if /<grunjol\@users.noreply.github.com>/;
   $seen{$_} = push @authors, "- ", $_;
 }
 END {

config.js

@@ -0,0 +1,72 @@
+var appConfig = require('application-config')('WebTorrent')
+var path = require('path')
+var pathExists = require('path-exists')
+
+var APP_NAME = 'WebTorrent'
+var APP_TEAM = 'The WebTorrent Project'
+var APP_VERSION = require('./package.json').version
+
+var PORTABLE_PATH = path.join(path.dirname(process.execPath), 'Portable Settings')
+
+module.exports = {
+  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_CHECK_STARTUP_DELAY: 5 * 1000 /* 5 seconds */,
+  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update' +
+    '?version=' + APP_VERSION + '&platform=' + process.platform,
+
+  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
+
+  CONFIG_PATH: getConfigPath(),
+  CONFIG_POSTER_PATH: path.join(getConfigPath(), 'Posters'),
+  CONFIG_TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
+
+  GITHUB_URL: 'https://github.com/feross/webtorrent-desktop',
+  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/feross/webtorrent-desktop/master',
+
+  IS_PORTABLE: isPortable(),
+  IS_PRODUCTION: isProduction(),
+
+  ROOT_PATH: __dirname,
+  STATIC_PATH: path.join(__dirname, 'static'),
+
+  WINDOW_ABOUT: 'file://' + path.join(__dirname, 'renderer', 'about.html'),
+  WINDOW_MAIN: 'file://' + path.join(__dirname, 'renderer', 'main.html'),
+  WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, 'renderer', 'webtorrent.html'),
+
+  WINDOW_MIN_HEIGHT: 38 + (120 * 2), // header height + 2 torrents
+  WINDOW_MIN_WIDTH: 425
+}
+
+function getConfigPath () {
+  if (isPortable()) {
+    return PORTABLE_PATH
+  } else {
+    return path.dirname(appConfig.filePath)
+  }
+}
+
+function isPortable () {
+  return process.platform === 'win32' && isProduction() && pathExists(PORTABLE_PATH)
+}
+
+function isProduction () {
+  if (!process.versions.electron) {
+    return false
+  }
+  if (process.platform === 'darwin') {
+    return !/\/Electron\.app\/Contents\/MacOS\/Electron$/.test(process.execPath)
+  }
+  if (process.platform === 'win32') {
+    return !/\\electron\.exe$/.test(process.execPath)
+  }
+  if (process.platform === 'linux') {
+    return !/\/electron$/.test(process.execPath)
+  }
+}

crash-reporter.js

@@ -2,8 +2,8 @@ module.exports = {
   init
 }
 
-const config = require('./config')
-const electron = require('electron')
+var config = require('./config')
+var electron = require('electron')
 
 function init () {
   electron.crashReporter.start({
@@ -11,4 +11,5 @@ function init () {
     productName: config.APP_NAME,
     submitURL: config.CRASH_REPORT_URL
   })
+  console.log('crash reporter started')
 }

index.js

@@ -1 +1,2 @@
-require('./build/main')
+console.time('init')
+require('./main')

main/auto-updater.js

@@ -0,0 +1,50 @@
+module.exports = {
+  init
+}
+
+var electron = require('electron')
+var get = require('simple-get')
+
+var config = require('../config')
+var log = require('./log')
+var windows = require('./windows')
+
+var autoUpdater = electron.autoUpdater
+
+function init () {
+  autoUpdater.on('error', function (err) {
+    log.error('App update error: ' + err.message || err)
+  })
+
+  autoUpdater.setFeedURL(config.AUTO_UPDATE_URL)
+
+  /*
+   * We always check for updates on app startup. To keep app startup fast, we delay this
+   * first check so it happens when there is less going on.
+   */
+  setTimeout(checkForUpdates, config.AUTO_UPDATE_CHECK_STARTUP_DELAY)
+
+  autoUpdater.on('checking-for-update', () => log('Checking for app update'))
+  autoUpdater.on('update-available', () => log('App update available'))
+  autoUpdater.on('update-not-available', () => log('App update not available'))
+  autoUpdater.on('update-downloaded', function (e, releaseNotes, releaseName, releaseDate, updateURL) {
+    log('App update downloaded: ', releaseName, updateURL)
+  })
+}
+
+function checkForUpdates () {
+  // Electron's built-in auto updater only supports Mac and Windows, for now
+  if (process.platform !== 'linux') {
+    return autoUpdater.checkForUpdates()
+  }
+
+  // If we're on Linux, we have to do it ourselves
+  get.concat(config.AUTO_UPDATE_URL, function (err, res, data) {
+    if (err) return log('Error checking for app update: ' + err.message)
+    if (![200, 204].includes(res.statusCode)) return log('Error checking for app update, got HTTP ' + res.statusCode)
+    if (res.statusCode !== 200) return
+
+    var obj = JSON.parse(data)
+    windows.main.send('dispatch', 'updateAvailable', obj.version)
+  })
+}

main/handlers.js

@@ -3,8 +3,7 @@ module.exports = {
   uninstall
 }
 
-const config = require('../config')
-const path = require('path')
+var path = require('path')
 
 function install () {
   if (process.platform === 'darwin') {
@@ -31,52 +30,27 @@ function uninstall () {
 }
 
 function installDarwin () {
-  const electron = require('electron')
-  const app = electron.app
+  var electron = require('electron')
+  var app = electron.app
 
-  // On Mac, only protocols that are listed in `Info.plist` can be set as the
-  // default handler at runtime.
+  // On OS X, only protocols that are listed in Info.plist can be set as the default
+  // handler at runtime.
   app.setAsDefaultProtocolClient('magnet')
-  app.setAsDefaultProtocolClient('stream-magnet')
 
-  // File handlers are defined in `Info.plist`.
+  // File handlers are registered in the Info.plist.
 }
 
 function uninstallDarwin () {}
 
-const EXEC_COMMAND = [ process.execPath ]
-
-if (!config.IS_PRODUCTION) {
-  EXEC_COMMAND.push(config.ROOT_PATH)
-}
-
 function installWin32 () {
-  const Registry = require('winreg')
+  var Registry = require('winreg')
 
-  const log = require('./log')
+  var log = require('./log')
 
-  const iconPath = path.join(
-    process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico'
-  )
-  registerProtocolHandlerWin32(
-    'magnet',
-    'URL:BitTorrent Magnet URL',
-    iconPath,
-    EXEC_COMMAND
-  )
-  registerProtocolHandlerWin32(
-    'stream-magnet',
-    'URL:BitTorrent Stream-Magnet URL',
-    iconPath,
-    EXEC_COMMAND
-  )
-  registerFileHandlerWin32(
-    '.torrent',
-    'io.webtorrent.torrent',
-    'BitTorrent Document',
-    iconPath,
-    EXEC_COMMAND
-  )
+  var iconPath = path.join(process.resourcesPath, 'app.asar.unpacked', 'static', 'WebTorrentFile.ico')
+
+  registerProtocolHandlerWin32('magnet', 'URL:BitTorrent Magnet URL', iconPath, process.execPath)
+  registerFileHandlerWin32('.torrent', 'io.webtorrent.torrent', 'BitTorrent Document', iconPath, process.execPath)
 
   /**
    * To add a protocol handler, the following keys must be added to the Windows registry:
@@ -100,7 +74,7 @@ function installWin32 () {
    */
 
   function registerProtocolHandlerWin32 (protocol, name, icon, command) {
-    const protocolKey = new Registry({
+    var protocolKey = new Registry({
       hive: Registry.HKCU, // HKEY_CURRENT_USER
       key: '\\Software\\Classes\\' + protocol
     })
@@ -120,7 +94,7 @@ function installWin32 () {
     function setIcon (err) {
       if (err) log.error(err.message)
 
-      const iconKey = new Registry({
+      var iconKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
       })
@@ -130,11 +104,11 @@ function installWin32 () {
     function setCommand (err) {
       if (err) log.error(err.message)
 
-      const commandKey = new Registry({
+      var commandKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
       })
-      commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
     }
 
     function done (err) {
@@ -161,7 +135,7 @@ function installWin32 () {
     setExt()
 
     function setExt () {
-      const extKey = new Registry({
+      var extKey = new Registry({
         hive: Registry.HKCU, // HKEY_CURRENT_USER
         key: '\\Software\\Classes\\' + ext
       })
@@ -171,7 +145,7 @@ function installWin32 () {
     function setId (err) {
       if (err) log.error(err.message)
 
-      const idKey = new Registry({
+      var idKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + id
       })
@@ -181,7 +155,7 @@ function installWin32 () {
     function setIcon (err) {
       if (err) log.error(err.message)
 
-      const iconKey = new Registry({
+      var iconKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
       })
@@ -191,11 +165,11 @@ function installWin32 () {
     function setCommand (err) {
       if (err) log.error(err.message)
 
-      const commandKey = new Registry({
+      var commandKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
       })
-      commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
     }
 
     function done (err) {
@@ -205,29 +179,28 @@ function installWin32 () {
 }
 
 function uninstallWin32 () {
-  const Registry = require('winreg')
+  var Registry = require('winreg')
 
-  unregisterProtocolHandlerWin32('magnet', EXEC_COMMAND)
-  unregisterProtocolHandlerWin32('stream-magnet', EXEC_COMMAND)
-  unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', EXEC_COMMAND)
+  unregisterProtocolHandlerWin32('magnet', process.execPath)
+  unregisterFileHandlerWin32('.torrent', 'io.webtorrent.torrent', process.execPath)
 
   function unregisterProtocolHandlerWin32 (protocol, command) {
     getCommand()
 
     function getCommand () {
-      const commandKey = new Registry({
+      var commandKey = new Registry({
         hive: Registry.HKCU, // HKEY_CURRENT_USER
         key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
       })
       commandKey.get('', function (err, item) {
-        if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
+        if (!err && item.value.indexOf(command) >= 0) {
           destroyProtocol()
         }
       })
     }
 
     function destroyProtocol () {
-      const protocolKey = new Registry({
+      var protocolKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + protocol
       })
@@ -239,7 +212,7 @@ function uninstallWin32 () {
     eraseId()
 
     function eraseId () {
-      const idKey = new Registry({
+      var idKey = new Registry({
         hive: Registry.HKCU, // HKEY_CURRENT_USER
         key: '\\Software\\Classes\\' + id
       })
@@ -247,7 +220,7 @@ function uninstallWin32 () {
     }
 
     function getExt () {
-      const extKey = new Registry({
+      var extKey = new Registry({
         hive: Registry.HKCU,
         key: '\\Software\\Classes\\' + ext
       })
@@ -259,7 +232,7 @@ function uninstallWin32 () {
     }
 
     function destroyExt () {
-      const extKey = new Registry({
+      var extKey = new Registry({
         hive: Registry.HKCU, // HKEY_CURRENT_USER
         key: '\\Software\\Classes\\' + ext
       })
@@ -268,44 +241,35 @@ function uninstallWin32 () {
   }
 }
 
-function commandToArgs (command) {
-  return command.map((arg) => `"${arg}"`).join(' ')
-}
-
 function installLinux () {
-  const fs = require('fs-extra')
-  const os = require('os')
-  const path = require('path')
+  var fs = require('fs-extra')
+  var os = require('os')
+  var path = require('path')
 
-  const config = require('../config')
-  const log = require('./log')
-
-  // Do not install in user dir if running on system
-  if (/^\/opt/.test(process.execPath)) return
+  var config = require('../config')
+  var log = require('./log')
 
   installDesktopFile()
   installIconFile()
 
   function installDesktopFile () {
-    const templatePath = path.join(
-      config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
-    )
+    var templatePath = path.join(config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop')
     fs.readFile(templatePath, 'utf8', writeDesktopFile)
   }
 
   function writeDesktopFile (err, desktopFile) {
     if (err) return log.error(err.message)
 
-    const appPath = config.IS_PRODUCTION
-      ? path.dirname(process.execPath)
-      : config.ROOT_PATH
+    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, EXEC_COMMAND.join(' '))
-    desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, process.execPath)
+    desktopFile = desktopFile.replace(/\$EXEC_PATH/g, execPath)
+    desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, tryExecPath)
 
-    const desktopFilePath = path.join(
+    var desktopFilePath = path.join(
       os.homedir(),
       '.local',
       'share',
@@ -319,14 +283,14 @@ function installLinux () {
   }
 
   function installIconFile () {
-    const iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
+    var iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
     fs.readFile(iconStaticPath, writeIconFile)
   }
 
   function writeIconFile (err, iconFile) {
     if (err) return log.error(err.message)
 
-    const iconFilePath = path.join(
+    var iconFilePath = path.join(
       os.homedir(),
       '.local',
       'share',
@@ -341,11 +305,11 @@ function installLinux () {
 }
 
 function uninstallLinux () {
-  const os = require('os')
-  const path = require('path')
-  const fs = require('fs-extra')
+  var os = require('os')
+  var path = require('path')
+  var fs = require('fs-extra')
 
-  const desktopFilePath = path.join(
+  var desktopFilePath = path.join(
     os.homedir(),
     '.local',
     'share',
@@ -354,7 +318,7 @@ function uninstallLinux () {
   )
   fs.removeSync(desktopFilePath)
 
-  const iconFilePath = path.join(
+  var iconFilePath = path.join(
     os.homedir(),
     '.local',
     'share',

main/index.js

@@ -0,0 +1,135 @@
+var electron = require('electron')
+
+var app = electron.app
+var ipcMain = electron.ipcMain
+
+var autoUpdater = require('./auto-updater')
+var config = require('../config')
+var crashReporter = require('../crash-reporter')
+var handlers = require('./handlers')
+var ipc = require('./ipc')
+var log = require('./log')
+var menu = require('./menu')
+var shortcuts = require('./shortcuts')
+var squirrelWin32 = require('./squirrel-win32')
+var windows = require('./windows')
+var tray = require('./tray')
+
+var shouldQuit = false
+var argv = sliceArgv(process.argv)
+
+if (process.platform === 'win32') {
+  shouldQuit = squirrelWin32.handleEvent(argv[0])
+  argv = argv.filter((arg) => arg.indexOf('--squirrel') === -1)
+}
+
+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()
+  }
+}
+
+if (!shouldQuit) {
+  init()
+}
+
+function init () {
+  if (config.IS_PORTABLE) {
+    app.setPath('userData', config.CONFIG_PATH)
+  }
+
+  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 () {
+    crashReporter.init()
+    autoUpdater.init()
+  })
+
+  app.on('ready', function () {
+    menu.init()
+    windows.createMainWindow()
+    windows.createWebTorrentHiddenWindow()
+    shortcuts.init()
+    tray.init()
+    handlers.install()
+  })
+
+  app.on('ipcReady', function () {
+    log('Command line args:', argv)
+    processArgv(argv)
+  })
+
+  app.on('before-quit', function (e) {
+    if (app.isQuitting) return
+
+    app.isQuitting = true
+    e.preventDefault()
+    windows.main.send('dispatch', 'saveState') /* try to save state on exit */
+    ipcMain.once('savedState', () => app.quit())
+    setTimeout(() => app.quit(), 2000) /* quit after 2 secs, at most */
+  })
+
+  app.on('activate', function () {
+    windows.createMainWindow()
+  })
+}
+
+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 (arg) {
+    if (arg === '-n') {
+      windows.main.send('dispatch', 'showOpenSeedFiles')
+    } else if (arg === '-o') {
+      windows.main.send('dispatch', 'showOpenTorrentFile')
+    } else if (arg === '-u') {
+      windows.main.send('showOpenTorrentAddress')
+    } else if (arg.startsWith('-psn')) {
+      // Ignore OS X launchd "process serial number" argument
+      // More: https://github.com/feross/webtorrent-desktop/issues/214
+    } else {
+      windows.main.send('dispatch', 'onOpen', arg)
+    }
+  })
+}

main/ipc.js

@@ -0,0 +1,188 @@
+module.exports = {
+  init
+}
+
+var electron = require('electron')
+
+var app = electron.app
+var ipcMain = electron.ipcMain
+var powerSaveBlocker = electron.powerSaveBlocker
+
+var log = require('./log')
+var menu = require('./menu')
+var windows = require('./windows')
+var shortcuts = require('./shortcuts')
+
+// has to be a number, not a boolean, and undefined throws an error
+var powerSaveBlockID = 0
+
+function init () {
+  ipcMain.on('ipcReady', function (e) {
+    app.ipcReady = true
+    app.emit('ipcReady')
+    windows.main.show()
+    console.timeEnd('init')
+  })
+
+  var messageQueueMainToWebTorrent = []
+  ipcMain.on('ipcReadyWebTorrent', function (e) {
+    app.ipcReadyWebTorrent = true
+    log('sending %d queued messages from the main win to the webtorrent window',
+      messageQueueMainToWebTorrent.length)
+    messageQueueMainToWebTorrent.forEach(function (message) {
+      windows.webtorrent.send(message.name, ...message.args)
+      log('webtorrent: sent queued %s', message.name)
+    })
+  })
+
+  ipcMain.on('showOpenTorrentFile', menu.showOpenTorrentFile)
+  ipcMain.on('showOpenSeedFiles', menu.showOpenSeedFiles)
+
+  ipcMain.on('setBounds', function (e, bounds, maximize) {
+    setBounds(bounds, maximize)
+  })
+
+  ipcMain.on('setAspectRatio', function (e, aspectRatio, extraSize) {
+    setAspectRatio(aspectRatio, extraSize)
+  })
+
+  ipcMain.on('setBadge', function (e, text) {
+    setBadge(text)
+  })
+
+  ipcMain.on('setProgress', function (e, progress) {
+    setProgress(progress)
+  })
+
+  ipcMain.on('toggleFullScreen', function (e, flag) {
+    menu.toggleFullScreen(flag)
+  })
+
+  ipcMain.on('setTitle', function (e, title) {
+    windows.main.setTitle(title)
+  })
+
+  ipcMain.on('openItem', function (e, path) {
+    log('opening file or folder: ' + path)
+    electron.shell.openItem(path)
+  })
+
+  ipcMain.on('blockPowerSave', blockPowerSave)
+  ipcMain.on('unblockPowerSave', unblockPowerSave)
+
+  ipcMain.on('onPlayerOpen', function () {
+    menu.onPlayerOpen()
+    shortcuts.registerPlayerShortcuts()
+  })
+  ipcMain.on('onPlayerClose', function () {
+    menu.onPlayerClose()
+    shortcuts.unregisterPlayerShortcuts()
+  })
+
+  ipcMain.on('focusWindow', function (e, windowName) {
+    windows.focusWindow(windows[windowName])
+  })
+
+  // Capture all events
+  var oldEmit = ipcMain.emit
+  ipcMain.emit = function (name, e, ...args) {
+    // Relay messages between the main window and the WebTorrent hidden window
+    if (name.startsWith('wt-') && !app.isQuitting) {
+      if (e.sender.browserWindowOptions.title === 'webtorrent-hidden-window') {
+        // Send message to main window
+        windows.main.send(name, ...args)
+        log('webtorrent: got %s', name)
+      } else if (app.ipcReadyWebTorrent) {
+        // Send message to webtorrent window
+        windows.webtorrent.send(name, ...args)
+        log('webtorrent: sent %s', name)
+      } else {
+        // Queue message for webtorrent window, it hasn't finished loading yet
+        messageQueueMainToWebTorrent.push({
+          name: name,
+          args: args
+        })
+        log('webtorrent: queueing %s', name)
+      }
+      return
+    }
+
+    // Emit all other events normally
+    oldEmit.call(ipcMain, name, e, ...args)
+  }
+}
+
+function setBounds (bounds, maximize) {
+  // Do nothing in fullscreen
+  if (!windows.main || windows.main.isFullScreen()) {
+    log('setBounds: not setting bounds because we\'re in full screen')
+    return
+  }
+
+  // Maximize or minimize, if the second argument is present
+  var willBeMaximized
+  if (maximize === true) {
+    if (!windows.main.isMaximized()) {
+      log('setBounds: maximizing')
+      windows.main.maximize()
+    }
+    willBeMaximized = true
+  } else if (maximize === false) {
+    if (windows.main.isMaximized()) {
+      log('setBounds: unmaximizing')
+      windows.main.unmaximize()
+    }
+    willBeMaximized = false
+  } else {
+    willBeMaximized = windows.main.isMaximized()
+  }
+
+  // Assuming we're not maximized or maximizing, set the window size
+  if (!willBeMaximized) {
+    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
+    if (bounds.x === null && bounds.y === null) {
+      // X and Y not specified? By default, center on current screen
+      var screen = require('screen')
+      var scr = screen.getDisplayMatching(windows.main.getBounds())
+      bounds.x = Math.round(scr.bounds.x + scr.bounds.width / 2 - bounds.width / 2)
+      bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2)
+      log('setBounds: centered to ' + JSON.stringify(bounds))
+    }
+    windows.main.setBounds(bounds, true)
+  } else {
+    log('setBounds: not setting bounds because of window maximization')
+  }
+}
+
+function setAspectRatio (aspectRatio, extraSize) {
+  log('setAspectRatio %o %o', aspectRatio, extraSize)
+  if (windows.main) {
+    windows.main.setAspectRatio(aspectRatio, extraSize)
+  }
+}
+
+// Display string in dock badging area (OS X)
+function setBadge (text) {
+  log('setBadge %s', text)
+  if (app.dock) app.dock.setBadge(String(text))
+}
+
+// Show progress bar. Valid range is [0, 1]. Remove when < 0; indeterminate when > 1.
+function setProgress (progress) {
+  log('setProgress %s', progress)
+  if (windows.main) {
+    windows.main.setProgressBar(progress)
+  }
+}
+
+function blockPowerSave () {
+  powerSaveBlockID = powerSaveBlocker.start('prevent-display-sleep')
+  log('blockPowerSave %d', powerSaveBlockID)
+}
+
+function unblockPowerSave () {
+  if (powerSaveBlocker.isStarted(powerSaveBlockID)) {
+    powerSaveBlocker.stop(powerSaveBlockID)
+    log('unblockPowerSave %d', powerSaveBlockID)
+  }
+}

main/log.js

@@ -8,16 +8,17 @@ module.exports.error = error
  * where they can be viewed in Developer Tools.
  */
 
-const electron = require('electron')
-const windows = require('./windows')
+var electron = require('electron')
 
-const app = electron.app
+var windows = require('./windows')
+
+var app = electron.app
 
 function log (...args) {
   if (app.ipcReady) {
     windows.main.send('log', ...args)
   } else {
-    app.once('ipcReady', () => windows.main.send('log', ...args))
+    app.on('ipcReady', () => windows.main.send('log', ...args))
   }
 }
 
@@ -25,6 +26,6 @@ function error (...args) {
   if (app.ipcReady) {
     windows.main.send('error', ...args)
   } else {
-    app.once('ipcReady', () => windows.main.send('error', ...args))
+    app.on('ipcReady', () => windows.main.send('error', ...args))
   }
 }

main/menu.js

@@ -0,0 +1,387 @@
+module.exports = {
+  init,
+  onToggleFullScreen,
+  onWindowHide,
+  onWindowShow,
+  onPlayerOpen,
+  onPlayerClose,
+  showOpenSeedFiles,
+  showOpenTorrentFile,
+  toggleFullScreen
+}
+
+var electron = require('electron')
+
+var app = electron.app
+
+var config = require('../config')
+var log = require('./log')
+var windows = require('./windows')
+
+var appMenu, dockMenu
+
+function init () {
+  appMenu = electron.Menu.buildFromTemplate(getAppMenuTemplate())
+  electron.Menu.setApplicationMenu(appMenu)
+
+  dockMenu = electron.Menu.buildFromTemplate(getDockMenuTemplate())
+  if (app.dock) app.dock.setMenu(dockMenu)
+}
+
+function toggleFullScreen (flag) {
+  log('toggleFullScreen %s', flag)
+  if (windows.main && windows.main.isVisible()) {
+    flag = flag != null ? flag : !windows.main.isFullScreen()
+    windows.main.setFullScreen(flag)
+  }
+}
+
+// Sets whether the window should always show on top of other windows
+function toggleFloatOnTop (flag) {
+  log('toggleFloatOnTop %s', flag)
+  if (windows.main) {
+    flag = flag != null ? flag : !windows.main.isAlwaysOnTop()
+    windows.main.setAlwaysOnTop(flag)
+    getMenuItem('Float on Top').checked = 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 () {
+  log('toggleDevTools')
+  if (windows.main) {
+    windows.main.toggleDevTools()
+  }
+}
+
+function showWebTorrentWindow () {
+  windows.webtorrent.show()
+  windows.webtorrent.webContents.openDevTools({ detach: true })
+}
+
+function onWindowShow () {
+  log('onWindowShow')
+  getMenuItem('Full Screen').enabled = true
+  getMenuItem('Float on Top').enabled = true
+}
+
+function onWindowHide () {
+  log('onWindowHide')
+  getMenuItem('Full Screen').enabled = false
+  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)
+  getMenuItem('Full Screen').checked = isFullScreen
+  windows.main.send('fullscreenChanged', isFullScreen)
+}
+
+function getMenuItem (label) {
+  for (var i = 0; i < appMenu.items.length; i++) {
+    var menuItem = appMenu.items[i].submenu.items.find(function (item) {
+      return item.label === label
+    })
+    if (menuItem) return menuItem
+  }
+}
+
+// Prompts the user for a file or folder, then makes a torrent out of the data
+function showOpenSeedFiles () {
+  // Allow only a single selection
+  // To create a multi-file torrent, the user must select a folder
+  electron.dialog.showOpenDialog({
+    title: 'Select a file or folder for the torrent file.',
+    properties: [ 'openFile', 'openDirectory' ]
+  }, function (filenames) {
+    if (!Array.isArray(filenames)) return
+    var fileOrFolder = filenames[0]
+    windows.main.send('dispatch', 'showCreateTorrent', fileOrFolder)
+  })
+}
+
+// Prompts the user to choose a torrent file, then adds it to the app
+function showOpenTorrentFile () {
+  electron.dialog.showOpenDialog(windows.main, {
+    title: 'Select a .torrent file to open.',
+    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
+    properties: [ 'openFile', 'multiSelections' ]
+  }, function (filenames) {
+    if (!Array.isArray(filenames)) return
+    filenames.forEach(function (filename) {
+      windows.main.send('dispatch', 'addTorrent', filename)
+    })
+  })
+}
+
+// Prompts the user for the URL of a torrent file, then downloads and adds it
+function showOpenTorrentAddress () {
+  windows.main.send('showOpenTorrentAddress')
+}
+
+function getAppMenuTemplate () {
+  var fileMenu = [
+    {
+      label: 'Create New Torrent...',
+      accelerator: 'CmdOrCtrl+N',
+      click: showOpenSeedFiles
+    },
+    {
+      label: 'Open Torrent File...',
+      accelerator: 'CmdOrCtrl+O',
+      click: showOpenTorrentFile
+    },
+    {
+      label: 'Open Torrent Address...',
+      accelerator: 'CmdOrCtrl+U',
+      click: showOpenTorrentAddress
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: process.platform === 'windows' ? 'Close' : 'Close Window',
+      accelerator: 'CmdOrCtrl+W',
+      role: 'close'
+    }
+  ]
+
+  // File > Quit for Linux users with distros where the system tray is broken
+  if (process.platform === 'linux') {
+    fileMenu.push({
+      label: 'Quit',
+      click: () => app.quit()
+    })
+  }
+
+  var template = [
+    {
+      label: 'File',
+      submenu: fileMenu
+    },
+    {
+      label: 'Edit',
+      submenu: [
+        {
+          label: 'Cut',
+          accelerator: 'CmdOrCtrl+X',
+          role: 'cut'
+        },
+        {
+          label: 'Copy',
+          accelerator: 'CmdOrCtrl+C',
+          role: 'copy'
+        },
+        {
+          label: 'Paste Torrent Address',
+          accelerator: 'CmdOrCtrl+V',
+          role: 'paste'
+        },
+        {
+          label: 'Select All',
+          accelerator: 'CmdOrCtrl+A',
+          role: 'selectall'
+        }
+      ]
+    },
+    {
+      label: 'View',
+      submenu: [
+        {
+          label: 'Full Screen',
+          type: 'checkbox',
+          accelerator: process.platform === 'darwin'
+            ? 'Ctrl+Command+F'
+            : 'F11',
+          click: () => toggleFullScreen()
+        },
+        {
+          label: 'Float on Top',
+          type: 'checkbox',
+          click: () => toggleFloatOnTop()
+        },
+        {
+          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: [
+            {
+              label: 'Developer Tools',
+              accelerator: process.platform === 'darwin'
+                ? 'Alt+Command+I'
+                : 'Ctrl+Shift+I',
+              click: toggleDevTools
+            },
+            {
+              label: 'Show WebTorrent Process',
+              accelerator: process.platform === 'darwin'
+                ? 'Alt+Command+P'
+                : 'Ctrl+Shift+P',
+              click: showWebTorrentWindow
+            }
+          ]
+        }
+      ]
+    },
+    {
+      label: 'Window',
+      role: 'window',
+      submenu: [
+        {
+          label: 'Minimize',
+          accelerator: 'CmdOrCtrl+M',
+          role: 'minimize'
+        }
+      ]
+    },
+    {
+      label: 'Help',
+      role: 'help',
+      submenu: [
+        {
+          label: 'Learn more about ' + config.APP_NAME,
+          click: () => electron.shell.openExternal('https://webtorrent.io')
+        },
+        {
+          label: 'Contribute on GitHub',
+          click: () => electron.shell.openExternal(config.GITHUB_URL)
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Report an Issue...',
+          click: () => electron.shell.openExternal(config.GITHUB_URL + '/issues')
+        }
+      ]
+    }
+  ]
+
+  if (process.platform === 'darwin') {
+    // WebTorrent menu (OS X)
+    template.unshift({
+      label: config.APP_NAME,
+      submenu: [
+        {
+          label: 'About ' + config.APP_NAME,
+          role: 'about'
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Services',
+          role: 'services',
+          submenu: []
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Hide ' + config.APP_NAME,
+          accelerator: 'Command+H',
+          role: 'hide'
+        },
+        {
+          label: 'Hide Others',
+          accelerator: 'Command+Alt+H',
+          role: 'hideothers'
+        },
+        {
+          label: 'Show All',
+          role: 'unhide'
+        },
+        {
+          type: 'separator'
+        },
+        {
+          label: 'Quit',
+          accelerator: 'Command+Q',
+          click: () => app.quit()
+        }
+      ]
+    })
+
+    // Window menu (OS X)
+    template[4].submenu.push(
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Bring All to Front',
+        role: 'front'
+      }
+    )
+  } else {
+    // Help menu (Windows, Linux)
+    template[4].submenu.push(
+      {
+        type: 'separator'
+      },
+      {
+        label: 'About ' + config.APP_NAME,
+        click: windows.createAboutWindow
+      }
+    )
+  }
+
+  return template
+}
+
+function getDockMenuTemplate () {
+  return [
+    {
+      label: 'Create New Torrent...',
+      accelerator: 'CmdOrCtrl+N',
+      click: showOpenSeedFiles
+    },
+    {
+      label: 'Open Torrent File...',
+      accelerator: 'CmdOrCtrl+O',
+      click: showOpenTorrentFile
+    },
+    {
+      label: 'Open Torrent Address...',
+      accelerator: 'CmdOrCtrl+U',
+      click: showOpenTorrentAddress
+    }
+  ]
+}

main/shortcuts.js

@@ -0,0 +1,29 @@
+module.exports = {
+  init,
+  registerPlayerShortcuts,
+  unregisterPlayerShortcuts
+}
+
+var electron = require('electron')
+var localShortcut = require('electron-localshortcut')
+
+var globalShortcut = electron.globalShortcut
+
+var menu = require('./menu')
+var windows = require('./windows')
+
+function init () {
+  // ⌘+Shift+F is an alternative fullscreen shortcut to the ones defined in menu.js.
+  // Electron does not support multiple accelerators for a single menu item, so this
+  // is registered separately here.
+  localShortcut.register('CmdOrCtrl+Shift+F', menu.toggleFullScreen)
+}
+
+function registerPlayerShortcuts () {
+  // Special "media key" for play/pause, available on some keyboards
+  globalShortcut.register('MediaPlayPause', () => windows.main.send('dispatch', 'playPause'))
+}
+
+function unregisterPlayerShortcuts () {
+  globalShortcut.unregister('MediaPlayPause')
+}

main/squirrel-win32.js

@@ -2,18 +2,18 @@ module.exports = {
   handleEvent
 }
 
-const cp = require('child_process')
-const electron = require('electron')
-const fs = require('fs')
-const os = require('os')
-const path = require('path')
+var cp = require('child_process')
+var electron = require('electron')
+var fs = require('fs')
+var os = require('os')
+var path = require('path')
 
-const app = electron.app
+var app = electron.app
 
-const handlers = require('./handlers')
+var handlers = require('./handlers')
 
-const EXE_NAME = path.basename(process.execPath)
-const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
+var exeName = path.basename(process.execPath)
+var updateDotExe = path.join(process.execPath, '..', '..', 'Update.exe')
 
 function handleEvent (cmd) {
   if (cmd === '--squirrel-install') {
@@ -61,21 +61,19 @@ function handleEvent (cmd) {
   }
 
   if (cmd === '--squirrel-firstrun') {
-    // App is running for the first time. Do not quit, allow startup to continue.
+    // 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.
- */
+// Spawn a command and invoke the callback when it completes with an error and the output
+// from standard out.
 function spawn (command, args, cb) {
-  let stdout = ''
-  let error = null
-  let child = null
+  var stdout = ''
+
+  var child
   try {
     child = cp.spawn(command, args)
   } catch (err) {
@@ -90,10 +88,10 @@ function spawn (command, args, cb) {
     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
@@ -101,33 +99,26 @@ function spawn (command, args, cb) {
   })
 }
 
-/**
- * Spawn the Squirrel `Update.exe` command with the given arguments and invoke
- * the callback when the command completes.
- */
+// Spawn Squirrel's Update.exe with the given arguments and invoke the callback when the
+// command completes.
 function spawnUpdate (args, cb) {
-  spawn(UPDATE_EXE, args, cb)
+  spawn(updateDotExe, args, cb)
 }
 
-/**
- * Create desktop and start menu shortcuts using the Squirrel `Update.exe`
- * command.
- */
+// Create desktop/start menu shortcuts using the Squirrel Update.exe command line API
 function createShortcuts (cb) {
-  spawnUpdate(['--createShortcut', EXE_NAME], cb)
+  spawnUpdate(['--createShortcut', exeName], cb)
 }
 
-/**
- * Update desktop and start menu shortcuts using the Squirrel `Update.exe`
- * command.
- */
+// Update desktop/start menu shortcuts using the Squirrel Update.exe command line API
 function updateShortcuts (cb) {
-  const homeDir = os.homedir()
+  var homeDir = os.homedir()
   if (homeDir) {
-    const desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
-    // If the desktop shortcut was deleted by the user, then keep it deleted.
+    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
     fs.access(desktopShortcutPath, function (err) {
-      const desktopShortcutExists = !err
+      var desktopShortcutExists = !err
       createShortcuts(function () {
         if (desktopShortcutExists) {
           cb()
@@ -142,10 +133,7 @@ function updateShortcuts (cb) {
   }
 }
 
-/**
- * Remove desktop and start menu shortcuts using the Squirrel `Update.exe`
- * command.
- */
+// Remove desktop/start menu shortcuts using the Squirrel Update.exe command line API
 function removeShortcuts (cb) {
-  spawnUpdate(['--removeShortcut', EXE_NAME], cb)
+  spawnUpdate(['--removeShortcut', exeName], cb)
 }

main/tray.js

@@ -0,0 +1,83 @@
+module.exports = {
+  init,
+  hasTray
+}
+
+var cp = require('child_process')
+var path = require('path')
+var electron = require('electron')
+
+var app = electron.app
+var Menu = electron.Menu
+var Tray = electron.Tray
+
+var windows = require('./windows')
+
+var trayIcon
+
+function init () {
+  // OS X has no tray icon
+  if (process.platform === 'darwin') return
+
+  // On Linux, asynchronously check for libappindicator1
+  if (process.platform === 'linux') {
+    checkLinuxTraySupport(function (supportsTray) {
+      if (supportsTray) createTrayIcon()
+    })
+  }
+
+  // Windows always supports minimize-to-tray
+  if (process.platform === 'win32') createTrayIcon()
+}
+
+function hasTray () {
+  return !!trayIcon
+}
+
+function createTrayIcon () {
+  trayIcon = new Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png'))
+
+  // On Windows, left click to open the app, right click for context menu
+  // On Linux, any click (right or left) opens the context menu
+  trayIcon.on('click', showApp)
+
+  // Show the tray context menu, and keep the available commands up to date
+  updateTrayMenu()
+  windows.main.on('show', updateTrayMenu)
+  windows.main.on('hide', updateTrayMenu)
+}
+
+function checkLinuxTraySupport (cb) {
+  // Check that we're on Ubuntu (or another debian system) and that we have
+  // libappindicator1. If WebTorrent was installed from the deb file, we should
+  // always have it. If it was installed from the zip file, we might not.
+  cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
+    if (err) return cb(false)
+    // Unfortunately there's no cleaner way, as far as I can tell, to check
+    // whether a debian package is installed:
+    cb(stdout.endsWith('\tinstall\n'))
+  })
+}
+
+function updateTrayMenu () {
+  var showHideMenuItem
+  if (windows.main.isVisible()) {
+    showHideMenuItem = { label: 'Hide to tray', click: hideApp }
+  } else {
+    showHideMenuItem = { label: 'Show', click: showApp }
+  }
+  var contextMenu = Menu.buildFromTemplate([
+    showHideMenuItem,
+    { label: 'Quit', click: () => app.quit() }
+  ])
+  trayIcon.setContextMenu(contextMenu)
+}
+
+function showApp () {
+  windows.main.show()
+}
+
+function hideApp () {
+  windows.main.hide()
+  windows.main.send('dispatch', 'backToList')
+}

main/windows.js

@@ -0,0 +1,131 @@
+var windows = module.exports = {
+  about: null,
+  main: null,
+  createAboutWindow,
+  createWebTorrentHiddenWindow,
+  createMainWindow,
+  focusWindow
+}
+
+var electron = require('electron')
+
+var config = require('../config')
+var menu = require('./menu')
+var tray = require('./tray')
+
+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 createWebTorrentHiddenWindow () {
+  var win = windows.webtorrent = new electron.BrowserWindow({
+    backgroundColor: '#1E1E1E',
+    show: false,
+    center: true,
+    title: 'webtorrent-hidden-window',
+    useContentSize: true,
+    width: 150,
+    height: 150,
+    minimizable: false,
+    maximizable: false,
+    resizable: false,
+    fullscreenable: false,
+    fullscreen: false,
+    skipTaskbar: true
+  })
+  win.loadURL(config.WINDOW_WEBTORRENT)
+
+  // Prevent killing the WebTorrent process
+  win.on('close', function (e) {
+    if (!electron.app.isQuitting) {
+      e.preventDefault()
+      win.hide()
+    }
+  })
+
+  win.once('closed', function () {
+    windows.webtorrent = null
+  })
+}
+
+function createMainWindow () {
+  if (windows.main) {
+    return focusWindow(windows.main)
+  }
+  var win = windows.main = new electron.BrowserWindow({
+    backgroundColor: '#1E1E1E',
+    darkTheme: true, // Forces dark theme (GTK+3)
+    icon: config.APP_ICON + 'Smaller.png', // Window and Volume Mixer icon.
+    minWidth: config.WINDOW_MIN_WIDTH,
+    minHeight: config.WINDOW_MIN_HEIGHT,
+    show: false, // Hide window until DOM finishes loading
+    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: 500,
+    height: 38 + (120 * 5) // header height + 4 torrents
+  })
+  win.loadURL(config.WINDOW_MAIN)
+
+  win.webContents.on('dom-ready', function () {
+    menu.onToggleFullScreen()
+  })
+
+  win.on('blur', menu.onWindowHide)
+  win.on('focus', menu.onWindowShow)
+
+  win.on('enter-full-screen', () => menu.onToggleFullScreen(true))
+  win.on('leave-full-screen', () => menu.onToggleFullScreen(false))
+
+  win.on('close', function (e) {
+    if (process.platform !== 'darwin' && !tray.hasTray()) {
+      electron.app.quit()
+    } else if (!electron.app.isQuitting) {
+      e.preventDefault()
+      win.hide()
+      win.send('dispatch', 'backToList')
+    }
+  })
+
+  win.once('closed', function () {
+    windows.main = null
+  })
+}
+
+function focusWindow (win) {
+  if (win.isMinimized()) {
+    win.restore()
+  }
+  win.show() // shows and gives focus
+}

package.json

@@ -1,11 +1,11 @@
 {
   "name": "webtorrent-desktop",
-  "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.16.0",
+  "description": "WebTorrent, the streaming torrent client. For OS X, Windows, and Linux.",
+  "version": "0.3.3",
   "author": {
-    "name": "WebTorrent, LLC",
-    "email": "feross@webtorrent.io",
-    "url": "https://webtorrent.io"
+    "name": "Feross Aboukhadijeh",
+    "email": "feross@feross.org",
+    "url": "http://feross.org"
   },
   "bin": {
     "webtorrent-desktop": "./bin/cmd.js"
@@ -14,84 +14,56 @@
     "url": "https://github.com/feross/webtorrent-desktop/issues"
   },
   "dependencies": {
-    "airplayer": "^2.0.0",
-    "application-config": "^1.0.0",
-    "auto-launch": "^4.0.1",
+    "airplay-js": "guerrerocarlos/node-airplay-js",
+    "application-config": "feross/node-application-config",
     "bitfield": "^1.0.2",
-    "capture-frame": "^1.0.0",
     "chromecasts": "^1.8.0",
+    "concat-stream": "^1.5.1",
     "create-torrent": "^3.24.5",
     "deep-equal": "^1.0.1",
-    "dlnacasts": "^0.1.0",
-    "drag-drop": "^2.12.1",
-    "electron": "1.4.0",
-    "es6-error": "^3.0.1",
-    "fs-extra": "^0.30.0",
-    "iso-639-1": "^1.2.1",
+    "dlnacasts": "^0.0.3",
+    "drag-drop": "^2.11.0",
+    "electron-localshortcut": "^0.6.0",
+    "electron-prebuilt": "0.37.6",
+    "fs-extra": "^0.27.0",
+    "hyperx": "^2.0.2",
     "languagedetect": "^1.1.1",
-    "location-history": "^1.0.0",
-    "material-ui": "^0.15.4",
+    "main-loop": "^3.2.0",
     "musicmetadata": "^2.0.2",
     "network-address": "^1.1.0",
-    "parse-torrent": "^5.7.3",
     "prettier-bytes": "^1.0.1",
-    "react": "^15.2.1",
-    "react-dom": "^15.2.1",
-    "react-tap-event-plugin": "^1.0.0",
-    "run-parallel": "^1.1.6",
-    "semver": "^5.1.0",
-    "simple-concat": "^1.0.0",
     "simple-get": "^2.0.0",
     "srt-to-vtt": "^1.1.1",
-    "vlc-command": "^1.0.1",
+    "upload-element": "^1.0.1",
+    "virtual-dom": "^2.1.1",
+    "wcjs-player": "^0.5.7",
+    "webchimera.js": "^0.2.3",
     "webtorrent": "0.x",
-    "winreg": "^1.2.0",
-    "zero-fill": "^2.2.3"
+    "winreg": "^1.1.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.11.4",
-    "babel-plugin-syntax-jsx": "^6.13.0",
-    "babel-plugin-transform-es2015-destructuring": "^6.9.0",
-    "babel-plugin-transform-object-rest-spread": "^6.8.0",
-    "babel-plugin-transform-react-jsx": "^6.8.0",
-    "cross-zip": "^2.0.1",
-    "depcheck": "^0.6.4",
+    "cross-zip": "^1.0.0",
     "electron-osx-sign": "^0.3.0",
     "electron-packager": "^7.0.0",
-    "electron-winstaller": "^2.3.0",
+    "electron-winstaller": "feross/windows-installer#build",
     "gh-release": "^2.0.3",
     "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
-    "nobin-debian-installer": "^0.0.10",
-    "nodemon": "^1.10.2",
-    "open": "0.0.5",
-    "plist": "^2.0.1",
-    "pngjs": "^3.0.0",
-    "rimraf": "^2.5.2",
+    "nobin-debian-installer": "^0.0.9",
+    "plist": "^1.2.0",
     "run-series": "^1.1.4",
-    "spectron": "^3.3.0",
-    "standard": "*",
-    "tape": "^4.6.0",
-    "walk-sync": "^0.3.1"
-  },
-  "engines": {
-    "node": ">=4.0.0"
+    "standard": "^6.0.5"
   },
   "homepage": "https://webtorrent.io",
   "keywords": [
     "desktop",
     "electron",
     "electron-app",
-    "hybrid webtorrent client",
-    "mad science",
-    "torrent",
-    "torrent client",
     "webtorrent"
   ],
   "license": "MIT",
   "main": "index.js",
   "optionalDependencies": {
-    "appdmg": "^0.4.3"
+    "appdmg": "^0.3.6"
   },
   "productName": "WebTorrent",
   "repository": {
@@ -99,16 +71,14 @@
     "url": "git://github.com/feross/webtorrent-desktop.git"
   },
   "scripts": {
-    "build": "babel --quiet src --out-dir build",
     "clean": "node ./bin/clean.js",
-    "open-config": "node ./bin/open-config.js",
     "package": "node ./bin/package.js",
-    "prepublish": "npm run build",
-    "start": "npm run build && electron .",
-    "integration-test": "npm run build && node ./test",
-    "test": "standard && depcheck --ignores=babel-cli,nodemon,gh-release --ignore-dirs=build,dist && node ./bin/extra-lint.js",
-    "gh-release": "gh-release",
-    "update-authors": "./bin/update-authors.sh",
-    "watch": "nodemon --exec \"npm run start\" --ext js,pug,css"
+    "start": "electron .",
+    "test": "standard",
+    "update-authors": "./bin/update-authors.sh"
+  },
+  "cmake-js": {
+    "runtime": "electron",
+    "runtimeVersion": "0.37.5"
   }
 }

renderer/about.html

@@ -29,11 +29,7 @@
   <body>
     <img src="../static/WebTorrent.png">
     <h1>WebTorrent</h1>
-    <p>
-      Version <script>document.write(require('../package.json').version)</script>
-      (<script>document.write(require('webtorrent/package.json').version)</script>)
-      (<script>document.write(process.arch === 'x64' ? '64-bit' : '32-bit')</script>)
-    </p>
+    <p>Version <script>document.write(require('../package.json').version)</script></p>
     <p><script>document.write(require('../config').APP_COPYRIGHT)</script></p>
   </body>
 </html>

renderer/index.css

@@ -19,24 +19,13 @@ body {
   overflow: hidden;
 }
 
-.app {
-  color: #FAFAFA; /* grey50 */
+body {
+  color: #FFF;
   font-family: BlinkMacSystemFont, 'Helvetica Neue', Helvetica, sans-serif;
   font-size: 14px;
   line-height: 1.5em;
 }
 
-.app.is-win32 {
-  font-family: 'Segoe UI', sans-serif;
-}
-
-#body {
-  width: 100%;
-  height: 100%;
-  margin: 0;
-  padding: 0;
-}
-
 table {
   table-layout: fixed;
 }
@@ -61,26 +50,23 @@ table {
 }
 
 @keyframes fadein {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+  from { opacity: 0; }
+  to   { opacity: 1; }
 }
 
+
 .app {
   -webkit-user-select: none;
   -webkit-app-region: drag;
   height: 100%;
   display: flex;
   flex-flow: column;
-  background: rgb(30, 30, 30);
-  animation: fadein 0.5s;
+  animation: fadein 0.3s;
+  background: rgb(40, 40, 40);
 }
 
 .app:not(.is-focused) {
-  background: rgb(40, 40, 40);
+  background: rgb(50, 50, 50);
 }
 
 /*
@@ -91,7 +77,9 @@ table {
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: url('MaterialIcons-Regular.woff2') format('woff2');
+  src: local('Material Icons'),
+       local('MaterialIcons-Regular'),
+       url(../static/MaterialIcons-Regular.woff2) format('woff2');
 }
 
 .icon {
@@ -106,20 +94,11 @@ table {
   word-wrap: normal;
   white-space: nowrap;
   direction: ltr;
-  opacity: 0.85;
 
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
 }
 
-.icon.disabled {
-  opacity: 0.3;
-}
-
-.icon:not(.disabled):hover {
-  opacity: 1;
-}
-
 /*
  * UTILITY CLASSES
  */
@@ -130,23 +109,47 @@ table {
   white-space: nowrap;
 }
 
-.float-left {
-  float: left;
+.disabled {
+  opacity: 0.3;
 }
 
 .float-right {
   float: right;
 }
 
+.expand-collapse {
+  cursor: pointer;
+}
+
+.expand-collapse.expanded::before {
+  content: '▲'
+}
+
+.expand-collapse.collapsed::before {
+  content: '▼'
+}
+
+.expand-collapse::before {
+  margin-right: 5px;
+}
+
+.expand-collapse.collapsed {
+  display: block;
+}
+
+.collapsed {
+  display: none;
+}
+
 /*
  * HEADER
  */
 
 .header {
   background: rgb(40, 40, 40);
-  border-bottom: 1px solid rgb(30, 30, 30);
-  height: 38px; /* vertically center OS menu buttons (OS X) */
-  padding-top: 7px;
+  border-bottom: 1px solid rgb(20, 20, 20);
+  height: 37px; /* vertically center OS menu buttons (OS X) */
+  padding-top: 6px;
   overflow: hidden;
   flex: 0 1 auto;
   opacity: 1;
@@ -165,13 +168,7 @@ table {
 }
 
 .app.view-player .header {
-  background: rgba(40, 40, 40, 0.8);
-  border-bottom: none;
-}
-
-.app.view-player.is-win32 .header,
-.app.view-player.is-linux .header {
-  background: none;
+  opacity: 0.8;
 }
 
 .app.hide-video-controls.view-player .header {
@@ -179,8 +176,12 @@ table {
   cursor: none;
 }
 
+.app.hide-header .header {
+  display: none;
+}
+
 .header .title {
-  opacity: 0.7;
+  opacity: 0.6;
   position: absolute;
   margin-top: 1px;
   padding: 0 150px 0 150px;
@@ -191,22 +192,35 @@ table {
 
 .header .nav {
   font-weight: bold;
+  margin-right: 9px;
 }
 
 .header .nav.left {
-  margin-left: 10px;
-}
-
-.header .nav.right {
-  margin-right: 10px;
+  float: left;
 }
 
 .app.is-darwin:not(.is-fullscreen) .header .nav.left {
   margin-left: 78px;
 }
 
-.header .back,
-.header .forward {
+.header .nav.right {
+  float: right;
+}
+
+.header .nav * {
+  opacity: 0.6;
+}
+
+.header .nav .disabled {
+  opacity: 0.1;
+}
+
+.header .nav *:not(.disabled):hover {
+  opacity: 1;
+}
+
+.header .nav .back,
+.header .nav .forward {
   font-size: 30px;
   margin-top: -3px;
 }
@@ -221,7 +235,7 @@ table {
   overflow-x: hidden;
   overflow-y: overlay;
   flex: 1 1 auto;
-  margin-top: 38px;
+  margin-top: 37px;
 }
 
 .app.view-player .content {
@@ -249,7 +263,7 @@ table {
 
 .modal .modal-content {
   position: fixed;
-  top: 38px;
+  top: 45px;
   left: 0;
   right: 0;
   margin: 0 auto;
@@ -262,40 +276,67 @@ table {
 }
 
 .modal label {
+  font-size: 16px;
   font-weight: bold;
 }
 
-.create-torrent {
+.open-torrent-address-modal input {
+  width: 100%;
+}
+
+.create-torrent-page {
   padding: 10px 25px;
   overflow: hidden;
 }
 
-.create-torrent .torrent-attribute {
+.create-torrent-page .torrent-attribute {
   white-space: nowrap;
-  margin: 8px 0;
 }
 
-.create-torrent .torrent-attribute>* {
+.create-torrent-page .torrent-attribute>* {
   display: inline-block;
 }
 
-.create-torrent .torrent-attribute label {
-  width: 100px;
+.create-torrent-page .torrent-attribute label {
+  width: 60px;
+  margin-right: 10px;
   vertical-align: top;
 }
 
-.create-torrent .torrent-attribute>div {
-  width: calc(100% - 100px);
+.create-torrent-page .torrent-attribute>div {
+  width: calc(100% - 90px);
 }
 
-.create-torrent .torrent-attribute div {
+.create-torrent-page .torrent-attribute div {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
+.create-torrent-page .torrent-attribute textarea {
+  width: calc(100% - 80px);
+  height: 80px;
+  color: #eee;
+  background-color: transparent;
+  line-height: 1.5;
+  font-size: 14px;
+  font-family: inherit;
+  border-radius: 2px;
+  padding: 4px 6px;
+}
+
+.create-torrent-page textarea.torrent-trackers {
+  height: 200px;
+}
+
+.create-torrent-page input.torrent-is-private {
+  width: initial;
+  margin: 0;
+}
+
 /*
  * BUTTONS
+ * See https://www.google.com/design/spec/components/buttons.html
  */
 
 a,
@@ -318,13 +359,63 @@ i:not(.disabled):hover { /* Show they're clickable without pointer: cursor */
   text-align: center;
 }
 
+button { /* Rectangular text buttons */
+  background: transparent;
+  margin-left: 10px;
+  padding: 0;
+  border: none;
+  border-radius: 3px;
+  font-size: 14px;
+  font-weight: bold;
+  cursor: pointer;
+  color: #aaa;
+  outline: none;
+}
+
+button.button-flat {
+  color: #222;
+  padding: 7px 18px;
+}
+
+button.button-flat.light {
+  color: #eee;
+}
+
+button.button-flat:hover,
+button.button-flat:focus { /* Material design: focused */
+  background-color: rgba(153, 153, 153, 0.2);
+}
+
+button.button-flat:active { /* Material design: pressed */
+  background-color: rgba(153, 153, 153, 0.4);
+}
+
+button.button-raised {
+  background-color: #2196f3;
+  color: #eee;
+  padding: 7px 18px;
+}
+
+button.button-raised:hover,
+button.button-raised:focus {
+  background-color: #38a0f5;
+}
+
+button.button-raised:active {
+  background-color: #51abf6;
+}
+
 /*
- * INPUTS
+ * OTHER FORM ELEMENT DEFAULTS
  */
-input,
-textarea,
-.control {
-  font-size: 14px !important;
+
+input {
+  background: transparent;
+  width: 300px;
+  padding: 6px;
+  border: 1px solid #bbb;
+  border-radius: 3px;
+  outline: none;
 }
 
 /*
@@ -338,23 +429,27 @@ textarea,
   background-position: center;
   transition: -webkit-filter 0.1s ease-out;
   position: relative;
-  animation: fadein 0.5s;
+  animation: fadein .4s;
 }
 
 .torrent,
 .torrent-placeholder {
-  height: 100px;
+  height: 120px;
 }
 
 .torrent:not(:last-child) {
   border-bottom: 1px solid rgb(20, 20, 20);
 }
 
+.torrent:hover {
+  -webkit-filter: brightness(1.1);
+}
+
 .torrent .metadata {
   position: absolute;
-  top: 25px;
-  left: 15px;
-  right: 15px;
+  top: 20px;
+  left: 20px;
+  right: 20px;
   width: calc(100% - 40px);
   text-shadow: rgba(0, 0, 0, 0.5) 0 0 4px;
 }
@@ -364,15 +459,12 @@ textarea,
 }
 
 .torrent .metadata span:not(:last-child)::after {
-  content: ' • ';
-  opacity: 0.7;
-  padding-left: 4px;
-  padding-right: 4px;
+  content: ' — ';
 }
 
 .torrent .buttons {
   position: absolute;
-  top: 29px;
+  top: 25px;
   right: 10px;
   align-items: center;
   display: none;
@@ -396,7 +488,21 @@ textarea,
 }
 
 .torrent .buttons .download.downloading {
-  color: #44dd44;
+  animation-name: greenpulse;
+  animation-duration: 0.8s;
+  animation-direction: alternate;
+  animation-iteration-count: infinite;
+}
+
+@keyframes greenpulse {
+  0% {
+    color: #ffffff;
+    padding-top: 4px;
+  }
+  100% {
+    color: #44dd44;
+    padding-top: 6px;
+  }
 }
 
 .torrent .buttons .download.seeding {
@@ -432,11 +538,6 @@ textarea,
   }
 }
 
-.torrent .buttons .play.resume-position {
-  position: relative;
-  -webkit-clip-path: circle(18px at center);
-}
-
 .torrent .buttons .delete {
   opacity: 0.5;
 }
@@ -445,41 +546,16 @@ textarea,
   opacity: 0.7;
 }
 
-.torrent .buttons .radial-progress {
-  position: absolute;
-}
-
 .torrent .name {
-  font-size: 18px;
+  font-size: 1.5em;
   font-weight: bold;
   line-height: 1.5em;
 }
 
-progress {
-  width: 60px;
-  margin-right: 8px;
-  -webkit-appearance: none;
-}
-
-progress::-webkit-progress-bar {
-  background-color: #888;
-}
-
-progress::-webkit-progress-value {
-  background-color: #eee;
-}
-
-/*
- * TORRENT LIST: ERRORS
- */
-
-.torrent-list p {
-  margin: 10px 20px;
-}
-
-.torrent-list a {
-  color: #99f;
-  text-decoration: none;
+.torrent .status,
+.torrent .status2 {
+  font-size: 1em;
+  line-height: 1.5em;
 }
 
 /*
@@ -520,17 +596,16 @@ body.drag .app::after {
 /*
  * TORRENT LIST: EXPANDED TORRENT DETAILS
  */
-
 .torrent.selected {
   height: auto;
 }
 
 .torrent-details {
-  padding: 8em 0 20px 0;
+  padding: 8em 20px 20px 20px;
 }
 
-.torrent-details .warning {
-  padding-left: 15px;
+.torrent-details .open-folder {
+  float: right;
 }
 
 .torrent-details table {
@@ -544,27 +619,25 @@ body.drag .app::after {
   height: 28px;
 }
 
+.torrent-details tr:hover,
+.torrent-details .open-folder:hover {
+  background-color: rgba(200, 200, 200, 0.3);
+}
+
 .torrent-details td {
   overflow: hidden;
   padding: 0;
-  vertical-align: middle;
-}
-
-.torrent-details td .icon {
-  font-size: 18px;
-  position: relative;
-  top: 3px;
+  vertical-align: bottom;
 }
 
 .torrent-details td.col-icon {
-  width: 45px;
-  padding-left: 16px;
+  width: 2em;
 }
 
-.torrent-details td.col-icon .radial-progress {
-  position: absolute;
-  margin-top: 4px;
-  margin-left: 0.5px;
+.torrent-details td.col-icon .icon {
+  font-size: 18px;
+  position: relative;
+  top: 3px;
 }
 
 .torrent-details td.col-name {
@@ -573,18 +646,12 @@ body.drag .app::after {
 }
 
 .torrent-details td.col-progress {
-  width: 60px;
+  width: 4em;
   text-align: right;
 }
 
 .torrent-details td.col-size {
-  width: 60px;
-  text-align: right;
-}
-
-.torrent-details td.col-select {
-  width: 45px;
-  padding-right: 13px;
+  width: 4em;
   text-align: right;
 }
 
@@ -607,16 +674,18 @@ body.drag .app::after {
   background-position: center;
 }
 
-.player video {
+.player .video-player {
   display: block;
   width: 100%;
+  height: 100%;
+  position: relative;
 }
 
 /*
  * PLAYER CONTROLS
  */
 
-.player .controls {
+.player-controls {
   position: fixed;
   background: rgba(40, 40, 40, 0.8);
   width: 100%;
@@ -625,64 +694,7 @@ body.drag .app::after {
   transition: opacity 0.15s ease-out;
 }
 
-.player .controls .icon {
-  display: block;
-  margin: 8px;
-  font-size: 22px;
-  opacity: 0.85;
-
-  /* Make all icons have uniform spacing */
-  max-width: 23px;
-  overflow: hidden;
-}
-
-.player .controls .icon:hover {
-  opacity: 1;
-}
-
-.player .controls .icon.disabled {
-  opacity: 0.3;
-}
-
-.player .controls .icon.skip-previous,
-.player .controls .icon.play-pause,
-.player .controls .icon.skip-next {
-  font-size: 28px;
-  margin: 5px;
-}
-
-.player .controls .volume-slider {
-  -webkit-appearance: none;
-  -webkit-app-region: no-drag;
-  width: 60px;
-  height: 3px;
-  margin: 18px 8px 8px 0;
-  border: none;
-  padding: 0;
-  opacity: 0.85;
-  vertical-align: sub;
-}
-
-.player .controls .time,
-.player .controls .rate {
-  font-weight: 100;
-  font-size: 13px;
-  margin: 9px 8px 8px 8px;
-  opacity: 0.8;
-}
-
-.player .controls .icon.closed-caption {
-  font-size: 26px;
-  margin-top: 6px;
-}
-
-.player .controls .icon.fullscreen {
-  font-size: 26px;
-  margin-right: 15px;
-  margin-top: 6px;
-}
-
-.app.hide-video-controls .player .controls {
+.app.hide-video-controls .player-controls {
   opacity: 0;
 }
 
@@ -690,16 +702,13 @@ body.drag .app::after {
   cursor: none;
 }
 
-/* TODO: find better way to handle this (that also
- * keeps the header visible too).
- */
-.app.hide-video-controls .player .controls:hover {
+.app.hide-video-controls .player .player-controls:hover {
   opacity: 1;
   cursor: default;
 }
 
 /* invisible click target for scrubbing */
-.player .controls .scrub-bar {
+.player-controls .scrub-bar {
   position: absolute;
   width: 100%;
   height: 23px; /* 3px .loading-bar plus 10px above and below */
@@ -708,7 +717,7 @@ body.drag .app::after {
   -webkit-app-region: no-drag;
 }
 
-.player .controls .loading-bar {
+.player-controls .loading-bar {
   position: relative;
   width: 100%;
   top: -3px;
@@ -718,14 +727,14 @@ body.drag .app::after {
   position: absolute;
 }
 
-.player .controls .loading-bar-part {
+.player-controls .loading-bar-part {
   position: absolute;
   background-color: #dd0000;
   top: 0;
   height: 100%;
 }
 
-.player .controls .playback-cursor {
+.player-controls .playback-cursor {
   position: absolute;
   top: -3px;
   background-color: #FFF;
@@ -734,26 +743,86 @@ body.drag .app::after {
   border-radius: 50%;
   margin-top: 0;
   margin-left: 0;
-  transition-property: width, height, top, margin-left;
+  transition-property: width, height, border-radius, margin-top, margin-left;
   transition-duration: 0.1s;
   transition-timing-function: ease-out;
 }
 
-.player .controls .closed-caption.active,
-.player .controls .device.active {
+.player-controls .play-pause {
+  display: block;
+  width: 30px;
+  height: 30px;
+  padding: 5px;
+  margin: 0 auto;
+}
+
+.player-controls .device,
+.player-controls .fullscreen,
+.player-controls .closed-captions,
+.player-controls .volume-icon,
+.player-controls .back {
+  display: block;
+  width: 20px;
+  height: 20px;
+  margin: 5px;
+}
+
+.player-controls .volume,
+.player-controls .back {
+  float: left;
+}
+
+.player-controls .device,
+.player-controls .closed-captions,
+.player-controls .fullscreen {
+  float: right;
+}
+
+.player-controls .fullscreen {
+  margin-right: 15px;
+}
+
+.player-controls .volume-icon,
+.player-controls .device {
+  font-size: 18px; /* make the cast icons less huge */
+  margin-top: 8px !important;
+}
+
+.player-controls .closed-captions.active,
+.player-controls .device.active {
   color: #9af;
 }
 
-.player .controls .volume-slider::-webkit-slider-thumb {
+.player-controls .volume {
+  display: block;
+  width: 90px;
+}
+
+.player-controls .volume-icon {
+  float: left;
+  margin-right: 0px;
+}
+
+.player-controls .volume-slider {
+  -webkit-appearance: none;
+  width: 50px;
+  height: 3px;
+  border: none;
+  padding: 0;
+  vertical-align: sub;
+}
+
+.player-controls .volume-slider::-webkit-slider-thumb {
   -webkit-appearance: none;
-  -webkit-app-region: no-drag;
   background-color: #fff;
-  width: 13px;
-  height: 13px;
+  opacity: 1.0;
+  width: 10px;
+  height: 10px;
+  border: 1px solid #303233;
   border-radius: 50%;
 }
 
-.player .controls .volume-slider:focus {
+.player-controls .volume-slider:focus {
   outline: none;
 }
 
@@ -763,49 +832,19 @@ body.drag .app::after {
 
 .player .playback-bar:hover .playback-cursor {
   top: -8px;
-  margin-left: -5px;
   width: 14px;
   height: 14px;
 }
 
-.player .controls .options-list {
-  position: fixed;
-  background: rgba(40, 40, 40, 0.8);
-  min-width: 100px;
-  bottom: 45px;
-  right: 3px;
-  transition: opacity 0.15s ease-out;
-  padding: 5px 10px;
-  border-radius: 3px;
-  margin: 0;
-  list-style-type: none;
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.player .controls .options-list .icon {
-  display: inline;
-  font-size: 17px;
-  vertical-align: bottom;
-  line-height: 21px;
-  margin: 4px;
-}
-
-/**
- * Set the cue text position so it appears above the player controls.
- */
-video::-webkit-media-text-track-container {
-  bottom: 60px;
-  transition: bottom 0.1s ease-out;
-}
-.app.hide-video-controls video::-webkit-media-text-track-container {
-  bottom: 30px;
-}
 ::cue {
   background: none;
   color: #FFF;
+  font: 24px;
+  line-height: 1.3em;
   text-shadow: #000 -1px 0 1px, #000 1px 0 1px, #000 0 -1px 1px, #000 0 1px 1px, rgba(50, 50, 50, 0.5) 2px 2px 0;
 }
 
+
 /*
  * CHROMECAST / AIRPLAY CONTROLS
  */
@@ -832,6 +871,29 @@ video::-webkit-media-text-track-container {
   font-weight: bold;
 }
 
+/*
+ * Subtitles list
+ */
+
+.subtitles-list {
+  position: fixed;
+  background: rgba(40, 40, 40, 0.8);
+  min-width: 100px;
+  bottom: 45px;
+  right: 3px;
+  transition: opacity 0.15s ease-out;
+  padding: 5px 10px;
+  border-radius: 3px;
+  margin: 0;
+  list-style-type: none;
+  color: rgba(255, 255, 255, 0.8);
+}
+
+.subtitles-list i {
+  font-size: 11px; /* make the cast icons less huge */
+  margin-right: 4px !important;
+}
+
 /*
  * MEDIA OVERLAY / AUDIO DETAILS
  */
@@ -900,6 +962,10 @@ video::-webkit-media-text-track-container {
   z-index: 1;
 }
 
+.app.hide-header .error-popover {
+  top: 0px;
+}
+
 .error-popover.hidden {
   display: none;
 }
@@ -923,86 +989,3 @@ video::-webkit-media-text-track-container {
 .error-popover .error:last-child {
   border-bottom: none;
 }
-
-.error-text {
-  color: #c44;
-}
-
-/*
- * RADIAL PROGRESS BAR
- */
-
-.radial-progress {
-  width:  16px;
-  height: 16px;
-  border-radius: 50%;
-  background-color: #888;
-}
-
-.radial-progress .circle .mask,
-.radial-progress .circle .fill {
-  width:    16px;
-  height:   16px;
-  position: absolute;
-  border-radius: 50%;
-  -webkit-backface-visibility: hidden;
-}
-
-.radial-progress .circle .mask {
-  clip: rect(0px, 16px, 16px, 8px);
-}
-
-.radial-progress .circle .fill {
-  clip: rect(0px, 8px, 16px, 0px);
-  background-color: white;
-}
-
-.radial-progress .inset {
-  position: absolute;
-  width: 12px;
-  height: 12px;
-  margin: 2px 0 0 2px;
-  border-radius: 50%;
-  background-color: black;
-}
-
-.radial-progress-large {
-  width:  40px;
-  height: 40px;
-}
-
-.radial-progress-large .circle .mask,
-.radial-progress-large .circle .fill {
-  width:  40px;
-  height: 40px;
-}
-.radial-progress-large .circle .mask {
-  clip: rect(0px, 40px, 40px, 20px);
-}
-
-.radial-progress-large .circle .fill {
-  clip: rect(0px, 20px, 40px, 0px);
-  background-color: white;
-}
-
-.radial-progress-large .inset {
-  width: 32px;
-  height: 32px;
-  margin: 4px 0 0 4px;
-}
-
-/**
- * Use this class on Material UI components to get correct native app behavior:
- *
- * - Dragging the button should NOT drag the entire app window
- * - The cursor should be default, not a pointer (hand) like on the web
- */
-
-.control {
-  -webkit-app-region: no-drag;
-  cursor: default !important;
-}
-
-.control * {
-  cursor: default !important;
-}

renderer/lib/capture-video-frame.js

@@ -0,0 +1,30 @@
+module.exports = captureVideoFrame
+
+function captureVideoFrame (video, format) {
+  if (typeof video === 'string') {
+    video = document.querySelector(video)
+  }
+
+  if (video == null || video.nodeName !== 'VIDEO') {
+    throw new Error('First argument must be a <video> element or selector')
+  }
+
+  if (format == null) {
+    format = 'png'
+  }
+
+  if (format !== 'png' && format !== 'jpg' && format !== 'webp') {
+    throw new Error('Second argument must be one of "png", "jpg", or "webp"')
+  }
+
+  var canvas = document.createElement('canvas')
+  canvas.width = video.videoWidth
+  canvas.height = video.videoHeight
+
+  canvas.getContext('2d').drawImage(video, 0, 0)
+
+  var dataUri = canvas.toDataURL('image/' + format)
+  var data = dataUri.split(',')[1]
+
+  return new Buffer(data, 'base64')
+}

renderer/lib/cast.js

@@ -0,0 +1,363 @@
+// The Cast module talks to Airplay and Chromecast
+// * Modifies state when things change
+// * Starts and stops casting, provides remote video controls
+module.exports = {
+  init,
+  open,
+  close,
+  play,
+  pause,
+  seek,
+  setVolume
+}
+
+var airplay = require('airplay-js')
+var chromecasts = require('chromecasts')()
+var dlnacasts = require('dlnacasts')()
+
+var config = require('../../config')
+
+// App state. Cast modifies state.playing and state.errors in response to events
+var state
+
+// Callback to notify module users when state has changed
+var update
+
+// setInterval() for updating cast status
+var statusInterval = null
+
+// Start looking for cast devices on the local network
+function init (appState, callback) {
+  state = appState
+  update = callback
+
+  // Listen for devices: Chromecast, DLNA and Airplay
+  chromecasts.on('update', function (player) {
+    state.devices.chromecast = chromecastPlayer(player)
+  })
+
+  dlnacasts.on('update', function (player) {
+    state.devices.dlna = dlnaPlayer(player)
+  })
+
+  var browser = airplay.createBrowser()
+  browser.on('deviceOn', function (player) {
+    state.devices.airplay = airplayPlayer(player)
+  }).start()
+}
+
+// chromecast player implementation
+function chromecastPlayer (player) {
+  function addEvents () {
+    player.on('error', function (err) {
+      state.playing.location = 'local'
+      state.errors.push({
+        time: new Date().getTime(),
+        message: 'Could not connect to Chromecast. ' + err.message
+      })
+      update()
+    })
+    player.on('disconnect', function () {
+      state.playing.location = 'local'
+      update()
+    })
+  }
+
+  function open () {
+    var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
+    player.play(state.server.networkURL, {
+      type: 'video/mp4',
+      title: config.APP_NAME + ' - ' + torrentSummary.name
+    }, function (err) {
+      if (err) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to Chromecast. ' + err.message
+        })
+      } else {
+        state.playing.location = 'chromecast'
+      }
+      update()
+    })
+  }
+
+  function play (callback) {
+    player.play(null, null, callback)
+  }
+
+  function pause (callback) {
+    player.pause(callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (err, status) {
+      if (err) return console.log('error getting %s status: %o', state.playing.location, err)
+      state.playing.isPaused = status.playerState === 'PAUSED'
+      state.playing.currentTime = status.currentTime
+      state.playing.volume = status.volume.muted ? 0 : status.volume.level
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.seek(time, callback)
+  }
+
+  function volume (volume, callback) {
+    player.volume(volume, callback)
+  }
+
+  addEvents()
+
+  return {
+    player: player,
+    open: open,
+    play: play,
+    pause: pause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// airplay player implementation
+function airplayPlayer (player) {
+  function open () {
+    player.play(state.server.networkURL, 0, function (res) {
+      if (res.statusCode !== 200) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to AirPlay.'
+        })
+      } else {
+        state.playing.location = 'airplay'
+      }
+      update()
+    })
+  }
+
+  function play (callback) {
+    player.rate(1, callback)
+  }
+
+  function pause (callback) {
+    player.rate(0, callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (status) {
+      state.playing.isPaused = status.rate === 0
+      state.playing.currentTime = status.position
+      // TODO: get airplay volume, implementation needed. meanwhile set value in setVolume
+      // According to docs is in [-30 - 0] (db) range
+      // should be converted to [0 - 1] using (val / 30 + 1)
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.scrub(time, callback)
+  }
+
+  function volume (volume, callback) {
+    // TODO remove line below once we can fetch the information in status update
+    state.playing.volume = volume
+    volume = (volume - 1) * 30
+    player.volume(volume, callback)
+  }
+
+  return {
+    player: player,
+    open: open,
+    play: play,
+    pause: pause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// DLNA player implementation
+function dlnaPlayer (player) {
+  function addEvents () {
+    player.on('error', function (err) {
+      state.playing.location = 'local'
+      state.errors.push({
+        time: new Date().getTime(),
+        message: 'Could not connect to DLNA. ' + err.message
+      })
+      update()
+    })
+    player.on('disconnect', function () {
+      state.playing.location = 'local'
+      update()
+    })
+  }
+
+  function open () {
+    var torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
+    player.play(state.server.networkURL, {
+      type: 'video/mp4',
+      title: config.APP_NAME + ' - ' + torrentSummary.name,
+      seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
+    }, function (err) {
+      if (err) {
+        state.playing.location = 'local'
+        state.errors.push({
+          time: new Date().getTime(),
+          message: 'Could not connect to DLNA. ' + err.message
+        })
+      } else {
+        state.playing.location = 'dlna'
+      }
+      update()
+    })
+  }
+
+  function play (callback) {
+    player.play(null, null, callback)
+  }
+
+  function pause (callback) {
+    player.pause(callback)
+  }
+
+  function stop (callback) {
+    player.stop(callback)
+  }
+
+  function status () {
+    player.status(function (err, status) {
+      if (err) return console.log('error getting %s status: %o', state.playing.location, err)
+      state.playing.isPaused = status.playerState === 'PAUSED'
+      state.playing.currentTime = status.currentTime
+      state.playing.volume = status.volume.level
+      update()
+    })
+  }
+
+  function seek (time, callback) {
+    player.seek(time, callback)
+  }
+
+  function volume (volume, callback) {
+    player.volume(volume, function (err) {
+      // quick volume update
+      state.playing.volume = volume
+      callback(err)
+    })
+  }
+
+  addEvents()
+
+  return {
+    player: player,
+    open: open,
+    play: play,
+    pause: pause,
+    stop: stop,
+    status: status,
+    seek: seek,
+    volume: volume
+  }
+}
+
+// Start polling cast device state, whenever we're connected
+function startStatusInterval () {
+  statusInterval = setInterval(function () {
+    var device = getDevice()
+    if (device) {
+      device.status()
+    }
+  }, 1000)
+}
+
+function open (location) {
+  if (state.playing.location !== 'local') {
+    throw new Error('You can\'t connect to ' + location + ' when already connected to another device')
+  }
+
+  state.playing.location = location + '-pending'
+  var device = getDevice(location)
+  if (device) {
+    getDevice(location).open()
+    startStatusInterval()
+  }
+
+  update()
+}
+
+// Stops casting, move video back to local screen
+function close () {
+  var device = getDevice()
+  if (device) {
+    device.stop(stoppedCasting)
+    clearInterval(statusInterval)
+  } else {
+    stoppedCasting()
+  }
+}
+
+function stoppedCasting () {
+  state.playing.location = 'local'
+  state.playing.jumpToTime = state.playing.currentTime
+  update()
+}
+
+function getDevice (location) {
+  if (location && state.devices[location]) {
+    return state.devices[location]
+  } else if (state.playing.location === 'chromecast') {
+    return state.devices.chromecast
+  } else if (state.playing.location === 'airplay') {
+    return state.devices.airplay
+  } else if (state.playing.location === 'dlna') {
+    return state.devices.dlna
+  } else {
+    return null
+  }
+}
+
+function play () {
+  var device = getDevice()
+  if (device) {
+    device.play(castCallback)
+  }
+}
+
+function pause () {
+  var device = getDevice()
+  if (device) {
+    device.pause(castCallback)
+  }
+}
+
+function seek (time) {
+  var device = getDevice()
+  if (device) {
+    device.seek(time, castCallback)
+  }
+}
+
+function setVolume (volume) {
+  var device = getDevice()
+  if (device) {
+    device.volume(volume, castCallback)
+  }
+}
+
+function castCallback () {
+  console.log('%s callback: %o', state.playing.location, arguments)
+}

renderer/lib/dispatcher.js

@@ -0,0 +1,38 @@
+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) {
+    handler = _dispatchers[json] = (e) => {
+      if (e && e.stopPropagation && e.currentTarget) {
+        // Don't click on whatever is below the button
+        e.stopPropagation()
+        // Don't register clicks on disabled buttons
+        if (e.currentTarget.classList.contains('disabled')) return
+      }
+      _dispatch.apply(null, args)
+    }
+  }
+  return handler
+}
+
+function dispatch (...args) {
+  _dispatch.apply(null, args)
+}

renderer/lib/errors.js

@@ -0,0 +1,8 @@
+module.exports = {
+  UnplayableError
+}
+
+function UnplayableError () {
+  this.message = 'Can\'t play any files in torrent'
+}
+UnplayableError.prototype = Error

renderer/lib/location-history.js

@@ -0,0 +1,84 @@
+module.exports = LocationHistory
+
+function LocationHistory () {
+  if (!new.target) return new LocationHistory()
+  this._history = []
+  this._forward = []
+  this._pending = null
+}
+
+LocationHistory.prototype.go = function (page, cb) {
+  console.log('go', page)
+  this.clearForward()
+  this._go(page, cb)
+}
+
+LocationHistory.prototype._go = function (page, cb) {
+  if (this._pending) return
+  if (page.onbeforeload) {
+    this._pending = page
+    page.onbeforeload((err) => {
+      if (this._pending !== page) return /* navigation was cancelled */
+      this._pending = null
+      if (err) {
+        if (cb) cb(err)
+        return
+      }
+      this._history.push(page)
+      if (cb) cb()
+    })
+  } else {
+    this._history.push(page)
+    if (cb) cb()
+  }
+}
+
+LocationHistory.prototype.back = function (cb) {
+  if (this._history.length <= 1) return
+
+  var page = this._history.pop()
+
+  if (page.onbeforeunload) {
+    // TODO: this is buggy. If the user clicks back twice, then those pages
+    // may end up in _forward in the wrong order depending on which onbeforeunload
+    // call finishes first.
+    page.onbeforeunload(() => {
+      this._forward.push(page)
+      if (cb) cb()
+    })
+  } else {
+    this._forward.push(page)
+    if (cb) cb()
+  }
+}
+
+LocationHistory.prototype.forward = function (cb) {
+  if (this._forward.length === 0) return
+
+  var page = this._forward.pop()
+  this._go(page, cb)
+}
+
+LocationHistory.prototype.clearForward = function () {
+  this._forward = []
+}
+
+LocationHistory.prototype.current = function () {
+  return this._history[this._history.length - 1]
+}
+
+LocationHistory.prototype.hasBack = function () {
+  return this._history.length > 1
+}
+
+LocationHistory.prototype.hasForward = function () {
+  return this._forward.length > 0
+}
+
+LocationHistory.prototype.pending = function () {
+  return this._pending
+}
+
+LocationHistory.prototype.clearPending = function () {
+  this._pending = null
+}

renderer/lib/sound.js

@@ -3,55 +3,52 @@ module.exports = {
   play
 }
 
-const config = require('../../config')
-const {InvalidSoundNameError} = require('./errors')
-const path = require('path')
-
-const VOLUME = 0.15
+var config = require('../../config')
+var path = require('path')
 
 /* Cache of Audio elements, for instant playback */
-const cache = {}
+var cache = {}
 
-const sounds = {
+var sounds = {
   ADD: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'add.wav'),
-    volume: VOLUME
+    volume: 0.2
   },
   DELETE: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'delete.wav'),
-    volume: VOLUME
+    volume: 0.1
   },
   DISABLE: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'disable.wav'),
-    volume: VOLUME
+    volume: 0.2
   },
   DONE: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'done.wav'),
-    volume: VOLUME
+    volume: 0.2
   },
   ENABLE: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'enable.wav'),
-    volume: VOLUME
+    volume: 0.2
   },
   ERROR: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'error.wav'),
-    volume: VOLUME
+    volume: 0.2
   },
   PLAY: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'play.wav'),
-    volume: VOLUME
+    volume: 0.2
   },
   STARTUP: {
     url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'startup.wav'),
-    volume: VOLUME * 2
+    volume: 0.4
   }
 }
 
 function preload () {
-  for (let name in sounds) {
+  for (var name in sounds) {
     if (!cache[name]) {
-      const sound = sounds[name]
-      const audio = cache[name] = new window.Audio()
+      var sound = sounds[name]
+      var audio = cache[name] = new window.Audio()
       audio.volume = sound.volume
       audio.src = sound.url
     }
@@ -59,11 +56,11 @@ function preload () {
 }
 
 function play (name) {
-  let audio = cache[name]
+  var audio = cache[name]
   if (!audio) {
-    const sound = sounds[name]
+    var sound = sounds[name]
     if (!sound) {
-      throw new InvalidSoundNameError(name)
+      throw new Error('Invalid sound name')
     }
     audio = cache[name] = new window.Audio()
     audio.volume = sound.volume

renderer/lib/torrent-player.js

@@ -0,0 +1,29 @@
+module.exports = {
+  isPlayable,
+  isVideo,
+  isAudio,
+  isPlayableTorrent
+}
+
+var path = require('path')
+
+/**
+ * Determines whether a file in a torrent is audio/video we can play
+ */
+function isPlayable (file) {
+  return isVideo(file) || isAudio(file)
+}
+
+function isVideo (file) {
+  var ext = path.extname(file.name).toLowerCase()
+  return ['.mp4', '.m4v', '.webm', '.mov', '.mkv'].indexOf(ext) !== -1
+}
+
+function isAudio (file) {
+  var ext = path.extname(file.name).toLowerCase()
+  return ['.mp3', '.aac', '.ogg', '.wav'].indexOf(ext) !== -1
+}
+
+function isPlayableTorrent (torrentSummary) {
+  return torrentSummary.files && torrentSummary.files.some(isPlayable)
+}

renderer/lib/torrent-poster.js

@@ -1,22 +1,16 @@
 module.exports = torrentPoster
 
-const captureFrame = require('capture-frame')
-const path = require('path')
+var captureVideoFrame = require('./capture-video-frame')
+var path = require('path')
 
 function torrentPoster (torrent, cb) {
-  // First, try to use a poster image if available
-  const posterFile = torrent.files.filter(function (file) {
-    return /^poster\.(jpg|png|gif)$/.test(file.name)
-  })[0]
-  if (posterFile) return torrentPosterFromImage(posterFile, torrent, cb)
-
-  // Second, try to use the largest video file
+  // First, try to use the largest video file
   // Filter out file formats that the <video> tag definitely can't play
-  const videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
+  var videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
   if (videoFile) return torrentPosterFromVideo(videoFile, torrent, cb)
 
-  // Third, try to use the largest image file
-  const imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.jpeg', '.png'])
+  // Second, try to use the largest image file
+  var imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.png'])
   if (imgFile) return torrentPosterFromImage(imgFile, torrent, cb)
 
   // TODO: generate a waveform from the largest sound file
@@ -25,8 +19,8 @@ function torrentPoster (torrent, cb) {
 }
 
 function getLargestFileByExtension (torrent, extensions) {
-  const files = torrent.files.filter(function (file) {
-    const extname = path.extname(file.name).toLowerCase()
+  var files = torrent.files.filter(function (file) {
+    var extname = path.extname(file.name).toLowerCase()
     return extensions.indexOf(extname) !== -1
   })
   if (files.length === 0) return undefined
@@ -36,15 +30,15 @@ function getLargestFileByExtension (torrent, extensions) {
 }
 
 function torrentPosterFromVideo (file, torrent, cb) {
-  const index = torrent.files.indexOf(file)
+  var index = torrent.files.indexOf(file)
 
-  const server = torrent.createServer(0)
+  var server = torrent.createServer(0)
   server.listen(0, onListening)
 
   function onListening () {
-    const port = server.address().port
-    const url = 'http://localhost:' + port + '/' + index
-    const video = document.createElement('video')
+    var port = server.address().port
+    var url = 'http://localhost:' + port + '/' + index
+    var video = document.createElement('video')
     video.addEventListener('canplay', onCanPlay)
 
     video.volume = 0
@@ -61,7 +55,7 @@ function torrentPosterFromVideo (file, torrent, cb) {
     function onSeeked () {
       video.removeEventListener('seeked', onSeeked)
 
-      const buf = captureFrame(video)
+      var buf = captureVideoFrame(video)
 
       // unload video element
       video.pause()
@@ -78,6 +72,6 @@ function torrentPosterFromVideo (file, torrent, cb) {
 }
 
 function torrentPosterFromImage (file, torrent, cb) {
-  const extname = path.extname(file.name)
+  var extname = path.extname(file.name)
   file.getBuffer((err, buf) => cb(err, buf, extname))
 }

renderer/lib/torrent-summary.js

@@ -0,0 +1,24 @@
+module.exports = {
+  getPosterPath,
+  getTorrentPath
+}
+
+var path = require('path')
+var config = require('../../config')
+
+// Expects a torrentSummary
+// Returns an absolute path to the torrent file, or null if unavailable
+function getTorrentPath (torrentSummary) {
+  if (!torrentSummary || !torrentSummary.torrentFileName) return null
+  return path.join(config.CONFIG_TORRENT_PATH, torrentSummary.torrentFileName)
+}
+
+// Expects a torrentSummary
+// Returns an absolute path to the poster image, or null if unavailable
+function getPosterPath (torrentSummary) {
+  if (!torrentSummary || !torrentSummary.posterFileName) return null
+  var posterPath = path.join(config.CONFIG_POSTER_PATH, torrentSummary.posterFileName)
+  // Work around a Chrome bug (reproduced in vanilla Chrome, not just Electron):
+  // Backslashes in URLS in CSS cause bizarre string encoding issues
+  return posterPath.replace(/\\/g, '/')
+}

renderer/main.html

@@ -3,11 +3,9 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Main Window</title>
-    <link rel="stylesheet" href="main.css">
+    <link rel="stylesheet" href="index.css" charset="utf-8">
   </head>
   <body>
-    <div id='body'></div>
-    <script>require('../build/renderer/main.js')</script>
+    <script async src="index.js"></script>
   </body>
 </html>

renderer/state.js

@@ -0,0 +1,264 @@
+var electron = require('electron')
+var path = require('path')
+
+var remote = electron.remote
+
+var config = require('../config')
+var LocationHistory = require('./lib/location-history')
+
+module.exports = {
+  getInitialState,
+  getDefaultPlayState,
+  getDefaultSavedState
+}
+
+function getInitialState () {
+  return {
+    /*
+     * Temporary state disappears once the program exits.
+     * It can contain complex objects like open connections, etc.
+     */
+    client: null, /* the WebTorrent client */
+    server: null, /* local WebTorrent-to-HTTP server */
+    prev: {}, /* used for state diffing in updateElectron() */
+    location: new LocationHistory(),
+    window: {
+      bounds: null, /* {x, y, width, height } */
+      isFocused: true,
+      isFullScreen: false,
+      title: config.APP_WINDOW_TITLE
+    },
+    selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
+    playing: getDefaultPlayState(), /* the media (audio or video) that we're currently playing */
+    devices: { /* playback devices like Chromecast and AppleTV */
+      airplay: null, /* airplay client. finds and manages AppleTVs */
+      chromecast: null /* chromecast client. finds and manages Chromecasts */
+    },
+    dock: {
+      badge: 0,
+      progress: 0
+    },
+    modal: null, /* modal popover */
+    errors: [], /* user-facing errors */
+    nextTorrentKey: 1, /* identify torrents for IPC between the main and webtorrent windows */
+
+    /*
+     * Saved state is read from and written to a file every time the app runs.
+     * It should be simple and minimal and must be JSON.
+     * It must never contain absolute paths since we have a portable app.
+     *
+     * Config path:
+     *
+     * OS X                 ~/Library/Application Support/WebTorrent/config.json
+     * Linux (XDG)          $XDG_CONFIG_HOME/WebTorrent/config.json
+     * Linux (Legacy)       ~/.config/WebTorrent/config.json
+     * Windows (> Vista)    %LOCALAPPDATA%/WebTorrent/config.json
+     * Windows (XP, 2000)   %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
+     *
+     * Also accessible via `require('application-config')('WebTorrent').filePath`
+     */
+    saved: {}
+  }
+}
+
+/* Whenever we stop playing video or audio, here's what we reset state.playing to */
+function getDefaultPlayState () {
+  return {
+    infoHash: null, /* the info hash of the torrent we're playing */
+    fileIndex: null, /* the zero-based index within the torrent */
+    location: 'local', /* 'local', 'chromecast', 'airplay' */
+    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
+    currentTime: 0, /* seconds */
+    duration: 1, /* seconds */
+    isPaused: true,
+    isStalled: false,
+    lastTimeUpdate: 0, /* Unix time in ms */
+    mouseStationarySince: 0, /* Unix time in ms */
+    subtitles: {
+      tracks: [], /* subtitles file (Buffer) */
+      enabled: false
+    }
+  }
+}
+
+/* If the saved state file doesn't exist yet, here's what we use instead */
+function getDefaultSavedState () {
+  return {
+    version: 1, /* make sure we can upgrade gracefully later */
+    torrents: [
+      {
+        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: 'bigBuckBunny.jpg',
+        torrentPath: 'bigBuckBunny.torrent',
+        files: [
+          {
+            length: 276134947,
+            name: 'bbb_sunflower_1080p_30fps_normal.mp4'
+          }
+        ]
+      },
+      {
+        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: 'sintel.jpg',
+        torrentPath: 'sintel.torrent',
+        files: [
+          {
+            length: 129241752,
+            name: 'sintel.mp4'
+          }
+        ]
+      },
+      {
+        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: 'tearsOfSteel.jpg',
+        torrentPath: 'tearsOfSteel.torrent',
+        files: [
+          {
+            length: 571346576,
+            name: 'tears_of_steel_1080p.webm'
+          }
+        ]
+      },
+      {
+        status: 'paused',
+        infoHash: '6a02592d2bbc069628cd5ed8a54f88ee06ac0ba5',
+        magnetURI: 'magnet:?xt=urn:btih:6a02592d2bbc069628cd5ed8a54f88ee06ac0ba5&dn=CosmosLaundromatFirstCycle&tr=http%3A%2F%2Fbt1.archive.org%3A6969%2Fannounce&tr=http%3A%2F%2Fbt2.archive.org%3A6969%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%2Fia601508.us.archive.org%2F14%2Fitems%2F&ws=http%3A%2F%2Fia801508.us.archive.org%2F14%2Fitems%2F&ws=https%3A%2F%2Farchive.org%2Fdownload%2F',
+        displayName: 'Cosmos Laundromat (Preview)',
+        posterURL: 'cosmosLaundromat.jpg',
+        torrentPath: 'cosmosLaundromat.torrent',
+        files: [
+          {
+            length: 223580,
+            name: 'Cosmos Laundromat - First Cycle (1080p).gif'
+          },
+          {
+            length: 220087570,
+            name: 'Cosmos Laundromat - First Cycle (1080p).mp4'
+          },
+          {
+            length: 56832560,
+            name: 'Cosmos Laundromat - First Cycle (1080p).ogv'
+          },
+          {
+            length: 3949,
+            name: 'CosmosLaundromat-FirstCycle1080p.en.srt'
+          },
+          {
+            length: 3907,
+            name: 'CosmosLaundromat-FirstCycle1080p.es.srt'
+          },
+          {
+            length: 4119,
+            name: 'CosmosLaundromat-FirstCycle1080p.fr.srt'
+          },
+          {
+            length: 3941,
+            name: 'CosmosLaundromat-FirstCycle1080p.it.srt'
+          },
+          {
+            length: 11264,
+            name: 'CosmosLaundromatFirstCycle_meta.sqlite'
+          },
+          {
+            length: 1204,
+            name: 'CosmosLaundromatFirstCycle_meta.xml'
+          }
+        ]
+      },
+      {
+        status: 'paused',
+        infoHash: '3ba219a8634bf7bae3d848192b2da75ae995589d',
+        magnetURI: 'magnet:?xt=urn:btih:3ba219a8634bf7bae3d848192b2da75ae995589d&dn=The+WIRED+CD+-+Rip.+Sample.+Mash.+Share.&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%2F',
+        displayName: 'The WIRED CD - Rip. Sample. Mash. Share.',
+        posterURL: 'wired-cd.jpg',
+        torrentPath: 'wired-cd.torrent',
+        files: [
+          {
+            length: 1964275,
+            name: '01 - Beastie Boys - Now Get Busy.mp3'
+          },
+          {
+            length: 3610523,
+            name: '02 - David Byrne - My Fair Lady.mp3'
+          },
+          {
+            length: 2759377,
+            name: '03 - Zap Mama - Wadidyusay.mp3'
+          },
+          {
+            length: 5816537,
+            name: '04 - My Morning Jacket - One Big Holiday.mp3'
+          },
+          {
+            length: 2106421,
+            name: '05 - Spoon - Revenge!.mp3'
+          },
+          {
+            length: 3347550,
+            name: '06 - Gilberto Gil - Oslodum.mp3'
+          },
+          {
+            length: 2107577,
+            name: '07 - Dan The Automator - Relaxation Spa Treatment.mp3'
+          },
+          {
+            length: 3108130,
+            name: '08 - Thievery Corporation - Dc 3000.mp3'
+          },
+          {
+            length: 3051528,
+            name: '09 - Le Tigre - Fake French.mp3'
+          },
+          {
+            length: 3270259,
+            name: '10 - Paul Westerberg - Looking Up In Heaven.mp3'
+          },
+          {
+            length: 3263528,
+            name: '11 - Chuck D - No Meaning No (feat. Fine Arts Militia).mp3'
+          },
+          {
+            length: 6380952,
+            name: '12 - The Rapture - Sister Saviour (Blackstrobe Remix).mp3'
+          },
+          {
+            length: 6550396,
+            name: '13 - Cornelius - Wataridori 2.mp3'
+          },
+          {
+            length: 3034692,
+            name: '14 - DJ Danger Mouse - What U Sittin\' On (feat. Jemini, Cee Lo And Tha Alkaholiks).mp3'
+          },
+          {
+            length: 3854611,
+            name: '15 - DJ Dolores - Oslodum 2004.mp3'
+          },
+          {
+            length: 1762120,
+            name: '16 - Matmos - Action At A Distance.mp3'
+          },
+          {
+            length: 4071,
+            name: 'README.md'
+          },
+          {
+            length: 78163,
+            name: 'poster.jpg'
+          }
+        ]
+      }
+    ],
+    downloadPath: config.IS_PORTABLE
+      ? path.join(config.CONFIG_PATH, 'Downloads')
+      : remote.app.getPath('downloads')
+  }
+}

renderer/views/app.js

@@ -0,0 +1,84 @@
+module.exports = App
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var Header = require('./header')
+var Views = {
+  'home': require('./torrent-list'),
+  'player': require('./player'),
+  'create-torrent': require('./create-torrent-page')
+}
+var Modals = {
+  'open-torrent-address-modal': require('./open-torrent-address-modal'),
+  'update-available-modal': require('./update-available-modal')
+}
+
+function App (state) {
+  // Hide player controls while playing video, if the mouse stays still for a while
+  // Never hide the controls when:
+  // * The mouse is over the controls or we're scrubbing (see CSS)
+  // * The video is paused
+  // * The video is playing remotely on Chromecast or Airplay
+  var hideControls = state.location.current().url === 'player' &&
+    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
+  // On OSX, the header appears as part of the title bar
+  var hideHeader = process.platform !== 'darwin' && state.location.current().url === 'player'
+
+  var cls = [
+    'view-' + state.location.current().url, /* e.g. view-home, view-player */
+    'is-' + process.platform /* e.g. is-darwin, is-win32, is-linux */
+  ]
+  if (state.window.isFullScreen) cls.push('is-fullscreen')
+  if (state.window.isFocused) cls.push('is-focused')
+  if (hideControls) cls.push('hide-video-controls')
+  if (hideHeader) cls.push('hide-header')
+
+  return hx`
+    <div class='app ${cls.join(' ')}'>
+      ${Header(state)}
+      ${getErrorPopover(state)}
+      <div class='content'>${getView(state)}</div>
+      ${getModal(state)}
+    </div>
+  `
+}
+
+function getErrorPopover (state) {
+  var now = new Date().getTime()
+  var recentErrors = state.errors.filter((x) => now - x.time < 5000)
+
+  var errorElems = recentErrors.map(function (error) {
+    return hx`<div class='error'>${error.message}</div>`
+  })
+  return hx`
+  <div class='error-popover ${recentErrors.length > 0 ? 'visible' : 'hidden'}'>
+      <div class='title'>Error</div>
+      ${errorElems}
+    </div>
+  `
+}
+
+function getModal (state) {
+  if (!state.modal) return
+  var contents = Modals[state.modal.id](state)
+  return hx`
+    <div class='modal'>
+      <div class='modal-background'></div>
+      <div class='modal-content'>
+        ${contents}
+      </div>
+    </div>
+  `
+}
+
+function getView (state) {
+  var url = state.location.current().url
+  return Views[url](state)
+}

renderer/views/create-torrent-page.js

@@ -0,0 +1,138 @@
+module.exports = CreateTorrentPage
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var createTorrent = require('create-torrent')
+var path = require('path')
+var prettyBytes = require('prettier-bytes')
+
+var {dispatch} = require('../lib/dispatcher')
+
+function CreateTorrentPage (state) {
+  var info = state.location.current()
+
+  // Preprocess: exclude .DS_Store and other dotfiles
+  var files = info.files
+    .filter((f) => !f.name.startsWith('.'))
+    .map((f) => ({name: f.name, path: f.path, size: f.size}))
+
+  // First, extract the base folder that the files are all in
+  var pathPrefix = info.folderPath
+  if (!pathPrefix) {
+    if (files.length > 0) {
+      pathPrefix = files.map((x) => x.path).reduce(findCommonPrefix)
+      if (!pathPrefix.endsWith('/') && !pathPrefix.endsWith('\\')) {
+        pathPrefix = path.dirname(pathPrefix)
+      }
+    } else {
+      pathPrefix = files[0]
+    }
+  }
+
+  // Sanity check: show the number of files and total size
+  var numFiles = files.length
+  console.log('FILES', files)
+  var totalBytes = files
+    .map((f) => f.size)
+    .reduce((a, b) => a + b, 0)
+  var torrentInfo = `${numFiles} files, ${prettyBytes(totalBytes)}`
+
+  // Then, use the name of the base folder (or sole file, for a single file torrent)
+  // as the default name. Show all files relative to the base folder.
+  var defaultName = path.basename(pathPrefix)
+  var basePath = path.dirname(pathPrefix)
+  var maxFileElems = 100
+  var fileElems = files.slice(0, maxFileElems).map(function (file) {
+    var relativePath = files.length === 0 ? file.name : path.relative(pathPrefix, file.path)
+    return hx`<div>${relativePath}</div>`
+  })
+  if (files.length > maxFileElems) {
+    fileElems.push(hx`<div>+ ${maxFileElems - files.length} more</div>`)
+  }
+  var trackers = createTorrent.announceList.join('\n')
+  var collapsedClass = info.showAdvanced ? 'expanded' : 'collapsed'
+
+  return hx`
+    <div class='create-torrent-page'>
+      <h2>Create torrent ${defaultName}</h2>
+      <p class="torrent-info">
+        ${torrentInfo}
+      </p>
+      <p class='torrent-attribute'>
+        <label>Path:</label>
+        <div class='torrent-attribute'>${pathPrefix}</div>
+      </p>
+      <div class='expand-collapse ${collapsedClass}' onclick=${handleToggleShowAdvanced}>
+        ${info.showAdvanced ? 'Basic' : 'Advanced'}
+      </div>
+      <div class="create-torrent-advanced ${collapsedClass}">
+        <p class='torrent-attribute'>
+          <label>Comment:</label>
+          <textarea class='torrent-attribute torrent-comment'></textarea>
+        </p>
+        <p class='torrent-attribute'>
+          <label>Trackers:</label>
+          <textarea class='torrent-attribute torrent-trackers'>${trackers}</textarea>
+        </p>
+        <p class='torrent-attribute'>
+          <label>Private:</label>
+          <input type='checkbox' class='torrent-is-private' value='torrent-is-private'>
+        </p>
+        <p class='torrent-attribute'>
+          <label>Files:</label>
+          <div>${fileElems}</div>
+        </p>
+      </div>
+      <p class="float-right">
+        <button class='button-flat light' onclick=${handleCancel}>Cancel</button>
+        <button class='button-raised' onclick=${handleOK}>Create Torrent</button>
+      </p>
+    </div>
+  `
+
+  function handleOK () {
+    var announceList = document.querySelector('.torrent-trackers').value
+      .split('\n')
+      .map((s) => s.trim())
+      .filter((s) => s !== '')
+    var isPrivate = document.querySelector('.torrent-is-private').checked
+    var comment = document.querySelector('.torrent-comment').value.trim()
+    var options = {
+      // We can't let the user choose their own name if we want WebTorrent
+      // to use the files in place rather than creating a new folder.
+      // If we ever want to add support for that:
+      // name: document.querySelector('.torrent-name').value
+      name: defaultName,
+      path: basePath,
+      files: files,
+      announce: announceList,
+      private: isPrivate,
+      comment: comment
+    }
+    dispatch('createTorrent', options)
+    dispatch('backToList')
+  }
+
+  function handleCancel () {
+    dispatch('backToList')
+  }
+
+  function handleToggleShowAdvanced () {
+    // TODO: what's the clean way to handle this?
+    // Should every button on every screen have its own dispatch()?
+    info.showAdvanced = !info.showAdvanced
+    dispatch('update')
+  }
+}
+
+// Finds the longest common prefix
+function findCommonPrefix (a, b) {
+  for (var i = 0; i < a.length && i < b.length; i++) {
+    if (a.charCodeAt(i) !== b.charCodeAt(i)) break
+  }
+  if (i === a.length) return a
+  if (i === b.length) return b
+  return a.substring(0, i)
+}

renderer/views/header.js

@@ -0,0 +1,51 @@
+module.exports = Header
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var {dispatcher} = require('../lib/dispatcher')
+
+function Header (state) {
+  return hx`
+    <div class='header'>
+      ${getTitle()}
+      <div class='nav left'>
+        <i.icon.back
+          class=${state.location.hasBack() ? '' : 'disabled'}
+          title='Back'
+          onclick=${dispatcher('back')}>
+          chevron_left
+        </i>
+        <i.icon.forward
+          class=${state.location.hasForward() ? '' : 'disabled'}
+          title='Forward'
+          onclick=${dispatcher('forward')}>
+          chevron_right
+        </i>
+      </div>
+      <div class='nav right'>
+        ${getAddButton()}
+      </div>
+    </div>
+  `
+
+  function getTitle () {
+    if (process.platform === 'darwin') {
+      return hx`<div class='title ellipsis'>${state.window.title}</div>`
+    }
+  }
+
+  function getAddButton () {
+    if (state.location.current().url !== 'player') {
+      return hx`
+        <i
+          class='icon add'
+          title='Add torrent'
+          onclick=${dispatcher('showOpenTorrentFile')}>
+          add
+        </i>
+      `
+    }
+  }
+}

renderer/views/open-torrent-address-modal.js

@@ -0,0 +1,36 @@
+module.exports = OpenTorrentAddressModal
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var {dispatch} = require('../lib/dispatcher')
+
+function OpenTorrentAddressModal (state) {
+  return hx`
+    <div class='open-torrent-address-modal'>
+      <p><label>Enter torrent address or magnet link</label></p>
+      <p>
+        <input id='add-torrent-url' type='text' onkeypress=${handleKeyPress} />
+      </p>
+      <p class='float-right'>
+        <button class='button button-flat' onclick=${handleCancel}>CANCEL</button>
+          <button class='button button-raised' onclick=${handleOK}>OK</button>
+      </p>
+      <script>document.querySelector('#add-torrent-url').focus()</script>
+    </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')
+}

renderer/views/player.js

@@ -0,0 +1,618 @@
+module.exports = Player
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var WebChimeraPlayer = require('wcjs-player')
+var prettyBytes = require('prettier-bytes')
+var Bitfield = require('bitfield')
+
+var TorrentSummary = require('../lib/torrent-summary')
+var {dispatch, dispatcher} = require('../lib/dispatcher')
+
+// Shows a streaming video player. Standard features + Chromecast + Airplay
+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=${dispatcher('mediaMouseMoved')}>
+      ${showVideo ? renderMedia(state) : renderCastScreen(state)}
+      ${renderPlayerControls(state)}
+      </div>
+  `
+}
+
+function renderMedia (state) {
+  if (!state.server) return
+  if (false) return renderMediaTag(state)
+  else return renderMediaVLC(state)
+}
+
+// Renders using a <video> or <audio> tag
+// Handles only a subset of codecs, but it's cleaner and more efficient
+// See renderMediaVLC()
+function renderMediaTag (state) {
+  // Unfortunately, play/pause can't be done just by modifying HTML.
+  // Instead, grab the DOM node and play/pause it if necessary
+  var mediaElement = document.querySelector(state.playing.type) /* 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.playing.jumpToTime) {
+      mediaElement.currentTime = state.playing.jumpToTime
+      state.playing.jumpToTime = null
+    }
+    // Set volume
+    if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
+      mediaElement.volume = state.playing.setVolume
+      state.playing.setVolume = null
+    }
+
+    // fix textTrack cues not been removed <track> rerender
+    if (state.playing.subtitles.change) {
+      var tracks = mediaElement.textTracks
+      for (var j = 0; j < tracks.length; j++) {
+        // mode is not an <track> attribute, only available on DOM
+        tracks[j].mode = (tracks[j].label === state.playing.subtitles.change) ? 'showing' : 'hidden'
+      }
+      state.playing.subtitles.change = null
+    }
+
+    state.playing.currentTime = mediaElement.currentTime
+    state.playing.duration = mediaElement.duration
+    state.playing.volume = mediaElement.volume
+  }
+
+  // Add subtitles to the <video> tag
+  var trackTags = []
+  if (state.playing.subtitles.enabled && state.playing.subtitles.tracks.length > 0) {
+    for (var i = 0; i < state.playing.subtitles.tracks.length; i++) {
+      var track = state.playing.subtitles.tracks[i]
+      trackTags.push(hx`
+        <track
+          ${track.selected ? 'default' : ''}
+          label=${track.label}
+          type='subtitles'
+          src=${track.buffer}>
+      `)
+    }
+  }
+
+  // Create the <audio> or <video> tag
+  var mediaTag = hx`
+    <div
+      src='${state.server.localURL}'
+      ondblclick=${dispatcher('toggleFullScreen')}
+      onloadedmetadata=${onLoadedMetadata}
+      onended=${onEnded}
+      onstalling=${dispatcher('mediaStalled')}
+      onerror=${dispatcher('mediaError')}
+      ontimeupdate=${dispatcher('mediaTimeUpdate')}
+      autoplay>
+      ${trackTags}
+    </div>
+  `
+  mediaTag.tagName = state.playing.type // conditional tag name
+
+  // Show the media.
+  return hx`
+    <div
+      class='letterbox'
+      onmousemove=${dispatcher('mediaMouseMoved')}>
+      ${mediaTag}
+      ${renderOverlay(state)}
+    </div>
+  `
+
+  // As soon as the video loads enough to know the video dimensions, resize the window
+  function onLoadedMetadata (e) {
+    if (state.playing.type !== 'video') return
+    var video = e.target
+    var dimensions = {
+      width: video.videoWidth,
+      height: video.videoHeight
+    }
+    dispatch('setDimensions', dimensions)
+  }
+
+  // When the video completes, pause the video instead of looping
+  function onEnded (e) {
+    state.playing.isPaused = true
+  }
+}
+
+// Renders using WebChimera.js to render using VLC
+// That lets us play media that the <video> tag can't play
+function renderMediaVLC (state) {
+  // Unfortunately, WebChimera can't be done just by modifying HTML.
+  // Instead, grab the DOM node
+  if (document.querySelector('#media-player')) {
+    if (!state.playing.chimera) {
+      state.playing.chimera = new WebChimeraPlayer('#media-player')
+        .addPlayer({
+          autoplay: true,
+          vlcArgs: ['-vvv'],
+          wcjsRendererOptions: {'fallbackRenderer': true}
+        })
+        .onPlaying(dispatcher('mediaPlaying'))
+        .onPaused(dispatcher('mediaPaused'))
+        .onBuffering(dispatcher('mediaStalled'))
+        .onTime(dispatcher('mediaTimeUpdate'))
+        .onEnded(onEnded)
+        .onFrameSetup(onLoadedMetadata)
+        .addPlaylist(state.server.localURL)
+      state.playing.chimera.ui(false)
+    } else {
+      var player = state.playing.chimera
+      if (state.playing.isPaused && player.playing()) {
+        player.pause()
+      } else if (!state.playing.isPaused && !player.playing()) {
+        player.play()
+      }
+      // When the user clicks or drags on the progress bar, jump to that position
+      if (state.playing.jumpToTime) {
+        player.time(state.playing.jumpToTime * 1000) // WebChimera expects milliseconds
+        state.playing.jumpToTime = null
+      }
+      // Set volume
+      if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
+        player.volume(Math.round(state.playing.setVolume * 100)) // WebChimera expects integer percent
+        state.playing.setVolume = null
+      }
+
+      state.playing.currentTime = player.time() / 1000
+      state.playing.duration = player.length() / 1000
+      state.playing.volume = player.volume() / 100
+    }
+  } else {
+    state.playing.chimera = null
+  }
+
+  // Add subtitles to the <video> tag
+  var trackTags = []
+  if (state.playing.subtitles.enabled && state.playing.subtitles.tracks.length > 0) {
+    for (var i = 0; i < state.playing.subtitles.tracks.length; i++) {
+      var track = state.playing.subtitles.tracks[i]
+      trackTags.push(hx`
+        <track
+        default=${track.selected ? 'default' : ''}
+        label=${track.language}
+        type='subtitles'
+        src=${track.buffer}>
+      `)
+    }
+  }
+
+  // Create the <audio> or <video> tag
+  var mediaType = state.playing.type /* 'video' or 'audio' */
+  var mediaTag = hx`
+    <div id='media-player' class='${mediaType}-player'>
+      ${trackTags}
+    </div>
+  `
+
+  // Show the media.
+  return hx`
+    <div
+      class='letterbox'
+      onmousemove=${dispatcher('mediaMouseMoved')}>
+      ${mediaTag}
+      ${renderOverlay(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 dimensions = {
+      width: player.width(),
+      height: player.height()
+    }
+    dispatch('setDimensions', dimensions)
+  }
+
+  // When the video completes, pause the video instead of looping
+  function onEnded (e) {
+    state.playing.isPaused = true
+  }
+}
+
+function renderOverlay (state) {
+  var elems = []
+  var audioMetadataElem = renderAudioMetadata(state)
+  var spinnerElem = renderLoadingSpinner(state)
+  if (audioMetadataElem) elems.push(audioMetadataElem)
+  if (spinnerElem) elems.push(spinnerElem)
+
+  // Video fills the window, centered with black bars if necessary
+  // Audio gets a static poster image and a summary of the file metadata.
+  var style
+  if (state.playing.type === 'audio') {
+    style = { backgroundImage: cssBackgroundImagePoster(state) }
+  } else if (elems.length !== 0) {
+    style = { backgroundImage: cssBackgroundImageDarkGradient() }
+  } else {
+    return /* Video, not audio, and it isn't stalled, so no spinner. No overlay needed. */
+  }
+
+  return hx`
+    <div class='media-overlay-background' style=${style}>
+      <div class='media-overlay'>${elems}</div>
+    </div>
+  `
+}
+
+function renderAudioMetadata (state) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  var fileSummary = torrentSummary.files[state.playing.fileIndex]
+  if (!fileSummary.audioInfo) return
+  var info = fileSummary.audioInfo
+
+  // Get audio track info
+  var title = info.title
+  if (!title) {
+    title = fileSummary.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 with title/album/artist/etc
+  var elems = []
+  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>`)
+
+  // Align the title with the artist/etc info, if available. Otherwise, center the title
+  var emptyLabel = hx`<label></label>`
+  elems.unshift(hx`<div class='audio-title'>${elems.length ? emptyLabel : undefined}${title}</div>`)
+
+  return hx`<div class='audio-metadata'>${elems}</div>`
+}
+
+function renderLoadingSpinner (state) {
+  if (state.playing.isPaused) return
+  var isProbablyStalled = state.playing.isStalled ||
+    (new Date().getTime() - state.playing.lastTimeUpdate > 2000)
+  if (!isProbablyStalled) return
+
+  var prog = getPlayingTorrentSummary(state).progress || {}
+  var fileProgress = 0
+  if (prog.files) {
+    var file = prog.files[state.playing.fileIndex]
+    fileProgress = Math.floor(100 * file.numPiecesPresent / file.numPieces)
+  }
+
+  return hx`
+    <div class='media-stalled'>
+      <div class='loading-spinner'>&nbsp;</div>
+      <div class='loading-status ellipsis'>
+        <span class='progress'>${fileProgress}%</span> downloaded,
+        <span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
+        <span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
+      </div>
+    </div>
+  `
+}
+
+function renderCastScreen (state) {
+  var castIcon, castType
+  if (state.playing.location.startsWith('chromecast')) {
+    castIcon = 'cast_connected'
+    castType = 'Chromecast'
+  } else if (state.playing.location.startsWith('airplay')) {
+    castIcon = 'airplay'
+    castType = 'AirPlay'
+  } else if (state.playing.location.startsWith('dlna')) {
+    castIcon = 'tv'
+    castType = 'DLNA'
+  }
+
+  var isStarting = state.playing.location.endsWith('-pending')
+  var castStatus = isStarting ? 'Connecting...' : 'Connected'
+
+  // Show a nice title image, if possible
+  var style = {
+    backgroundImage: cssBackgroundImagePoster(state)
+  }
+
+  return hx`
+    <div class='letterbox' style=${style}>
+      <div class='cast-screen'>
+        <i class='icon'>${castIcon}</i>
+        <div class='cast-type'>${castType}</div>
+        <div class='cast-status'>${castStatus}</div>
+      </div>
+    </div>
+  `
+}
+
+function renderSubtitlesOptions (state) {
+  var subtitles = state.playing.subtitles
+  if (subtitles.tracks.length && subtitles.show) {
+    return hx`<ul.subtitles-list>
+      ${subtitles.tracks.map(function (w, i) {
+        return hx`<li onclick=${dispatcher('selectSubtitle', w.label)}><i.icon>${w.selected ? 'radio_button_checked' : 'radio_button_unchecked'}</i>${w.label}</li>`
+      })}
+        <li onclick=${dispatcher('selectSubtitle', '')}><i.icon>${!subtitles.enabled ? 'radio_button_checked' : 'radio_button_unchecked'}</i>None</li>
+      </ul>
+    `
+  }
+}
+
+function renderPlayerControls (state) {
+  var positionPercent = 100 * state.playing.currentTime / state.playing.duration
+  var playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 8px)' }
+  var captionsClass = state.playing.subtitles.tracks.length === 0
+    ? 'disabled'
+    : state.playing.subtitles.enabled
+      ? 'active'
+      : ''
+
+  var elements = [
+    hx`
+      <div class='playback-bar'>
+        ${renderLoadingBar(state)}
+        <div class='playback-cursor' style=${playbackCursorStyle}></div>
+        <div class='scrub-bar'
+          draggable='true'
+          onclick=${handleScrub},
+          ondrag=${handleScrub}></div>
+      </div>
+    `,
+    hx`
+      <i class='icon fullscreen'
+        onclick=${dispatcher('toggleFullScreen')}>
+        ${state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
+      </i>
+    `
+  ]
+
+  if (state.playing.type === 'video') {
+    // show closed captions icon
+    elements.push(hx`
+      <i.icon.closed-captions
+        class=${captionsClass}
+        onclick=${handleSubtitles}>
+        closed_captions
+      </i>
+    `)
+  }
+
+  // If we've detected a Chromecast or AppleTV, the user can play video there
+  var isOnChromecast = state.playing.location.startsWith('chromecast')
+  var isOnAirplay = state.playing.location.startsWith('airplay')
+  var isOnDlna = state.playing.location.startsWith('dlna')
+  var chromecastClass, chromecastHandler, airplayClass, airplayHandler, dlnaClass, dlnaHandler
+  if (isOnChromecast) {
+    chromecastClass = 'active'
+    dlnaClass = 'disabled'
+    airplayClass = 'disabled'
+    chromecastHandler = dispatcher('closeDevice')
+    airplayHandler = undefined
+    dlnaHandler = undefined
+  } else if (isOnAirplay) {
+    chromecastClass = 'disabled'
+    dlnaClass = 'disabled'
+    airplayClass = 'active'
+    chromecastHandler = undefined
+    airplayHandler = dispatcher('closeDevice')
+    dlnaHandler = undefined
+  } else if (isOnDlna) {
+    chromecastClass = 'disabled'
+    dlnaClass = 'active'
+    airplayClass = 'disabled'
+    chromecastHandler = undefined
+    airplayHandler = undefined
+    dlnaHandler = dispatcher('closeDevice')
+  } else {
+    chromecastClass = ''
+    airplayClass = ''
+    dlnaClass = ''
+    chromecastHandler = dispatcher('openDevice', 'chromecast')
+    airplayHandler = dispatcher('openDevice', 'airplay')
+    dlnaHandler = dispatcher('openDevice', 'dlna')
+  }
+  if (state.devices.chromecast || isOnChromecast) {
+    var castIcon = isOnChromecast ? 'cast_connected' : 'cast'
+    elements.push(hx`
+      <i.icon.device
+        class=${chromecastClass}
+        onclick=${chromecastHandler}>
+        ${castIcon}
+      </i>
+    `)
+  }
+  if (state.devices.airplay || isOnAirplay) {
+    elements.push(hx`
+      <i.icon.device
+        class=${airplayClass}
+        onclick=${airplayHandler}>
+        airplay
+      </i>
+    `)
+  }
+  if (state.devices.dlna || isOnDlna) {
+    elements.push(hx`
+      <i.icon.device
+        class=${dlnaClass}
+        onclick=${dlnaHandler}>
+        tv
+      </i>
+    `)
+  }
+
+  // On OSX, the back button is in the title bar of the window; see app.js
+  // On other platforms, we render one over the video on mouseover
+  if (process.platform !== 'darwin') {
+    elements.push(hx`
+      <i.icon.back
+        onclick=${dispatcher('back')}>
+        chevron_left
+      </i>
+    `)
+  }
+
+  // render volume
+  var volume = state.playing.volume
+  var volumeIcon = 'volume_' + (volume === 0 ? 'off' : volume < 0.3 ? 'mute' : volume < 0.6 ? 'down' : 'up')
+  var volumeStyle = { background: '-webkit-gradient(linear, left top, right top, ' +
+    'color-stop(' + (volume * 100) + '%, #eee), ' +
+    'color-stop(' + (volume * 100) + '%, #727272))'
+  }
+
+  elements.push(hx`
+    <div.volume
+      onwheel=${handleVolumeWheel}>
+        <i.icon.volume-icon onmousedown=${handleVolumeMute}>
+          ${volumeIcon}
+        </i>
+        <input.volume-slider
+          type='range' min='0' max='1' step='0.05' value=${volumeChanging !== false ? volumeChanging : volume}
+          onmousedown=${handleVolumeScrub}
+          onmouseup=${handleVolumeScrub}
+          onmousemove=${handleVolumeScrub}
+          onwheel=${handleVolumeWheel}
+          style=${volumeStyle}
+        />
+    </div>
+  `)
+
+  // Finally, the big button in the center plays or pauses the video
+  elements.push(hx`
+    <i class='icon play-pause' onclick=${dispatcher('playPause')}>
+      ${state.playing.isPaused ? 'play_arrow' : 'pause'}
+    </i>
+  `)
+
+  return hx`
+    <div class='player-controls'>
+      ${elements}
+      ${renderSubtitlesOptions(state)}
+    </div>
+  `
+
+  // Handles a click or drag to scrub (jump to another position in the video)
+  function handleScrub (e) {
+    dispatch('mediaMouseMoved')
+    var windowWidth = document.querySelector('body').clientWidth
+    var fraction = e.clientX / windowWidth
+    var position = fraction * state.playing.duration /* seconds */
+    dispatch('playbackJump', position)
+  }
+
+  // Handles volume change by wheel
+  function handleVolumeWheel (e) {
+    dispatch('changeVolume', (-e.deltaY | e.deltaX) / 500)
+  }
+
+  // Handles volume muting and Unmuting
+  function handleVolumeMute (e) {
+    if (state.playing.volume === 0.0) {
+      dispatch('setVolume', 1.0)
+    } else {
+      dispatch('setVolume', 0.0)
+    }
+  }
+
+  // Handles volume slider scrub
+  function handleVolumeScrub (e) {
+    switch (e.type) {
+      case 'mouseup':
+        volumeChanging = false
+        dispatch('setVolume', e.offsetX / 50)
+        break
+      case 'mousedown':
+        volumeChanging = this.value
+        break
+      case 'mousemove':
+        // only change if move was started by click
+        if (volumeChanging !== false) {
+          volumeChanging = this.value
+        }
+        break
+    }
+  }
+
+  function handleSubtitles (e) {
+    if (!state.playing.subtitles.tracks.length || e.ctrlKey || e.metaKey) {
+      // if no subtitles available select it
+      dispatch('openSubtitles')
+    } else {
+      dispatch('showSubtitles')
+    }
+  }
+}
+
+// lets scrub without sending to volume backend
+var volumeChanging = false
+
+// Renders the loading bar. Shows which parts of the torrent are loaded, which
+// can be "spongey" / non-contiguous
+function renderLoadingBar (state) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  if (!torrentSummary.progress) {
+    return []
+  }
+
+  // Find all contiguous parts of the torrent which are loaded
+  var prog = torrentSummary.progress
+  var fileProg = prog.files[state.playing.fileIndex]
+  var parts = []
+  var lastPiecePresent = false
+  for (var i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
+    var partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
+    if (partPresent && !lastPiecePresent) {
+      parts.push({start: i - fileProg.startPiece, count: 1})
+    } else if (partPresent) {
+      parts[parts.length - 1].count++
+    }
+    lastPiecePresent = partPresent
+  }
+
+  // Output some bars to show which parts of the file are loaded
+  return hx`
+    <div class='loading-bar'>
+      ${parts.map(function (part) {
+        var style = {
+          left: (100 * part.start / fileProg.numPieces) + '%',
+          width: (100 * part.count / fileProg.numPieces) + '%'
+        }
+
+        return hx`<div class='loading-bar-part' style=${style}></div>`
+      })}
+    </div>
+  `
+}
+
+// Returns the CSS background-image string for a poster image + dark vignette
+function cssBackgroundImagePoster (state) {
+  var torrentSummary = getPlayingTorrentSummary(state)
+  var posterPath = TorrentSummary.getPosterPath(torrentSummary)
+  if (!posterPath) return ''
+  return cssBackgroundImageDarkGradient() + `, url(${posterPath})`
+}
+
+function cssBackgroundImageDarkGradient () {
+  return 'radial-gradient(circle at center, ' +
+    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
+}
+
+function getPlayingTorrentSummary (state) {
+  var infoHash = state.playing.infoHash
+  return state.saved.torrents.find((x) => x.infoHash === infoHash)
+}

renderer/views/torrent-list.js

@@ -0,0 +1,238 @@
+module.exports = TorrentList
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+var prettyBytes = require('prettier-bytes')
+
+var TorrentSummary = require('../lib/torrent-summary')
+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`
+    <div class='torrent-list'>
+      ${torrentRows}
+      <div class='torrent-placeholder'>
+        <span class='ellipsis'>Drop a torrent file here or paste a magnet link</span>
+      </div>
+    </div>`
+
+  // Renders a torrent in the torrent list
+  // Includes name, download status, play button, background image
+  // May be expanded for additional info, including the list of files inside
+  function renderTorrent (torrentSummary) {
+    // Get ephemeral data (like progress %) directly from the WebTorrent handle
+    var infoHash = torrentSummary.infoHash
+    var isSelected = infoHash && state.selectedInfoHash === infoHash
+
+    // Background image: show some nice visuals, like a frame from the movie, if possible
+    var style = {}
+    if (torrentSummary.posterFileName) {
+      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 posterPath = TorrentSummary.getPosterPath(torrentSummary)
+      style.backgroundImage = gradient + `, url('${posterPath}')`
+    }
+
+    // Foreground: name of the torrent, basic info like size, play button,
+    // cast buttons if available, and delete
+    var classes = ['torrent']
+    //  playStatus turns the play button into a loading spinner or error icon
+    if (torrentSummary.playStatus) classes.push(torrentSummary.playStatus)
+    if (isSelected) classes.push('selected')
+    if (!infoHash) classes.push('disabled')
+    classes = classes.join(' ')
+    return hx`
+      <div style=${style} class=${classes}
+        oncontextmenu=${infoHash && dispatcher('openTorrentContextMenu', infoHash)}
+        onclick=${infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
+        ${renderTorrentMetadata(torrentSummary)}
+        ${infoHash ? renderTorrentButtons(torrentSummary) : ''}
+        ${isSelected ? renderTorrentDetails(torrentSummary) : ''}
+      </div>
+    `
+  }
+
+  // Show name, download status, % complete
+  function renderTorrentMetadata (torrentSummary) {
+    var name = torrentSummary.name || 'Loading torrent...'
+    var elements = [hx`
+      <div class='name ellipsis'>${name}</div>
+    `]
+
+    // If it's downloading/seeding then show progress info
+    var prog = torrentSummary.progress
+    if (torrentSummary.status !== 'paused' && prog) {
+      var progress = Math.floor(100 * prog.progress)
+      var downloaded = prettyBytes(prog.downloaded)
+      var total = prettyBytes(prog.length || 0)
+      if (downloaded !== total) downloaded += ` / ${total}`
+
+      elements.push(hx`
+        <div class='status ellipsis'>
+          ${getFilesLength()}
+          <span>${getPeers()}</span>
+          <span>↓ ${prettyBytes(prog.downloadSpeed || 0)}/s</span>
+          <span>↑ ${prettyBytes(prog.uploadSpeed || 0)}/s</span>
+        </div>
+      `)
+      elements.push(hx`
+        <div class='status2 ellipsis'>
+          <span class='progress'>${progress}%</span>
+          <span>${downloaded}</span>
+        </div>
+      `)
+    }
+
+    return hx`<div class='metadata'>${elements}</div>`
+
+    function getPeers () {
+      var count = prog.numPeers === 1 ? 'peer' : 'peers'
+      return `${prog.numPeers} ${count}`
+    }
+
+    function getFilesLength () {
+      if (torrentSummary.files && torrentSummary.files.length > 1) {
+        return hx`<span class='files'>${torrentSummary.files.length} files</span>`
+      }
+    }
+  }
+
+  // Download button toggles between torrenting (DL/seed) and paused
+  // Play button starts streaming the torrent immediately, unpausing if needed
+  function renderTorrentButtons (torrentSummary) {
+    var infoHash = torrentSummary.infoHash
+
+    var playIcon, playTooltip, playClass
+    if (torrentSummary.playStatus === 'unplayable') {
+      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') {
+      playIcon = 'warning'
+      playTooltip = 'Playback timed out. No seeds? No internet? Click to try again.'
+    } else {
+      playIcon = 'play_arrow'
+      playTooltip = 'Start streaming'
+    }
+
+    var downloadIcon, downloadTooltip
+    if (torrentSummary.status === 'seeding') {
+      downloadIcon = 'file_upload'
+      downloadTooltip = 'Seeding. Click to stop.'
+    } else if (torrentSummary.status === 'downloading') {
+      downloadIcon = 'file_download'
+      downloadTooltip = 'Torrenting. Click to stop.'
+    } else {
+      downloadIcon = 'file_download'
+      downloadTooltip = 'Click to start torrenting.'
+    }
+
+    // Only show the play button for torrents that contain playable media
+    var playButton
+    if (TorrentPlayer.isPlayableTorrent(torrentSummary)) {
+      playButton = hx`
+        <i.button-round.icon.play
+          title=${playTooltip}
+          class=${playClass}
+          onclick=${dispatcher('play', infoHash)}>
+          ${playIcon}
+        </i>
+      `
+    }
+
+    return hx`
+      <div class='buttons'>
+        ${playButton}
+        <i.button-round.icon.download
+          class=${torrentSummary.status}
+          title=${downloadTooltip}
+          onclick=${dispatcher('toggleTorrent', infoHash)}>
+          ${downloadIcon}
+        </i>
+        <i
+          class='icon delete'
+          title='Remove torrent'
+          onclick=${dispatcher('deleteTorrent', infoHash)}>
+          close
+        </i>
+      </div>
+    `
+  }
+
+  // Show files, per-file download status and play buttons, and so on
+  function renderTorrentDetails (torrentSummary) {
+    var infoHash = torrentSummary.infoHash
+    var filesElement
+    if (!torrentSummary.files) {
+      // We don't know what files this torrent contains
+      var message = torrentSummary.status === 'paused'
+        ? 'Failed to load torrent info. Click the download button to try again...'
+        : 'Downloading torrent info...'
+      filesElement = hx`<div class='files warning'>${message}</div>`
+    } else {
+      // We do know the files. List them and show download stats for each one
+      var fileRows = torrentSummary.files.map(
+        (file, index) => renderFileRow(torrentSummary, file, index))
+      filesElement = hx`
+        <div class='files'>
+          <strong>Files</strong>
+          <span class='open-folder'
+            onclick=${dispatcher('openFolder', infoHash)}>
+            Open folder
+          </span>
+          <table>
+            ${fileRows}
+          </table>
+        </div>
+      `
+    }
+
+    return hx`
+      <div class='torrent-details'>
+        ${filesElement}
+      </div>
+    `
+  }
+
+  // Show a single torrentSummary file in the details view for a single torrent
+  function renderFileRow (torrentSummary, file, index) {
+    // First, find out how much of the file we've downloaded
+    var isDone = false
+    var progress = ''
+    if (torrentSummary.progress && torrentSummary.progress.files) {
+      var fileProg = torrentSummary.progress.files[index]
+      isDone = fileProg.numPiecesPresent === fileProg.numPieces
+      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+    }
+
+    // Second, render the file as a table row
+    var infoHash = torrentSummary.infoHash
+    var icon
+    var rowClass = ''
+    var handleClick
+    if (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}'>
+        <td class='col-icon'>
+          <i class='icon'>${icon}</i>
+        </td>
+        <td class='col-name'>${file.name}</td>
+        <td class='col-progress'>${progress}</td>
+        <td class='col-size'>${prettyBytes(file.length)}</td>
+      </tr>
+    `
+  }
+}

renderer/views/update-available-modal.js

@@ -0,0 +1,32 @@
+module.exports = UpdateAvailableModal
+
+var h = require('virtual-dom/h')
+var hyperx = require('hyperx')
+var hx = hyperx(h)
+
+var electron = require('electron')
+
+var {dispatch} = require('../lib/dispatcher')
+
+function UpdateAvailableModal (state) {
+  return hx`
+    <div class='update-available-modal'>
+      <p><strong>A new version of WebTorrent is available: v${state.modal.version}</strong></p>
+      <p>We have an auto-updater for Windows and Mac. We don't have one for Linux yet, so you'll have to download the new version manually.</p>
+      <p>
+        <button class='primary' onclick=${handleOK}>Show Download Page</button>
+        <button class='cancel' onclick=${handleCancel}>Skip This Release</button>
+      </p>
+    </div>
+  `
+
+  function handleOK () {
+    electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
+    dispatch('exitModal')
+  }
+
+  function handleCancel () {
+    dispatch('skipVersion', state.modal.version)
+    dispatch('exitModal')
+  }
+}

renderer/webtorrent.html

@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>WebTorrent Hidden Window</title>
     <style>
       body {
         background-color: #282828;
@@ -15,11 +14,9 @@
         height: 140px;
       }
     </style>
-    <script>
-      require('../build/renderer/webtorrent.js')
-    </script>
   </head>
   <body>
-    <img alt="WebTorrent" src="WebTorrent.png">
+    <script async src="webtorrent.js"></script>
+    <img src="../static/WebTorrent.png">
   </body>
 </html>

renderer/webtorrent.js

@@ -2,84 +2,48 @@
 // process from the main window.
 console.time('init')
 
-const crypto = require('crypto')
-const deepEqual = require('deep-equal')
-const defaultAnnounceList = require('create-torrent').announceList
-const electron = require('electron')
-const fs = require('fs-extra')
-const musicmetadata = require('musicmetadata')
-const networkAddress = require('network-address')
-const path = require('path')
-const WebTorrent = require('webtorrent')
-const zeroFill = require('zero-fill')
+var WebTorrent = require('webtorrent')
+var defaultAnnounceList = require('create-torrent').announceList
+var deepEqual = require('deep-equal')
+var electron = require('electron')
+var fs = require('fs-extra')
+var musicmetadata = require('musicmetadata')
+var networkAddress = require('network-address')
+var path = require('path')
 
-const crashReporter = require('../crash-reporter')
-const config = require('../config')
-const {TorrentKeyNotFoundError} = require('./lib/errors')
-const torrentPoster = require('./lib/torrent-poster')
+var crashReporter = require('../crash-reporter')
+var config = require('../config')
+var torrentPoster = require('./lib/torrent-poster')
 
 // Report when the process crashes
 crashReporter.init()
 
 // Send & receive messages from the main window
-const ipc = electron.ipcRenderer
+var ipc = electron.ipcRenderer
 
 // Force use of webtorrent trackers on all torrents
 global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
   .map((arr) => arr[0])
   .filter((url) => url.indexOf('wss://') === 0 || url.indexOf('ws://') === 0)
 
-/**
- * WebTorrent version.
- */
-const VERSION = require('../../package.json').version
-
-/**
- * Version number in Azureus-style. Generated from major and minor semver version.
- * For example:
- *   '0.16.1' -> '0016'
- *   '1.2.5' -> '0102'
- */
-const VERSION_STR = VERSION.match(/([0-9]+)/g)
-  .slice(0, 2)
-  .map((v) => zeroFill(2, v))
-  .join('')
-
-/**
- * Version prefix string (used in peer ID). WebTorrent uses the Azureus-style
- * encoding: '-', two characters for client id ('WW'), four ascii digits for version
- * number, '-', followed by random numbers.
- * For example:
- *   '-WW0102-'...
- */
-const VERSION_PREFIX = '-WD' + VERSION_STR + '-'
-
-/**
- * Generate an ephemeral peer ID each time.
- * Once there are around 2^24 = ~8 million WebTorrent Desktops online at the same time,
- * ID collisions will start happening. Birthday paradox.
- * This is fine, though. Bad peers can already clone someone else's peer ID.
- * The network is robust to occasional collisions.
- */
-const PEER_ID = Buffer.from(VERSION_PREFIX + crypto.randomBytes(6).toString('hex'))
-
 // Connect to the WebTorrent and BitTorrent networks. WebTorrent Desktop is a hybrid
 // client, as explained here: https://webtorrent.io/faq
-let client = window.client = new WebTorrent({ peerId: PEER_ID })
+var client = window.client = new WebTorrent()
 
 // WebTorrent-to-HTTP streaming sever
-let server = null
+var server = window.server = null
 
 // Used for diffing, so we only send progress updates when necessary
-let prevProgress = null
+var prevProgress = window.prevProgress = null
 
 init()
 
 function init () {
-  listenToClientEvents()
+  client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
+  client.on('error', (err) => ipc.send('wt-error', null, err.message))
 
-  ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes, selections) =>
-    startTorrenting(torrentKey, torrentID, path, fileModtimes, selections))
+  ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes) =>
+    startTorrenting(torrentKey, torrentID, path, fileModtimes))
   ipc.on('wt-stop-torrenting', (e, infoHash) =>
     stopTorrenting(infoHash))
   ipc.on('wt-create-torrent', (e, torrentKey, options) =>
@@ -90,58 +54,50 @@ function init () {
     generateTorrentPoster(torrentKey))
   ipc.on('wt-get-audio-metadata', (e, infoHash, index) =>
     getAudioMetadata(infoHash, index))
-  ipc.on('wt-start-server', (e, infoHash) =>
-    startServer(infoHash))
+  ipc.on('wt-start-server', (e, infoHash, index) =>
+    startServer(infoHash, index))
   ipc.on('wt-stop-server', (e) =>
     stopServer())
-  ipc.on('wt-select-files', (e, infoHash, selections) =>
-    selectFiles(infoHash, selections))
 
   ipc.send('ipcReadyWebTorrent')
 
-  window.addEventListener('error', (e) =>
-    ipc.send('wt-uncaught-error', {message: e.error.message, stack: e.error.stack}),
-    true)
-
   setInterval(updateTorrentProgress, 1000)
-  console.timeEnd('init')
 }
 
-function listenToClientEvents () {
-  client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
-  client.on('error', (err) => ipc.send('wt-error', null, err.message))
-}
-
-// Starts a given TorrentID, which can be an infohash, magnet URI, etc.
-// Returns a WebTorrent object. See https://git.io/vik9M
-function startTorrenting (torrentKey, torrentID, path, fileModtimes, selections) {
+// Starts a given TorrentID, which can be an infohash, magnet URI, etc. Returns WebTorrent object
+// See https://github.com/feross/webtorrent/blob/master/docs/api.md#clientaddtorrentid-opts-function-ontorrent-torrent-
+function startTorrenting (torrentKey, torrentID, path, fileModtimes) {
   console.log('starting torrent %s: %s', torrentKey, torrentID)
-
-  const torrent = client.add(torrentID, {
-    path: path,
-    fileModtimes: fileModtimes
-  })
+  var torrent
+  try {
+    torrent = client.add(torrentID, {
+      path: path,
+      fileModtimes: fileModtimes
+    })
+  } catch (err) {
+    return ipc.send('wt-error', torrentKey, err.message)
+  }
+  // If we add a duplicate magnet URI or infohash, WebTorrent returns the
+  // existing torrent object! (If we add a duplicate torrent file, it creates a
+  // new torrent object and raises an error later.) Workaround:
+  if (torrent.key) {
+    return ipc.send('wt-error', torrentKey, 'Can\'t add duplicate torrent')
+  }
   torrent.key = torrentKey
-
-  // Listen for ready event, progress notifications, etc
   addTorrentEvents(torrent)
-
-  // Only download the files the user wants, not necessarily all files
-  torrent.once('ready', () => selectFiles(torrent, selections))
-
   return torrent
 }
 
 function stopTorrenting (infoHash) {
-  const torrent = client.get(infoHash)
-  if (torrent) torrent.destroy()
+  var torrent = client.get(infoHash)
+  torrent.destroy()
 }
 
 // Create a new torrent, start seeding
 function createTorrent (torrentKey, options) {
   console.log('creating torrent', torrentKey, options)
-  const paths = options.files.map((f) => f.path)
-  const torrent = client.seed(paths, options)
+  var paths = options.files.map((f) => f.path)
+  var torrent = client.seed(paths, options)
   torrent.key = torrentKey
   addTorrentEvents(torrent)
   ipc.send('wt-new-torrent')
@@ -159,22 +115,22 @@ function addTorrentEvents (torrent) {
   torrent.on('done', torrentDone)
 
   function torrentMetadata () {
-    const info = getTorrentInfo(torrent)
+    var info = getTorrentInfo(torrent)
     ipc.send('wt-metadata', torrent.key, info)
 
     updateTorrentProgress()
   }
 
   function torrentReady () {
-    const info = getTorrentInfo(torrent)
+    var info = getTorrentInfo(torrent)
     ipc.send('wt-ready', torrent.key, info)
-    ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info)
+    ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info) // TODO: hack
 
     updateTorrentProgress()
   }
 
   function torrentDone () {
-    const info = getTorrentInfo(torrent)
+    var info = getTorrentInfo(torrent)
     ipc.send('wt-done', torrent.key, info)
 
     updateTorrentProgress()
@@ -203,23 +159,25 @@ function getTorrentFileInfo (file) {
   return {
     name: file.name,
     length: file.length,
-    path: file.path
+    path: file.path,
+    numPiecesPresent: 0,
+    numPieces: null
   }
 }
 
 // Every time we resolve a magnet URI, save the torrent file so that we never
 // have to download it again. Never ask the DHT the same question twice.
 function saveTorrentFile (torrentKey) {
-  const torrent = getTorrent(torrentKey)
+  var torrent = getTorrent(torrentKey)
   checkIfTorrentFileExists(torrent.infoHash, function (torrentPath, exists) {
-    const fileName = torrent.infoHash + '.torrent'
+    var fileName = torrent.infoHash + '.torrent'
     if (exists) {
       // We've already saved the file
       return ipc.send('wt-file-saved', torrentKey, fileName)
     }
 
     // Otherwise, save the .torrent file, under the app config folder
-    fs.mkdir(config.TORRENT_PATH, function (_) {
+    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)
@@ -232,7 +190,7 @@ function saveTorrentFile (torrentKey) {
 // Checks whether we've already resolved a given infohash to a torrent file
 // Calls back with (torrentPath, exists). Logs, does not call back on error
 function checkIfTorrentFileExists (infoHash, cb) {
-  const torrentPath = path.join(config.TORRENT_PATH, infoHash + '.torrent')
+  var torrentPath = path.join(config.CONFIG_TORRENT_PATH, infoHash + '.torrent')
   fs.exists(torrentPath, function (exists) {
     cb(torrentPath, exists)
   })
@@ -241,14 +199,14 @@ function checkIfTorrentFileExists (infoHash, cb) {
 // Save a JPG that represents a torrent.
 // Auto chooses either a frame from a video file, an image, etc
 function generateTorrentPoster (torrentKey) {
-  const torrent = getTorrent(torrentKey)
+  var torrent = getTorrent(torrentKey)
   torrentPoster(torrent, function (err, buf, extension) {
     if (err) return console.log('error generating poster: %o', err)
     // save it for next time
-    fs.mkdirp(config.POSTER_PATH, function (err) {
+    fs.mkdirp(config.CONFIG_POSTER_PATH, function (err) {
       if (err) return console.log('error creating poster dir: %o', err)
-      const posterFileName = torrent.infoHash + extension
-      const posterFilePath = path.join(config.POSTER_PATH, posterFileName)
+      var posterFileName = torrent.infoHash + extension
+      var posterFilePath = path.join(config.CONFIG_POSTER_PATH, posterFileName)
       fs.writeFile(posterFilePath, buf, function (err) {
         if (err) return console.log('error saving poster: %o', err)
         // show the poster
@@ -259,7 +217,7 @@ function generateTorrentPoster (torrentKey) {
 }
 
 function updateTorrentProgress () {
-  const progress = getTorrentProgress()
+  var progress = getTorrentProgress()
   // TODO: diff torrent-by-torrent, not once for the whole update
   if (prevProgress && deepEqual(progress, prevProgress, {strict: true})) {
     return /* don't send heavy object if it hasn't changed */
@@ -270,19 +228,19 @@ function updateTorrentProgress () {
 
 function getTorrentProgress () {
   // First, track overall progress
-  const progress = client.progress
-  const hasActiveTorrents = client.torrents.some(function (torrent) {
+  var progress = client.progress
+  var hasActiveTorrents = client.torrents.some(function (torrent) {
     return torrent.progress !== 1
   })
 
   // Track progress for every file in each torrent
   // TODO: ideally this would be tracked by WebTorrent, which could do it
   // more efficiently than looping over torrent.bitfield
-  const torrentProg = client.torrents.map(function (torrent) {
-    const fileProg = torrent.files && torrent.files.map(function (file, index) {
-      const numPieces = file._endPiece - file._startPiece + 1
-      let numPiecesPresent = 0
-      for (let piece = file._startPiece; piece <= file._endPiece; piece++) {
+  var torrentProg = client.torrents.map(function (torrent) {
+    var fileProg = torrent.files && torrent.files.map(function (file, index) {
+      var numPieces = file._endPiece - file._startPiece + 1
+      var numPiecesPresent = 0
+      for (var piece = file._startPiece; piece <= file._endPiece; piece++) {
         if (torrent.bitfield.get(piece)) numPiecesPresent++
       }
       return {
@@ -313,28 +271,28 @@ function getTorrentProgress () {
   }
 }
 
-function startServer (infoHash) {
-  const torrent = client.get(infoHash)
-  if (torrent.ready) startServerFromReadyTorrent(torrent)
-  else torrent.once('ready', () => startServerFromReadyTorrent(torrent))
+function startServer (infoHash, index) {
+  var torrent = client.get(infoHash)
+  if (torrent.ready) startServerFromReadyTorrent(torrent, index)
+  else torrent.on('ready', () => startServerFromReadyTorrent(torrent, index))
 }
 
-function startServerFromReadyTorrent (torrent, cb) {
+function startServerFromReadyTorrent (torrent, index, cb) {
   if (server) return
 
   // start the streaming torrent-to-http server
   server = torrent.createServer()
   server.listen(0, function () {
-    const port = server.address().port
-    const urlSuffix = ':' + port
-    const info = {
+    var port = server.address().port
+    var urlSuffix = ':' + port + '/' + index
+    var info = {
       torrentKey: torrent.key,
       localURL: 'http://localhost' + urlSuffix,
       networkURL: 'http://' + networkAddress() + urlSuffix
     }
 
     ipc.send('wt-server-running', info)
-    ipc.send('wt-server-' + torrent.infoHash, info)
+    ipc.send('wt-server-' + torrent.infoHash, info) // TODO: hack
   })
 }
 
@@ -345,8 +303,8 @@ function stopServer () {
 }
 
 function getAudioMetadata (infoHash, index) {
-  const torrent = client.get(infoHash)
-  const file = torrent.files[index]
+  var torrent = client.get(infoHash)
+  var file = torrent.files[index]
   musicmetadata(file.createReadStream(), function (err, info) {
     if (err) return
     console.log('got audio metadata for %s: %o', file.name, info)
@@ -354,69 +312,14 @@ function getAudioMetadata (infoHash, index) {
   })
 }
 
-function selectFiles (torrentOrInfoHash, selections) {
-  // Get the torrent object
-  let torrent
-  if (typeof torrentOrInfoHash === 'string') {
-    torrent = client.get(torrentOrInfoHash)
-  } else {
-    torrent = torrentOrInfoHash
-  }
-  if (!torrent) {
-    throw new Error('selectFiles: missing torrent ' + torrentOrInfoHash)
-  }
-
-  // Selections not specified?
-  // Load all files. We still need to replace the default whole-torrent
-  // selection with individual selections for each file, so we can
-  // select/deselect files later on
-  if (!selections) {
-    selections = torrent.files.map((x) => true)
-  }
-
-  // Selections specified incorrectly?
-  if (selections.length !== torrent.files.length) {
-    throw new Error('got ' + selections.length + ' file selections, ' +
-      'but the torrent contains ' + torrent.files.length + ' files')
-  }
-
-  // Remove default selection (whole torrent)
-  torrent.deselect(0, torrent.pieces.length - 1, false)
-
-  // Add selections (individual files)
-  for (let i = 0; i < selections.length; i++) {
-    const file = torrent.files[i]
-    if (selections[i]) {
-      file.select()
-    } else {
-      console.log('deselecting file ' + i + ' of torrent ' + torrent.name)
-      file.deselect()
-    }
-  }
-}
-
 // Gets a WebTorrent handle by torrentKey
 // Throws an Error if we're not currently torrenting anything w/ that key
 function getTorrent (torrentKey) {
-  const ret = client.torrents.find((x) => x.key === torrentKey)
-  if (!ret) throw new TorrentKeyNotFoundError(torrentKey)
+  var ret = client.torrents.find((x) => x.key === torrentKey)
+  if (!ret) throw new Error('missing torrent key ' + torrentKey)
   return ret
 }
 
 function onError (err) {
   console.log(err)
 }
-
-// TODO: remove this once the following bugs are fixed:
-// https://bugs.chromium.org/p/chromium/issues/detail?id=490143
-// https://github.com/electron/electron/issues/7212
-window.testOfflineMode = function () {
-  console.log('Test, going OFFLINE')
-  client = window.client = new WebTorrent({
-    peerId: PEER_ID,
-    tracker: false,
-    dht: false,
-    webSeeds: false
-  })
-  listenToClientEvents()
-}

src/.babelrc

@@ -1,8 +0,0 @@
-{
-  "plugins": [
-    "syntax-jsx",
-    "transform-es2015-destructuring",
-    "transform-object-rest-spread",
-    "transform-react-jsx"
-  ]
-}

src/config.js

@@ -1,182 +0,0 @@
-const appConfig = require('application-config')('WebTorrent')
-const fs = require('fs')
-const path = require('path')
-const electron = require('electron')
-
-const APP_NAME = 'WebTorrent'
-const APP_TEAM = 'WebTorrent, LLC'
-const APP_VERSION = require('../package.json').version
-
-const IS_TEST = isTest()
-const PORTABLE_PATH = IS_TEST
-  ? path.join(__dirname, '../test/tempTestData')
-  : path.join(path.dirname(process.execPath), 'Portable Settings')
-const IS_PORTABLE = isPortable()
-const IS_PRODUCTION = isProduction()
-
-console.log('Production: %s portable: %s test: %s',
-  IS_PRODUCTION, IS_PORTABLE, IS_TEST)
-if (IS_PORTABLE) console.log('Portable path: %s', PORTABLE_PATH)
-
-module.exports = {
-  ANNOUNCEMENT_URL: 'https://webtorrent.io/desktop/announcement',
-  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update',
-  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
-  TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',
-
-  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)',
-
-  CONFIG_PATH: getConfigPath(),
-
-  DEFAULT_TORRENTS: [
-    {
-      testID: 'bbb',
-      name: 'Big Buck Bunny',
-      posterFileName: 'bigBuckBunny.jpg',
-      torrentFileName: 'bigBuckBunny.torrent'
-    },
-    {
-      testID: 'cosmos',
-      name: 'Cosmos Laundromat (Preview)',
-      posterFileName: 'cosmosLaundromat.jpg',
-      torrentFileName: 'cosmosLaundromat.torrent'
-    },
-    {
-      testID: 'sintel',
-      name: 'Sintel',
-      posterFileName: 'sintel.jpg',
-      torrentFileName: 'sintel.torrent'
-    },
-    {
-      testID: 'tears',
-      name: 'Tears of Steel',
-      posterFileName: 'tearsOfSteel.jpg',
-      torrentFileName: 'tearsOfSteel.torrent'
-    },
-    {
-      testID: 'wired',
-      name: 'The WIRED CD - Rip. Sample. Mash. Share.',
-      posterFileName: 'wiredCd.jpg',
-      torrentFileName: 'wiredCd.torrent'
-    }
-  ],
-
-  DELAYED_INIT: 3000 /* 3 seconds */,
-
-  DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),
-
-  GITHUB_URL: 'https://github.com/feross/webtorrent-desktop',
-  GITHUB_URL_ISSUES: 'https://github.com/feross/webtorrent-desktop/issues',
-  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/feross/webtorrent-desktop/master',
-
-  HOME_PAGE_URL: 'https://webtorrent.io',
-
-  IS_PORTABLE: IS_PORTABLE,
-  IS_PRODUCTION: IS_PRODUCTION,
-  IS_TEST: IS_TEST,
-
-  OS_SYSARCH: is64BitOperatingSystem() ? 'x64' : 'ia32',
-
-  POSTER_PATH: path.join(getConfigPath(), 'Posters'),
-  ROOT_PATH: path.join(__dirname, '..'),
-  STATIC_PATH: path.join(__dirname, '..', 'static'),
-  TORRENT_PATH: path.join(getConfigPath(), 'Torrents'),
-
-  WINDOW_ABOUT: 'file://' + path.join(__dirname, '..', 'static', 'about.html'),
-  WINDOW_MAIN: 'file://' + path.join(__dirname, '..', 'static', 'main.html'),
-  WINDOW_WEBTORRENT: 'file://' + path.join(__dirname, '..', 'static', 'webtorrent.html'),
-
-  WINDOW_MIN_HEIGHT: 38 + (120 * 2), // header height + 2 torrents
-  WINDOW_MIN_WIDTH: 425
-}
-
-function getConfigPath () {
-  if (IS_PORTABLE) {
-    return PORTABLE_PATH
-  } else {
-    return path.dirname(appConfig.filePath)
-  }
-}
-
-function getDefaultDownloadPath () {
-  if (!process || !process.type) {
-    return ''
-  } else if (IS_PORTABLE) {
-    return path.join(getConfigPath(), 'Downloads')
-  } else {
-    return getPath('downloads')
-  }
-}
-
-function getPath (key) {
-  if (process.type === 'renderer') {
-    return electron.remote.app.getPath(key)
-  } else {
-    return electron.app.getPath(key)
-  }
-}
-
-function isTest () {
-  return process.env.NODE_ENV === 'test'
-}
-
-function isPortable () {
-  if (IS_TEST) {
-    return true
-  }
-  try {
-    return process.platform === 'win32' && IS_PRODUCTION && !!fs.statSync(PORTABLE_PATH)
-  } catch (err) {
-    return false
-  }
-}
-
-function isProduction () {
-  if (!process.versions.electron) {
-    return false
-  }
-  if (process.platform === 'darwin') {
-    return !/\/Electron\.app\//.test(process.execPath)
-  }
-  if (process.platform === 'win32') {
-    return !/\\electron\.exe$/.test(process.execPath)
-  }
-  if (process.platform === 'linux') {
-    return !/\/electron$/.test(process.execPath)
-  }
-}
-
-/**
- * Returns the operating system's CPU architecture. This is different than
- * `process.arch` which returns the architecture the binary was compiled for.
- *
- * On Windows, the most reliable way to detect a 64-bit OS from within a 32-bit
- * app is based on the presence of a WOW64 file: %SystemRoot%\SysNative.
- *
- * Background: https://twitter.com/feross/status/776949077208510464
- */
-function is64BitOperatingSystem () {
-  // This is a 64-bit binary, so the OS clearly supports 64-bit apps
-  if (process.arch === 'x64') return true
-
-  let useEnv = false
-  try {
-    useEnv = !!(process.env.SYSTEMROOT && fs.statSync(process.env.SYSTEMROOT))
-  } catch (err) {}
-
-  let sysRoot = useEnv ? process.env.SYSTEMROOT : 'C:\\Windows'
-
-  // If %SystemRoot%\SysNative exists, we are in a WOW64 FS Redirected application.
-  let isWOW64 = false
-  try {
-    isWOW64 = !!fs.statSync(path.join(sysRoot, 'sysnative'))
-  } catch (err) {}
-
-  return isWOW64
-}

src/main/announcement.js

@@ -1,57 +0,0 @@
-module.exports = {
-  init
-}
-
-const electron = require('electron')
-
-const config = require('../config')
-const log = require('./log')
-
-const ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
-  '?version=' + config.APP_VERSION +
-  '&platform=' + process.platform
-
-/**
- * In certain situations, the WebTorrent team may need to show an announcement to
- * all WebTorrent Desktop users. For example: a security notice, or an update
- * notification (if the auto-updater stops working).
- *
- * When there is an announcement, the `ANNOUNCEMENT_URL` endpoint should return an
- * HTTP 200 status code with a JSON object like this:
- *
- *   {
- *     "title": "WebTorrent Desktop Announcement",
- *     "message": "Security Issue in v0.xx",
- *     "detail": "Please update to v0.xx as soon as possible..."
- *   }
- */
-function init () {
-  const get = require('simple-get')
-  get.concat(ANNOUNCEMENT_URL, onResponse)
-}
-
-function onResponse (err, res, data) {
-  if (err) return log(`Failed to retrieve announcement: ${err.message}`)
-  if (res.statusCode !== 200) return log('No announcement available')
-
-  try {
-    data = JSON.parse(data.toString())
-  } catch (err) {
-    // Support plaintext announcement messages, using a default title.
-    data = {
-      title: 'WebTorrent Desktop Announcement',
-      message: data.toString(),
-      detail: data.toString()
-    }
-  }
-
-  electron.dialog.showMessageBox({
-    type: 'info',
-    buttons: ['OK'],
-    title: data.title,
-    message: data.message,
-    detail: data.detail
-  }, noop)
-}
-
-function noop () {}

src/main/dialog.js

@@ -1,124 +0,0 @@
-module.exports = {
-  openSeedFile,
-  openSeedDirectory,
-  openTorrentFile,
-  openTorrentAddress,
-  openFiles
-}
-
-const electron = require('electron')
-
-const log = require('./log')
-const windows = require('./windows')
-
-/**
- * Show open dialog to create a single-file torrent.
- */
-function openSeedFile () {
-  if (!windows.main.win) return
-  log('openSeedFile')
-  const opts = {
-    title: 'Select a file for the torrent.',
-    properties: [ 'openFile' ]
-  }
-  showOpenSeed(opts)
-}
-
-/*
- * Show open dialog to create a single-file or single-directory torrent. On
- * Windows and Linux, open dialogs are for files *or* directories only, not both,
- * so this function shows a directory dialog on those platforms.
- */
-function openSeedDirectory () {
-  if (!windows.main.win) return
-  log('openSeedDirectory')
-  const opts = process.platform === 'darwin'
-    ? {
-      title: 'Select a file or folder for the torrent.',
-      properties: [ 'openFile', 'openDirectory' ]
-    }
-    : {
-      title: 'Select a folder for the torrent.',
-      properties: [ 'openDirectory' ]
-    }
-  showOpenSeed(opts)
-}
-
-/*
- * Show flexible open dialog that supports selecting .torrent files to add, or
- * a file or folder to create a single-file or single-directory torrent.
- */
-function openFiles () {
-  if (!windows.main.win) return
-  log('openFiles')
-  const opts = process.platform === 'darwin'
-    ? {
-      title: 'Select a file or folder to add.',
-      properties: [ 'openFile', 'openDirectory' ]
-    }
-    : {
-      title: 'Select a file to add.',
-      properties: [ 'openFile' ]
-    }
-  setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-    resetTitle()
-    if (!Array.isArray(selectedPaths)) return
-    windows.main.dispatch('onOpen', selectedPaths)
-  })
-}
-
-/*
- * Show open dialog to open a .torrent file.
- */
-function openTorrentFile () {
-  if (!windows.main.win) return
-  log('openTorrentFile')
-  const opts = {
-    title: 'Select a .torrent file.',
-    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
-    properties: [ 'openFile', 'multiSelections' ]
-  }
-  setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-    resetTitle()
-    if (!Array.isArray(selectedPaths)) return
-    selectedPaths.forEach(function (selectedPath) {
-      windows.main.dispatch('addTorrent', selectedPath)
-    })
-  })
-}
-
-/*
- * Show modal dialog to open a torrent URL (magnet uri, http torrent link, etc.)
- */
-function openTorrentAddress () {
-  log('openTorrentAddress')
-  windows.main.dispatch('openTorrentAddress')
-}
-
-/**
- * Dialogs on do not show a title on Mac, so the window title is used instead.
- */
-function setTitle (title) {
-  if (process.platform === 'darwin') {
-    windows.main.dispatch('setTitle', title)
-  }
-}
-
-function resetTitle () {
-  windows.main.dispatch('resetTitle')
-}
-
-/**
- * Pops up an Open File dialog with the given options.
- * After the user selects files / folders, shows the Create Torrent page.
- */
-function showOpenSeed (opts) {
-  setTitle(opts.title)
-  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-    resetTitle()
-    if (!Array.isArray(selectedPaths)) return
-    windows.main.dispatch('showCreateTorrent', selectedPaths)
-  })
-}

src/main/dock.js

@@ -1,59 +0,0 @@
-module.exports = {
-  downloadFinished,
-  init,
-  setBadge
-}
-
-const {app, Menu} = require('electron')
-
-const dialog = require('./dialog')
-const log = require('./log')
-
-/**
- * Add a right-click menu to the dock icon. (Mac)
- */
-function init () {
-  if (!app.dock) return
-  const menu = Menu.buildFromTemplate(getMenuTemplate())
-  app.dock.setMenu(menu)
-}
-
-/**
- * Bounce the Downloads stack if `path` is inside the Downloads folder. (Mac)
- */
-function downloadFinished (path) {
-  if (!app.dock) return
-  log(`downloadFinished: ${path}`)
-  app.dock.downloadFinished(path)
-}
-
-/**
- * Display a counter badge for the app. (Mac, Linux)
- */
-function setBadge (count) {
-  if (process.platform === 'darwin' ||
-      process.platform === 'linux' && app.isUnityRunning()) {
-    log(`setBadge: ${count}`)
-    app.setBadgeCount(Number(count))
-  }
-}
-
-function getMenuTemplate () {
-  return [
-    {
-      label: 'Create New Torrent...',
-      accelerator: 'CmdOrCtrl+N',
-      click: () => dialog.openSeedDirectory()
-    },
-    {
-      label: 'Open Torrent File...',
-      accelerator: 'CmdOrCtrl+O',
-      click: () => dialog.openTorrentFile()
-    },
-    {
-      label: 'Open Torrent Address...',
-      accelerator: 'CmdOrCtrl+U',
-      click: () => dialog.openTorrentAddress()
-    }
-  ]
-}

src/main/external-player.js

@@ -1,77 +0,0 @@
-module.exports = {
-  spawn,
-  kill,
-  checkInstall
-}
-
-const cp = require('child_process')
-const path = require('path')
-const vlcCommand = require('vlc-command')
-
-const log = require('./log')
-const windows = require('./windows')
-
-// holds a ChildProcess while we're playing a video in an external player, null otherwise
-let proc = null
-
-function checkInstall (playerPath, cb) {
-  // check for VLC if external player has not been specified by the user
-  // otherwise assume the player is installed
-  if (playerPath == null) return vlcCommand((err) => cb(!err))
-  process.nextTick(() => cb(true))
-}
-
-function spawn (playerPath, url, title) {
-  if (playerPath != null) return spawnExternal(playerPath, [url])
-
-  // Try to find and use VLC if external player is not specified
-  vlcCommand(function (err, vlcPath) {
-    if (err) return windows.main.dispatch('externalPlayerNotFound')
-    const args = [
-      '--play-and-exit',
-      '--video-on-top',
-      '--quiet',
-      `--meta-title=${JSON.stringify(title)}`,
-      url
-    ]
-    spawnExternal(vlcPath, args)
-  })
-}
-
-function kill () {
-  if (!proc) return
-  log('Killing external player, pid ' + proc.pid)
-  proc.kill('SIGKILL') // kill -9
-  proc = null
-}
-
-function spawnExternal (playerPath, args) {
-  log('Running external media player:', playerPath + ' ' + args.join(' '))
-
-  if (path.extname(playerPath) === '.app') {
-    // Mac: Use executable in packaged .app bundle
-    playerPath += '/Contents/MacOS/' + path.basename(playerPath, '.app')
-  }
-
-  proc = cp.spawn(playerPath, args, {stdio: 'ignore'})
-
-  // If it works, close the modal after a second
-  const closeModalTimeout = setTimeout(() =>
-    windows.main.dispatch('exitModal'), 1000)
-
-  proc.on('close', function (code) {
-    clearTimeout(closeModalTimeout)
-    if (!proc) return // Killed
-    log('External player exited with code ', code)
-    if (code === 0) {
-      windows.main.dispatch('backToList')
-    } else {
-      windows.main.dispatch('externalPlayerNotFound')
-    }
-    proc = null
-  })
-
-  proc.on('error', function (e) {
-    log('External player error', e)
-  })
-}

src/main/index.js

@@ -1,188 +0,0 @@
-console.time('init')
-
-const electron = require('electron')
-const app = electron.app
-const ipcMain = electron.ipcMain
-
-const announcement = require('./announcement')
-const config = require('../config')
-const crashReporter = require('../crash-reporter')
-const dialog = require('./dialog')
-const dock = require('./dock')
-const ipc = require('./ipc')
-const log = require('./log')
-const menu = require('./menu')
-const squirrelWin32 = require('./squirrel-win32')
-const tray = require('./tray')
-const updater = require('./updater')
-const userTasks = require('./user-tasks')
-const windows = require('./windows')
-
-let shouldQuit = false
-let argv = sliceArgv(process.argv)
-
-// Start the app without showing the main window when auto launching on login
-// (On Windows and Linux, we get a flag. On MacOS, we get special API.)
-const hidden = argv.includes('--hidden') ||
-  (process.platform === 'darwin' && app.getLoginItemSettings().wasOpenedAsHidden)
-
-if (config.IS_PRODUCTION) {
-  // When Electron is running in production mode (packaged app), then run React
-  // in production mode too.
-  process.env.NODE_ENV = 'production'
-}
-
-if (process.platform === 'win32') {
-  shouldQuit = squirrelWin32.handleEvent(argv[0])
-  argv = argv.filter((arg) => !arg.includes('--squirrel'))
-}
-
-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()
-  }
-}
-
-if (!shouldQuit) {
-  init()
-}
-
-function init () {
-  if (config.IS_PORTABLE) {
-    app.setPath('userData', config.CONFIG_PATH)
-  }
-
-  let isReady = false // app ready, windows can be created
-  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.once('will-finish-launching', function () {
-    crashReporter.init()
-  })
-
-  app.on('ready', function () {
-    isReady = true
-
-    windows.main.init({hidden: hidden})
-    windows.webtorrent.init()
-    menu.init()
-
-    // To keep app startup fast, some code is delayed.
-    setTimeout(delayedInit, config.DELAYED_INIT)
-
-    // Report uncaught exceptions
-    process.on('uncaughtException', (err) => {
-      console.error(err)
-      const error = {message: err.message, stack: err.stack}
-      windows.main.dispatch('uncaughtError', 'main', error)
-    })
-  })
-
-  app.once('ipcReady', function () {
-    log('Command line args:', argv)
-    processArgv(argv)
-    console.timeEnd('init')
-  })
-
-  app.on('before-quit', function (e) {
-    if (app.isQuitting) return
-
-    app.isQuitting = true
-    e.preventDefault()
-    windows.main.dispatch('saveState') // try to save state on exit
-    ipcMain.once('savedState', () => app.quit())
-    setTimeout(() => {
-      console.error('Saving state took too long. Quitting.')
-      app.quit()
-    }, 2000) // quit after 2 secs, at most
-  })
-
-  app.on('activate', function () {
-    if (isReady) windows.main.show()
-  })
-}
-
-function delayedInit () {
-  announcement.init()
-  dock.init()
-  tray.init()
-  updater.init()
-  userTasks.init()
-}
-
-function onOpen (e, torrentId) {
-  e.preventDefault()
-
-  if (app.ipcReady) {
-    // 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(() => windows.main.show(), 100)
-
-    processArgv([ torrentId ])
-  } else {
-    argv.push(torrentId)
-  }
-}
-
-function onAppOpen (newArgv) {
-  newArgv = sliceArgv(newArgv)
-
-  if (app.ipcReady) {
-    log('Second app instance opened, but was prevented:', newArgv)
-    windows.main.show()
-
-    processArgv(newArgv)
-  } else {
-    argv.push(...newArgv)
-  }
-}
-
-// Remove leading args.
-// Production: 1 arg, eg: /Applications/WebTorrent.app/Contents/MacOS/WebTorrent
-// Development: 2 args, eg: electron .
-// Test: 4 args, eg: electron -r .../mocks.js .
-function sliceArgv (argv) {
-  return argv.slice(config.IS_PRODUCTION ? 1
-    : config.IS_TEST ? 4
-    : 2)
-}
-
-function processArgv (argv) {
-  let torrentIds = []
-  argv.forEach(function (arg) {
-    if (arg === '-n') {
-      dialog.openSeedDirectory()
-    } else if (arg === '-o') {
-      dialog.openTorrentFile()
-    } else if (arg === '-u') {
-      dialog.openTorrentAddress()
-    } else if (arg === '--hidden') {
-      // Ignore hidden argument, already being handled
-    } else if (arg.startsWith('-psn')) {
-      // Ignore Mac launchd "process serial number" argument
-      // Issue: https://github.com/feross/webtorrent-desktop/issues/214
-    } else if (arg.startsWith('--')) {
-      // Ignore Spectron flags
-    } else if (arg === 'data:,') {
-      // Ignore weird Spectron argument
-    } else if (arg !== '.') {
-      // Ignore '.' argument, which gets misinterpreted as a torrent id, when a
-      // development copy of WebTorrent is started while a production version is
-      // running.
-      torrentIds.push(arg)
-    }
-  })
-  if (torrentIds.length > 0) {
-    windows.main.dispatch('onOpen', torrentIds)
-  }
-}

src/main/ipc.js

@@ -1,178 +0,0 @@
-module.exports = {
-  init
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-const dialog = require('./dialog')
-const dock = require('./dock')
-const handlers = require('./handlers')
-const log = require('./log')
-const menu = require('./menu')
-const powerSaveBlocker = require('./power-save-blocker')
-const shell = require('./shell')
-const shortcuts = require('./shortcuts')
-const externalPlayer = require('./external-player')
-const windows = require('./windows')
-const thumbar = require('./thumbar')
-const startup = require('./startup')
-
-// Messages from the main process, to be sent once the WebTorrent process starts
-const messageQueueMainToWebTorrent = []
-
-function init () {
-  const ipc = electron.ipcMain
-
-  ipc.once('ipcReady', function (e) {
-    app.ipcReady = true
-    app.emit('ipcReady')
-  })
-
-  ipc.once('ipcReadyWebTorrent', function (e) {
-    app.ipcReadyWebTorrent = true
-    log('sending %d queued messages from the main win to the webtorrent window',
-      messageQueueMainToWebTorrent.length)
-    messageQueueMainToWebTorrent.forEach(function (message) {
-      windows.webtorrent.send(message.name, ...message.args)
-      log('webtorrent: sent queued %s', message.name)
-    })
-  })
-
-  /**
-   * Dialog
-   */
-
-  ipc.on('openTorrentFile', () => dialog.openTorrentFile())
-  ipc.on('openFiles', () => dialog.openFiles())
-
-  /**
-   * Dock
-   */
-
-  ipc.on('setBadge', (e, ...args) => dock.setBadge(...args))
-  ipc.on('downloadFinished', (e, ...args) => dock.downloadFinished(...args))
-
-  /**
-   * Events
-   */
-
-  ipc.on('onPlayerOpen', function () {
-    menu.togglePlaybackControls(true)
-    powerSaveBlocker.enable()
-    shortcuts.enable()
-    thumbar.enable()
-  })
-
-  ipc.on('onPlayerUpdate', function (e, ...args) {
-    menu.onPlayerUpdate(...args)
-    thumbar.onPlayerUpdate(...args)
-  })
-
-  ipc.on('onPlayerClose', function () {
-    menu.togglePlaybackControls(false)
-    powerSaveBlocker.disable()
-    shortcuts.disable()
-    thumbar.disable()
-  })
-
-  ipc.on('onPlayerPlay', function () {
-    powerSaveBlocker.enable()
-    thumbar.onPlayerPlay()
-  })
-
-  ipc.on('onPlayerPause', function () {
-    powerSaveBlocker.disable()
-    thumbar.onPlayerPause()
-  })
-
-  /**
-   * Shell
-   */
-
-  ipc.on('openItem', (e, ...args) => shell.openItem(...args))
-  ipc.on('showItemInFolder', (e, ...args) => shell.showItemInFolder(...args))
-  ipc.on('moveItemToTrash', (e, ...args) => shell.moveItemToTrash(...args))
-
-  /**
-   * File handlers
-   */
-
-  ipc.on('setDefaultFileHandler', (e, flag) => {
-    if (flag) handlers.install()
-    else handlers.uninstall()
-  })
-
-  /**
-   * Auto start on login
-   */
-
-  ipc.on('setStartup', (e, flag) => {
-    if (flag) startup.install()
-    else startup.uninstall()
-  })
-
-  /**
-   * Windows: Main
-   */
-
-  const main = windows.main
-
-  ipc.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
-  ipc.on('setBounds', (e, ...args) => main.setBounds(...args))
-  ipc.on('setProgress', (e, ...args) => main.setProgress(...args))
-  ipc.on('setTitle', (e, ...args) => main.setTitle(...args))
-  ipc.on('show', () => main.show())
-  ipc.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
-  ipc.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
-
-  /**
-   * External Media Player
-   */
-
-  ipc.on('checkForExternalPlayer', function (e, path) {
-    externalPlayer.checkInstall(path, function (isInstalled) {
-      windows.main.send('checkForExternalPlayer', isInstalled)
-    })
-  })
-
-  ipc.on('openExternalPlayer', (e, ...args) => {
-    menu.togglePlaybackControls(false)
-    thumbar.disable()
-    externalPlayer.spawn(...args)
-  })
-
-  ipc.on('quitExternalPlayer', () => externalPlayer.kill())
-
-  /**
-   * Message passing
-   */
-
-  const oldEmit = ipc.emit
-  ipc.emit = function (name, e, ...args) {
-    // Relay messages between the main window and the WebTorrent hidden window
-    if (name.startsWith('wt-') && !app.isQuitting) {
-      if (e.sender.browserWindowOptions.title === 'webtorrent-hidden-window') {
-        // Send message to main window
-        windows.main.send(name, ...args)
-        log('webtorrent: got %s', name)
-      } else if (app.ipcReadyWebTorrent) {
-        // Send message to webtorrent window
-        windows.webtorrent.send(name, ...args)
-        log('webtorrent: sent %s', name)
-      } else {
-        // Queue message for webtorrent window, it hasn't finished loading yet
-        messageQueueMainToWebTorrent.push({
-          name: name,
-          args: args
-        })
-        log('webtorrent: queueing %s', name)
-      }
-      return
-    }
-
-    // Emit all other events normally
-    oldEmit.call(ipc, name, e, ...args)
-  }
-}

src/main/menu.js

@@ -1,400 +0,0 @@
-module.exports = {
-  init,
-  togglePlaybackControls,
-  setWindowFocus,
-  setAllowNav,
-  onPlayerUpdate,
-  onToggleAlwaysOnTop,
-  onToggleFullScreen
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-const config = require('../config')
-const dialog = require('./dialog')
-const shell = require('./shell')
-const windows = require('./windows')
-
-let menu = null
-
-function init () {
-  menu = electron.Menu.buildFromTemplate(getMenuTemplate())
-  electron.Menu.setApplicationMenu(menu)
-}
-
-function togglePlaybackControls (flag) {
-  getMenuItem('Play/Pause').enabled = flag
-  getMenuItem('Skip Next').enabled = flag
-  getMenuItem('Skip Previous').enabled = flag
-  getMenuItem('Increase Volume').enabled = flag
-  getMenuItem('Decrease Volume').enabled = flag
-  getMenuItem('Step Forward').enabled = flag
-  getMenuItem('Step Backward').enabled = flag
-  getMenuItem('Increase Speed').enabled = flag
-  getMenuItem('Decrease Speed').enabled = flag
-  getMenuItem('Add Subtitles File...').enabled = flag
-
-  if (flag === false) {
-    getMenuItem('Skip Next').enabled = false
-    getMenuItem('Skip Previous').enabled = false
-  }
-}
-
-function onPlayerUpdate (hasNext, hasPrevious) {
-  getMenuItem('Skip Next').enabled = hasNext
-  getMenuItem('Skip Previous').enabled = hasPrevious
-}
-
-function setWindowFocus (flag) {
-  getMenuItem('Full Screen').enabled = flag
-  getMenuItem('Float on Top').enabled = flag
-}
-
-// Disallow opening more screens on top of the current one.
-function setAllowNav (flag) {
-  getMenuItem('Preferences').enabled = flag
-  if (process.platform === 'darwin') {
-    getMenuItem('Create New Torrent...').enabled = flag
-  } else {
-    getMenuItem('Create New Torrent from Folder...').enabled = flag
-    getMenuItem('Create New Torrent from File...').enabled = flag
-  }
-}
-
-function onToggleAlwaysOnTop (flag) {
-  getMenuItem('Float on Top').checked = flag
-}
-
-function onToggleFullScreen (flag) {
-  getMenuItem('Full Screen').checked = flag
-}
-
-function getMenuItem (label) {
-  for (let i = 0; i < menu.items.length; i++) {
-    const menuItem = menu.items[i].submenu.items.find(function (item) {
-      return item.label === label
-    })
-    if (menuItem) return menuItem
-  }
-}
-
-function getMenuTemplate () {
-  const template = [
-    {
-      label: 'File',
-      submenu: [
-        {
-          label: process.platform === 'darwin'
-            ? 'Create New Torrent...'
-            : 'Create New Torrent from Folder...',
-          accelerator: 'CmdOrCtrl+N',
-          click: () => dialog.openSeedDirectory()
-        },
-        {
-          label: 'Open Torrent File...',
-          accelerator: 'CmdOrCtrl+O',
-          click: () => dialog.openTorrentFile()
-        },
-        {
-          label: 'Open Torrent Address...',
-          accelerator: 'CmdOrCtrl+U',
-          click: () => dialog.openTorrentAddress()
-        },
-        {
-          type: 'separator'
-        },
-        {
-          role: 'close'
-        }
-      ]
-    },
-    {
-      label: 'Edit',
-      submenu: [
-        {
-          role: 'undo'
-        },
-        {
-          role: 'redo'
-        },
-        {
-          type: 'separator'
-        },
-        {
-          role: 'cut'
-        },
-        {
-          role: 'copy'
-        },
-        {
-          label: 'Paste Torrent Address',
-          role: 'paste'
-        },
-        {
-          role: 'delete'
-        },
-        {
-          role: 'selectall'
-        }
-      ]
-    },
-    {
-      label: 'View',
-      submenu: [
-        {
-          label: 'Full Screen',
-          type: 'checkbox',
-          accelerator: process.platform === 'darwin'
-            ? 'Ctrl+Command+F'
-            : 'F11',
-          click: () => windows.main.toggleFullScreen()
-        },
-        {
-          label: 'Float on Top',
-          type: 'checkbox',
-          click: () => windows.main.toggleAlwaysOnTop()
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Go Back',
-          accelerator: 'Esc',
-          click: () => windows.main.dispatch('escapeBack')
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Developer',
-          submenu: [
-            {
-              label: 'Developer Tools',
-              accelerator: process.platform === 'darwin'
-                ? 'Alt+Command+I'
-                : 'Ctrl+Shift+I',
-              click: () => windows.main.toggleDevTools()
-            },
-            {
-              label: 'Show WebTorrent Process',
-              accelerator: process.platform === 'darwin'
-                ? 'Alt+Command+P'
-                : 'Ctrl+Shift+P',
-              click: () => windows.webtorrent.toggleDevTools()
-            }
-          ]
-        }
-      ]
-    },
-    {
-      label: 'Playback',
-      submenu: [
-        {
-          label: 'Play/Pause',
-          accelerator: 'Space',
-          click: () => windows.main.dispatch('playPause'),
-          enabled: false
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Skip Next',
-          accelerator: 'N',
-          click: () => windows.main.dispatch('nextTrack'),
-          enabled: false
-        },
-        {
-          label: 'Skip Previous',
-          accelerator: 'P',
-          click: () => windows.main.dispatch('previousTrack'),
-          enabled: false
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Increase Volume',
-          accelerator: 'CmdOrCtrl+Up',
-          click: () => windows.main.dispatch('changeVolume', 0.1),
-          enabled: false
-        },
-        {
-          label: 'Decrease Volume',
-          accelerator: 'CmdOrCtrl+Down',
-          click: () => windows.main.dispatch('changeVolume', -0.1),
-          enabled: false
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Step Forward',
-          accelerator: process.platform === 'darwin'
-            ? 'CmdOrCtrl+Alt+Right'
-            : 'Alt+Right',
-          click: () => windows.main.dispatch('skip', 10),
-          enabled: false
-        },
-        {
-          label: 'Step Backward',
-          accelerator: process.platform === 'darwin'
-            ? 'CmdOrCtrl+Alt+Left'
-            : 'Alt+Left',
-          click: () => windows.main.dispatch('skip', -10),
-          enabled: false
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Increase Speed',
-          accelerator: 'CmdOrCtrl+=',
-          click: () => windows.main.dispatch('changePlaybackRate', 1),
-          enabled: false
-        },
-        {
-          label: 'Decrease Speed',
-          accelerator: 'CmdOrCtrl+-',
-          click: () => windows.main.dispatch('changePlaybackRate', -1),
-          enabled: false
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Add Subtitles File...',
-          click: () => windows.main.dispatch('openSubtitles'),
-          enabled: false
-        }
-      ]
-    },
-    {
-      label: 'Help',
-      role: 'help',
-      submenu: [
-        {
-          label: 'Learn more about ' + config.APP_NAME,
-          click: () => shell.openExternal(config.HOME_PAGE_URL)
-        },
-        {
-          label: 'Contribute on GitHub',
-          click: () => shell.openExternal(config.GITHUB_URL)
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Report an Issue...',
-          click: () => shell.openExternal(config.GITHUB_URL_ISSUES)
-        }
-      ]
-    }
-  ]
-
-  if (process.platform === 'darwin') {
-    // Add WebTorrent app menu (Mac)
-    template.unshift({
-      label: config.APP_NAME,
-      submenu: [
-        {
-          role: 'about'
-        },
-        {
-          type: 'separator'
-        },
-        {
-          label: 'Preferences',
-          accelerator: 'Cmd+,',
-          click: () => windows.main.dispatch('preferences')
-        },
-        {
-          type: 'separator'
-        },
-        {
-          role: 'services',
-          submenu: []
-        },
-        {
-          type: 'separator'
-        },
-        {
-          role: 'hide'
-        },
-        {
-          role: 'hideothers'
-        },
-        {
-          role: 'unhide'
-        },
-        {
-          type: 'separator'
-        },
-        {
-          role: 'quit'
-        }
-      ]
-    })
-
-    // Add Window menu (Mac)
-    template.splice(5, 0, {
-      role: 'window',
-      submenu: [
-        {
-          role: 'minimize'
-        },
-        {
-          type: 'separator'
-        },
-        {
-          role: 'front'
-        }
-      ]
-    })
-  }
-
-  // On Windows and Linux, open dialogs do not support selecting both files and
-  // folders and files, so add an extra menu item so there is one for each type.
-  if (process.platform === 'linux' || process.platform === 'win32') {
-    // File menu (Windows, Linux)
-    template[0].submenu.unshift({
-      label: 'Create New Torrent from File...',
-      click: () => dialog.openSeedFile()
-    })
-
-    // Edit menu (Windows, Linux)
-    template[1].submenu.push(
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Preferences',
-        accelerator: 'CmdOrCtrl+,',
-        click: () => windows.main.dispatch('preferences')
-      })
-
-    // Help menu (Windows, Linux)
-    template[4].submenu.push(
-      {
-        type: 'separator'
-      },
-      {
-        label: 'About ' + config.APP_NAME,
-        click: () => windows.about.init()
-      }
-    )
-  }
-  // Add "File > Quit" menu item so Linux distros where the system tray icon is
-  // missing will have a way to quit the app.
-  if (process.platform === 'linux') {
-    // File menu (Linux)
-    template[0].submenu.push({
-      label: 'Quit',
-      click: () => app.quit()
-    })
-  }
-
-  return template
-}

src/main/power-save-blocker.js

@@ -1,34 +0,0 @@
-module.exports = {
-  enable,
-  disable
-}
-
-const electron = require('electron')
-const log = require('./log')
-
-let blockId = 0
-
-/**
- * Block the system from entering low-power (sleep) mode or turning off the
- * display.
- */
-function enable () {
-  if (electron.powerSaveBlocker.isStarted(blockId)) {
-    // If a power saver block already exists, do nothing.
-    return
-  }
-  blockId = electron.powerSaveBlocker.start('prevent-display-sleep')
-  log(`powerSaveBlocker.enable: ${blockId}`)
-}
-
-/**
- * Stop blocking the system from entering low-power mode.
- */
-function disable () {
-  if (!electron.powerSaveBlocker.isStarted(blockId)) {
-    // If a power saver block does not exist, do nothing.
-    return
-  }
-  electron.powerSaveBlocker.stop(blockId)
-  log(`powerSaveBlocker.disable: ${blockId}`)
-}

src/main/shell.js

@@ -1,41 +0,0 @@
-module.exports = {
-  openExternal,
-  openItem,
-  showItemInFolder,
-  moveItemToTrash
-}
-
-const electron = require('electron')
-const log = require('./log')
-
-/**
- * Open the given external protocol URL in the desktop’s default manner.
- */
-function openExternal (url) {
-  log(`openExternal: ${url}`)
-  electron.shell.openExternal(url)
-}
-
-/**
- * Open the given file in the desktop’s default manner.
- */
-function openItem (path) {
-  log(`openItem: ${path}`)
-  electron.shell.openItem(path)
-}
-
-/**
- * Show the given file in a file manager. If possible, select the file.
- */
-function showItemInFolder (path) {
-  log(`showItemInFolder: ${path}`)
-  electron.shell.showItemInFolder(path)
-}
-
-/**
- * Move the given file to trash and returns a boolean status for the operation.
- */
-function moveItemToTrash (path) {
-  log(`moveItemToTrash: ${path}`)
-  electron.shell.moveItemToTrash(path)
-}

src/main/shortcuts.js

@@ -1,30 +0,0 @@
-module.exports = {
-  disable,
-  enable
-}
-
-const electron = require('electron')
-const windows = require('./windows')
-
-function enable () {
-  // Register play/pause media key, available on some keyboards.
-  electron.globalShortcut.register(
-    'MediaPlayPause',
-    () => windows.main.dispatch('playPause')
-  )
-  electron.globalShortcut.register(
-    'MediaNextTrack',
-    () => windows.main.dispatch('nextTrack')
-  )
-  electron.globalShortcut.register(
-    'MediaPreviousTrack',
-    () => windows.main.dispatch('previousTrack')
-  )
-}
-
-function disable () {
-  // Return the media key to the OS, so other apps can use it.
-  electron.globalShortcut.unregister('MediaPlayPause')
-  electron.globalShortcut.unregister('MediaNextTrack')
-  electron.globalShortcut.unregister('MediaPreviousTrack')
-}

src/main/startup.js

@@ -1,36 +0,0 @@
-module.exports = {
-  install,
-  uninstall
-}
-
-const config = require('../config')
-const AutoLaunch = require('auto-launch')
-const { app } = require('electron')
-
-// On Mac, work around a bug in auto-launch where it opens a Terminal window
-// See https://github.com/Teamwork/node-auto-launch/issues/28#issuecomment-222194437
-const appPath = process.platform === 'darwin'
-  ? app.getPath('exe').replace(/\.app\/Content.*/, '.app')
-  : undefined // Use the default
-
-const appLauncher = new AutoLaunch({
-  name: config.APP_NAME,
-  path: appPath,
-  isHidden: true
-})
-
-function install () {
-  return appLauncher
-    .isEnabled()
-    .then(enabled => {
-      if (!enabled) return appLauncher.enable()
-    })
-}
-
-function uninstall () {
-  return appLauncher
-    .isEnabled()
-    .then(enabled => {
-      if (enabled) return appLauncher.disable()
-    })
-}

src/main/thumbar.js

@@ -1,91 +0,0 @@
-module.exports = {
-  disable,
-  enable,
-  onPlayerPause,
-  onPlayerPlay,
-  onPlayerUpdate
-}
-
-/**
- * On Windows, add a "thumbnail toolbar" with a play/pause button in the taskbar.
- * This provides users a way to access play/pause functionality without restoring
- * or activating the window.
- */
-
-const path = require('path')
-const config = require('../config')
-
-const windows = require('./windows')
-
-const PREV_ICON = path.join(config.STATIC_PATH, 'PreviousTrackThumbnailBarButton.png')
-const PLAY_ICON = path.join(config.STATIC_PATH, 'PlayThumbnailBarButton.png')
-const PAUSE_ICON = path.join(config.STATIC_PATH, 'PauseThumbnailBarButton.png')
-const NEXT_ICON = path.join(config.STATIC_PATH, 'NextTrackThumbnailBarButton.png')
-
-// Array indices for each button
-const PREV = 0
-const PLAY_PAUSE = 1
-const NEXT = 2
-
-let buttons = []
-
-/**
- * Show the Windows thumbnail toolbar buttons.
- */
-function enable () {
-  buttons = [
-    {
-      tooltip: 'Previous Track',
-      icon: PREV_ICON,
-      click: () => windows.main.dispatch('previousTrack')
-    },
-    {
-      tooltip: 'Pause',
-      icon: PAUSE_ICON,
-      click: () => windows.main.dispatch('playPause')
-    },
-    {
-      tooltip: 'Next Track',
-      icon: NEXT_ICON,
-      click: () => windows.main.dispatch('nextTrack')
-    }
-  ]
-  update()
-}
-
-/**
- * Hide the Windows thumbnail toolbar buttons.
- */
-function disable () {
-  buttons = []
-  update()
-}
-
-function onPlayerPause () {
-  if (!isEnabled()) return
-  buttons[PLAY_PAUSE].tooltip = 'Play'
-  buttons[PLAY_PAUSE].icon = PLAY_ICON
-  update()
-}
-
-function onPlayerPlay () {
-  if (!isEnabled()) return
-  buttons[PLAY_PAUSE].tooltip = 'Pause'
-  buttons[PLAY_PAUSE].icon = PAUSE_ICON
-  update()
-}
-
-function onPlayerUpdate (state) {
-  if (!isEnabled()) return
-  buttons[PREV].flags = [ state.hasPrevious ? 'enabled' : 'disabled' ]
-  buttons[NEXT].flags = [ state.hasNext ? 'enabled' : 'disabled' ]
-  update()
-}
-
-function isEnabled () {
-  return buttons.length > 0
-}
-
-function update () {
-  windows.main.win.setThumbarButtons(buttons)
-}

src/main/tray.js

@@ -1,109 +0,0 @@
-module.exports = {
-  hasTray,
-  init,
-  setWindowFocus
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-const config = require('../config')
-const windows = require('./windows')
-
-let tray
-
-function init () {
-  if (process.platform === 'linux') {
-    initLinux()
-  }
-  if (process.platform === 'win32') {
-    initWin32()
-  }
-  // Mac apps generally do not have menu bar icons
-}
-
-/**
- * Returns true if there a tray icon is active.
- */
-function hasTray () {
-  return !!tray
-}
-
-function setWindowFocus (flag) {
-  if (!tray) return
-  updateTrayMenu()
-}
-
-function initLinux () {
-  checkLinuxTraySupport(function (supportsTray) {
-    if (supportsTray) createTray()
-  })
-}
-
-function initWin32 () {
-  createTray()
-}
-
-/**
- * Check for libappindicator1 support before creating tray icon
- */
-function checkLinuxTraySupport (cb) {
-  const cp = require('child_process')
-
-  // Check that we're on Ubuntu (or another debian system) and that we have
-  // libappindicator1. If WebTorrent was installed from the deb file, we should
-  // always have it. If it was installed from the zip file, we might not.
-  cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
-    if (err) return cb(false)
-    // Unfortunately there's no cleaner way, as far as I can tell, to check
-    // whether a debian package is installed:
-    cb(stdout.endsWith('\tinstall\n'))
-  })
-}
-
-function createTray () {
-  tray = new electron.Tray(getIconPath())
-
-  // On Windows, left click opens the app, right click opens the context menu.
-  // On Linux, any click (left or right) opens the context menu.
-  tray.on('click', () => windows.main.show())
-
-  // Show the tray context menu, and keep the available commands up to date
-  updateTrayMenu()
-}
-
-function updateTrayMenu () {
-  const contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
-  tray.setContextMenu(contextMenu)
-}
-
-function getMenuTemplate () {
-  return [
-    getToggleItem(),
-    {
-      label: 'Quit',
-      click: () => app.quit()
-    }
-  ]
-
-  function getToggleItem () {
-    if (windows.main.win.isVisible()) {
-      return {
-        label: 'Hide to tray',
-        click: () => windows.main.hide()
-      }
-    } else {
-      return {
-        label: 'Show WebTorrent',
-        click: () => windows.main.show()
-      }
-    }
-  }
-}
-
-function getIconPath () {
-  return process.platform === 'win32'
-    ? config.APP_ICON + '.ico'
-    : config.APP_ICON + '.png'
-}

src/main/updater.js

@@ -1,77 +0,0 @@
-module.exports = {
-  init
-}
-
-const electron = require('electron')
-const get = require('simple-get')
-
-const config = require('../config')
-const log = require('./log')
-const windows = require('./windows')
-
-const AUTO_UPDATE_URL = config.AUTO_UPDATE_URL +
-  '?version=' + config.APP_VERSION +
-  '&platform=' + process.platform +
-  '&sysarch=' + config.OS_SYSARCH
-
-function init () {
-  if (process.platform === 'linux') {
-    initLinux()
-  } else {
-    initDarwinWin32()
-  }
-}
-
-// The Electron auto-updater does not support Linux yet, so manually check for
-// updates and show the user a modal notification.
-function initLinux () {
-  get.concat(AUTO_UPDATE_URL, onResponse)
-}
-
-function onResponse (err, res, data) {
-  if (err) return log(`Update error: ${err.message}`)
-  if (res.statusCode === 200) {
-    // Update available
-    try {
-      data = JSON.parse(data)
-    } catch (err) {
-      return log(`Update error: Invalid JSON response: ${err.message}`)
-    }
-    windows.main.dispatch('updateAvailable', data.version)
-  } else if (res.statusCode === 204) {
-    // No update available
-  } else {
-    // Unexpected status code
-    log(`Update error: Unexpected status code: ${res.statusCode}`)
-  }
-}
-
-function initDarwinWin32 () {
-  electron.autoUpdater.on(
-    'error',
-    (err) => log.error(`Update error: ${err.message}`)
-  )
-
-  electron.autoUpdater.on(
-    'checking-for-update',
-    () => log('Checking for update')
-  )
-
-  electron.autoUpdater.on(
-    'update-available',
-    () => log('Update available')
-  )
-
-  electron.autoUpdater.on(
-    'update-not-available',
-    () => log('No update available')
-  )
-
-  electron.autoUpdater.on(
-    'update-downloaded',
-    (e, notes, name, date, url) => log(`Update downloaded: ${name}: ${url}`)
-  )
-
-  electron.autoUpdater.setFeedURL(AUTO_UPDATE_URL)
-  electron.autoUpdater.checkForUpdates()
-}

src/main/user-tasks.js

@@ -1,43 +0,0 @@
-module.exports = {
-  init
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-/**
- * Add a user task menu to the app icon on right-click. (Windows)
- */
-function init () {
-  if (process.platform !== 'win32') return
-  app.setUserTasks(getUserTasks())
-}
-
-function getUserTasks () {
-  return [
-    {
-      arguments: '-n',
-      title: 'Create New Torrent...',
-      description: 'Create a new torrent'
-    },
-    {
-      arguments: '-o',
-      title: 'Open Torrent File...',
-      description: 'Open a .torrent file'
-    },
-    {
-      arguments: '-u',
-      title: 'Open Torrent Address...',
-      description: 'Open a torrent from a URL'
-    }
-  ].map(getUserTasksItem)
-}
-
-function getUserTasksItem (item) {
-  return Object.assign(item, {
-    program: process.execPath,
-    iconPath: process.execPath,
-    iconIndex: 0
-  })
-}

src/main/windows/about.js

@@ -1,48 +0,0 @@
-const about = module.exports = {
-  init,
-  win: null
-}
-
-const config = require('../../config')
-const electron = require('electron')
-
-function init () {
-  if (about.win) {
-    return about.win.show()
-  }
-
-  const win = about.win = new electron.BrowserWindow({
-    backgroundColor: '#ECECEC',
-    center: true,
-    fullscreen: false,
-    height: 170,
-    icon: getIconPath(),
-    maximizable: false,
-    minimizable: false,
-    resizable: false,
-    show: false,
-    skipTaskbar: true,
-    title: 'About ' + config.APP_WINDOW_TITLE,
-    useContentSize: true,
-    width: 300
-  })
-
-  win.loadURL(config.WINDOW_ABOUT)
-
-  // No menu on the About window
-  win.setMenu(null)
-
-  win.webContents.once('did-finish-load', function () {
-    win.show()
-  })
-
-  win.once('closed', function () {
-    about.win = null
-  })
-}
-
-function getIconPath () {
-  return process.platform === 'win32'
-    ? config.APP_ICON + '.ico'
-    : config.APP_ICON + '.png'
-}

src/main/windows/index.js

@@ -1,3 +0,0 @@
-exports.about = require('./about')
-exports.main = require('./main')
-exports.webtorrent = require('./webtorrent')

src/main/windows/main.js

@@ -1,227 +0,0 @@
-const main = module.exports = {
-  dispatch,
-  hide,
-  init,
-  send,
-  setAspectRatio,
-  setBounds,
-  setProgress,
-  setTitle,
-  show,
-  toggleAlwaysOnTop,
-  toggleDevTools,
-  toggleFullScreen,
-  win: null
-}
-
-const electron = require('electron')
-
-const app = electron.app
-
-const config = require('../../config')
-const log = require('../log')
-const menu = require('../menu')
-const tray = require('../tray')
-
-const HEADER_HEIGHT = 38
-const TORRENT_HEIGHT = 100
-
-function init (options) {
-  if (main.win) {
-    return main.win.show()
-  }
-  const win = main.win = new electron.BrowserWindow({
-    backgroundColor: '#282828',
-    darkTheme: true, // Forces dark theme (GTK+3)
-    icon: getIconPath(), // Window icon (Windows, Linux)
-    minWidth: config.WINDOW_MIN_WIDTH,
-    minHeight: config.WINDOW_MIN_HEIGHT,
-    title: config.APP_WINDOW_TITLE,
-    titleBarStyle: 'hidden-inset', // Hide title bar (Mac)
-    useContentSize: true, // Specify web page size without OS chrome
-    width: 500,
-    height: HEADER_HEIGHT + (TORRENT_HEIGHT * 6), // header height + 5 torrents
-    show: !options.hidden
-  })
-
-  win.loadURL(config.WINDOW_MAIN)
-
-  if (win.setSheetOffset) win.setSheetOffset(HEADER_HEIGHT)
-
-  win.webContents.on('dom-ready', function () {
-    menu.onToggleFullScreen(main.win.isFullScreen())
-  })
-
-  win.on('blur', onWindowBlur)
-  win.on('focus', onWindowFocus)
-
-  win.on('hide', onWindowBlur)
-  win.on('show', onWindowFocus)
-
-  win.on('enter-full-screen', function () {
-    menu.onToggleFullScreen(true)
-    send('fullscreenChanged', true)
-    win.setMenuBarVisibility(false)
-  })
-
-  win.on('leave-full-screen', function () {
-    menu.onToggleFullScreen(false)
-    send('fullscreenChanged', false)
-    win.setMenuBarVisibility(true)
-  })
-
-  win.on('close', function (e) {
-    if (process.platform !== 'darwin' && !tray.hasTray()) {
-      app.quit()
-    } else if (!app.isQuitting) {
-      e.preventDefault()
-      hide()
-    }
-  })
-}
-
-function dispatch (...args) {
-  send('dispatch', ...args)
-}
-
-function hide () {
-  if (!main.win) return
-  main.win.send('dispatch', 'backToList')
-  main.win.hide()
-}
-
-function send (...args) {
-  if (!main.win) return
-  main.win.send(...args)
-}
-
-/**
- * Enforce window aspect ratio. Remove with 0. (Mac)
- */
-function setAspectRatio (aspectRatio) {
-  if (!main.win) return
-  main.win.setAspectRatio(aspectRatio)
-}
-
-/**
- * Change the size of the window.
- * TODO: Clean this up? Seems overly complicated.
- */
-function setBounds (bounds, maximize) {
-  // Do nothing in fullscreen
-  if (!main.win || main.win.isFullScreen()) {
-    log('setBounds: not setting bounds because we\'re in full screen')
-    return
-  }
-
-  // Maximize or minimize, if the second argument is present
-  let willBeMaximized
-  if (maximize === true) {
-    if (!main.win.isMaximized()) {
-      log('setBounds: maximizing')
-      main.win.maximize()
-    }
-    willBeMaximized = true
-  } else if (maximize === false) {
-    if (main.win.isMaximized()) {
-      log('setBounds: unmaximizing')
-      main.win.unmaximize()
-    }
-    willBeMaximized = false
-  } else {
-    willBeMaximized = main.win.isMaximized()
-  }
-
-  // Assuming we're not maximized or maximizing, set the window size
-  if (!willBeMaximized) {
-    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
-    if (bounds.x === null && bounds.y === null) {
-      // X and Y not specified? By default, center on current screen
-      const scr = electron.screen.getDisplayMatching(main.win.getBounds())
-      bounds.x = Math.round(scr.bounds.x + scr.bounds.width / 2 - bounds.width / 2)
-      bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2)
-      log('setBounds: centered to ' + JSON.stringify(bounds))
-    }
-    // Resize the window's content area (so window border doesn't need to be taken
-    // into account)
-    if (bounds.contentBounds) {
-      main.win.setContentBounds(bounds, true)
-    } else {
-      main.win.setBounds(bounds, true)
-    }
-  } else {
-    log('setBounds: not setting bounds because of window maximization')
-  }
-}
-
-/**
- * Set progress bar to [0, 1]. Indeterminate when > 1. Remove with < 0.
- */
-function setProgress (progress) {
-  if (!main.win) return
-  main.win.setProgressBar(progress)
-}
-
-function setTitle (title) {
-  if (!main.win) return
-  main.win.setTitle(title)
-}
-
-function show () {
-  if (!main.win) return
-  main.win.show()
-}
-
-// Sets whether the window should always show on top of other windows
-function toggleAlwaysOnTop (flag) {
-  if (!main.win) return
-  if (flag == null) {
-    flag = !main.win.isAlwaysOnTop()
-  }
-  log(`toggleAlwaysOnTop ${flag}`)
-  main.win.setAlwaysOnTop(flag)
-  menu.onToggleAlwaysOnTop(flag)
-}
-
-function toggleDevTools () {
-  if (!main.win) return
-  log('toggleDevTools')
-  if (main.win.webContents.isDevToolsOpened()) {
-    main.win.webContents.closeDevTools()
-  } else {
-    main.win.webContents.openDevTools({ detach: true })
-  }
-}
-
-function toggleFullScreen (flag) {
-  if (!main.win || !main.win.isVisible()) {
-    return
-  }
-
-  if (flag == null) flag = !main.win.isFullScreen()
-
-  log(`toggleFullScreen ${flag}`)
-
-  if (flag) {
-    // Fullscreen and aspect ratio do not play well together. (Mac)
-    main.win.setAspectRatio(0)
-  }
-
-  main.win.setFullScreen(flag)
-}
-
-function onWindowBlur () {
-  menu.setWindowFocus(false)
-  tray.setWindowFocus(false)
-}
-
-function onWindowFocus () {
-  menu.setWindowFocus(true)
-  tray.setWindowFocus(true)
-}
-
-function getIconPath () {
-  return process.platform === 'win32'
-    ? config.APP_ICON + '.ico'
-    : config.APP_ICON + '.png'
-}

src/main/windows/webtorrent.js

@@ -1,62 +0,0 @@
-const webtorrent = module.exports = {
-  init,
-  send,
-  show,
-  toggleDevTools,
-  win: null
-}
-
-const electron = require('electron')
-
-const config = require('../../config')
-const log = require('../log')
-
-function init () {
-  const win = webtorrent.win = new electron.BrowserWindow({
-    backgroundColor: '#1E1E1E',
-    center: true,
-    fullscreen: false,
-    fullscreenable: false,
-    height: 150,
-    maximizable: false,
-    minimizable: false,
-    resizable: false,
-    show: false,
-    skipTaskbar: true,
-    title: 'webtorrent-hidden-window',
-    useContentSize: true,
-    width: 150
-  })
-
-  win.loadURL(config.WINDOW_WEBTORRENT)
-
-  // Prevent killing the WebTorrent process
-  win.on('close', function (e) {
-    if (electron.app.isQuitting) {
-      return
-    }
-    e.preventDefault()
-    win.hide()
-  })
-}
-
-function show () {
-  if (!webtorrent.win) return
-  webtorrent.win.show()
-}
-
-function send (...args) {
-  if (!webtorrent.win) return
-  webtorrent.win.send(...args)
-}
-
-function toggleDevTools () {
-  if (!webtorrent.win) return
-  log('toggleDevTools')
-  if (webtorrent.win.webContents.isDevToolsOpened()) {
-    webtorrent.win.webContents.closeDevTools()
-    webtorrent.win.hide()
-  } else {
-    webtorrent.win.webContents.openDevTools({ detach: true })
-  }
-}

src/renderer/components/create-torrent-error-page.js

@@ -1,26 +0,0 @@
-const React = require('react')
-
-const {dispatcher} = require('../lib/dispatcher')
-
-module.exports = class CreateTorrentErrorPage extends React.Component {
-  render () {
-    return (
-      <div className='create-torrent'>
-        <h2>Create torrent</h2>
-        <p className='torrent-info'>
-          <p>
-            Sorry, you must select at least one file that is not a hidden file.
-          </p>
-          <p>
-            Hidden files, starting with a . character, are not included.
-          </p>
-        </p>
-        <p className='float-right'>
-          <button className='button-flat light' onClick={dispatcher('cancel')}>
-            Cancel
-          </button>
-        </p>
-      </div>
-    )
-  }
-}

src/renderer/components/header.js

@@ -1,52 +0,0 @@
-const React = require('react')
-
-const {dispatcher} = require('../lib/dispatcher')
-
-class Header extends React.Component {
-  render () {
-    const loc = this.props.state.location
-    return (
-      <div className='header' onMouseMove={dispatcher('mediaMouseMoved')}>
-        {this.getTitle()}
-        <div className='nav left float-left'>
-          <i
-            className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
-            title='Back'
-            onClick={dispatcher('back')}>
-            chevron_left
-          </i>
-          <i
-            className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
-            title='Forward'
-            onClick={dispatcher('forward')}>
-            chevron_right
-          </i>
-        </div>
-        <div className='nav right float-right'>
-          {this.getAddButton()}
-        </div>
-      </div>
-    )
-  }
-
-  getTitle () {
-    if (process.platform !== 'darwin') return null
-    const state = this.props.state
-    return (<div className='title ellipsis'>{state.window.title}</div>)
-  }
-
-  getAddButton () {
-    const state = this.props.state
-    if (state.location.url() !== 'home') return null
-    return (
-      <i
-        className='icon add'
-        title='Add torrent'
-        onClick={dispatcher('openFiles')}>
-        add
-      </i>
-    )
-  }
-}
-
-module.exports = Header

src/renderer/components/heading.js

@@ -1,34 +0,0 @@
-const React = require('react')
-
-const colors = require('material-ui/styles/colors')
-
-class Heading extends React.Component {
-  static get propTypes () {
-    return {
-      level: React.PropTypes.number
-    }
-  }
-
-  static get defaultProps () {
-    return {
-      level: 1
-    }
-  }
-
-  render () {
-    const HeadingTag = 'h' + this.props.level
-    const style = {
-      color: colors.grey100,
-      fontSize: 20,
-      marginBottom: 15,
-      marginTop: 30
-    }
-    return (
-      <HeadingTag style={style}>
-        {this.props.children}
-      </HeadingTag>
-    )
-  }
-}
-
-module.exports = Heading

src/renderer/components/modal-ok-cancel.js

@@ -1,24 +0,0 @@
-const React = require('react')
-const FlatButton = require('material-ui/FlatButton').default
-const RaisedButton = require('material-ui/RaisedButton').default
-
-module.exports = class ModalOKCancel extends React.Component {
-  render () {
-    const cancelStyle = { marginRight: 10, color: 'black' }
-    const {cancelText, onCancel, okText, onOK} = this.props
-    return (
-      <div className='float-right'>
-        <FlatButton
-          className='control cancel'
-          style={cancelStyle}
-          label={cancelText}
-          onClick={onCancel} />
-        <RaisedButton
-          className='control ok'
-          primary
-          label={okText}
-          onClick={onOK} />
-      </div>
-    )
-  }
-}

src/renderer/components/open-torrent-address-modal.js

@@ -1,41 +0,0 @@
-const React = require('react')
-const TextField = require('material-ui/TextField').default
-
-const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatch, dispatcher} = require('../lib/dispatcher')
-
-module.exports = class OpenTorrentAddressModal extends React.Component {
-  render () {
-    return (
-      <div className='open-torrent-address-modal'>
-        <p><label>Enter torrent address or magnet link</label></p>
-        <div>
-          <TextField
-            id='torrent-address-field'
-            className='control'
-            ref={(c) => { this.torrentURL = c }}
-            fullWidth
-            onKeyDown={handleKeyDown.bind(this)} />
-        </div>
-        <ModalOKCancel
-          cancelText='CANCEL'
-          onCancel={dispatcher('exitModal')}
-          okText='OK'
-          onOK={handleOK.bind(this)} />
-      </div>
-    )
-  }
-
-  componentDidMount () {
-    this.torrentURL.input.focus()
-  }
-}
-
-function handleKeyDown (e) {
-  if (e.which === 13) handleOK.call(this) /* hit Enter to submit */
-}
-
-function handleOK () {
-  dispatch('exitModal')
-  dispatch('addTorrent', this.torrentURL.input.value)
-}

src/renderer/components/path-selector.js

@@ -1,86 +0,0 @@
-const colors = require('material-ui/styles/colors')
-const electron = require('electron')
-const React = require('react')
-
-const remote = electron.remote
-
-const RaisedButton = require('material-ui/RaisedButton').default
-const TextField = require('material-ui/TextField').default
-
-// Lets you pick a file or directory.
-// Uses the system Open File dialog.
-// You can't edit the text field directly.
-class PathSelector extends React.Component {
-  static get propTypes () {
-    return {
-      className: React.PropTypes.string,
-      dialog: React.PropTypes.object,
-      displayValue: React.PropTypes.string,
-      id: React.PropTypes.string,
-      onChange: React.PropTypes.func,
-      title: React.PropTypes.string.isRequired,
-      value: React.PropTypes.string
-    }
-  }
-
-  constructor (props) {
-    super(props)
-    this.handleClick = this.handleClick.bind(this)
-  }
-
-  handleClick () {
-    const opts = Object.assign({
-      defaultPath: this.props.value,
-      properties: [ 'openFile', 'openDirectory' ]
-    }, this.props.dialog)
-
-    remote.dialog.showOpenDialog(
-      remote.getCurrentWindow(),
-      opts,
-      (filenames) => {
-        if (!Array.isArray(filenames)) return
-        this.props.onChange && this.props.onChange(filenames[0])
-      }
-    )
-  }
-
-  render () {
-    const id = this.props.title.replace(' ', '-').toLowerCase()
-    const wrapperStyle = {
-      alignItems: 'center',
-      display: 'flex',
-      width: '100%'
-    }
-    const labelStyle = {
-      flex: '0 auto',
-      marginRight: 10,
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      whiteSpace: 'nowrap'
-    }
-    const textareaStyle = {
-      color: colors.grey50
-    }
-    const textFieldStyle = {
-      flex: '1'
-    }
-    const text = this.props.displayValue || this.props.value
-    const buttonStyle = {
-      marginLeft: 10
-    }
-
-    return (
-      <div className={this.props.className} style={wrapperStyle}>
-        <div className='label' style={labelStyle}>
-          {this.props.title}:
-        </div>
-        <TextField className='control' disabled id={id} value={text}
-          inputStyle={textareaStyle} style={textFieldStyle} />
-        <RaisedButton className='control' label='Change' onClick={this.handleClick}
-          style={buttonStyle} />
-      </div>
-    )
-  }
-}
-
-module.exports = PathSelector

src/renderer/components/remove-torrent-modal.js

@@ -1,30 +0,0 @@
-const React = require('react')
-
-const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatch, dispatcher} = require('../lib/dispatcher')
-
-module.exports = class RemoveTorrentModal extends React.Component {
-  render () {
-    const state = this.props.state
-    const message = state.modal.deleteData
-      ? 'Are you sure you want to remove this torrent from the list and delete the data file?'
-      : 'Are you sure you want to remove this torrent from the list?'
-    const buttonText = state.modal.deleteData ? 'REMOVE DATA' : 'REMOVE'
-
-    return (
-      <div>
-        <p><strong>{message}</strong></p>
-        <ModalOKCancel
-          cancelText='CANCEL'
-          onCancel={dispatcher('exitModal')}
-          okText={buttonText}
-          onOK={handleRemove} />
-      </div>
-    )
-
-    function handleRemove () {
-      dispatch('deleteTorrent', state.modal.infoHash, state.modal.deleteData)
-      dispatch('exitModal')
-    }
-  }
-}

src/renderer/components/show-more.js

@@ -1,53 +0,0 @@
-const React = require('react')
-
-const RaisedButton = require('material-ui/RaisedButton').default
-
-class ShowMore extends React.Component {
-  static get propTypes () {
-    return {
-      defaultExpanded: React.PropTypes.bool,
-      hideLabel: React.PropTypes.string,
-      showLabel: React.PropTypes.string
-    }
-  }
-
-  static get defaultProps () {
-    return {
-      hideLabel: 'Hide more...',
-      showLabel: 'Show more...'
-    }
-  }
-
-  constructor (props) {
-    super(props)
-
-    this.state = {
-      expanded: !!this.props.defaultExpanded
-    }
-
-    this.handleClick = this.handleClick.bind(this)
-  }
-
-  handleClick () {
-    this.setState({
-      expanded: !this.state.expanded
-    })
-  }
-
-  render () {
-    const label = this.state.expanded
-      ? this.props.hideLabel
-      : this.props.showLabel
-    return (
-      <div className='show-more' style={this.props.style}>
-        {this.state.expanded ? this.props.children : null}
-        <RaisedButton
-          className='control'
-          onClick={this.handleClick}
-          label={label} />
-      </div>
-    )
-  }
-}
-
-module.exports = ShowMore

src/renderer/components/unsupported-media-modal.js

@@ -1,44 +0,0 @@
-const React = require('react')
-const electron = require('electron')
-
-const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatcher} = require('../lib/dispatcher')
-
-module.exports = class UnsupportedMediaModal extends React.Component {
-  render () {
-    const state = this.props.state
-    const err = state.modal.error
-    const message = (err && err.getMessage)
-      ? err.getMessage()
-      : err
-    const onAction = state.modal.externalPlayerInstalled
-      ? dispatcher('openExternalPlayer')
-      : () => this.onInstall()
-    const actionText = state.modal.externalPlayerInstalled
-      ? 'PLAY IN ' + state.getExternalPlayerName().toUpperCase()
-      : 'INSTALL VLC'
-    const errorMessage = state.modal.externalPlayerNotFound
-      ? 'Couldn\'t run external player. Please make sure it\'s installed.'
-      : ''
-    return (
-      <div>
-        <p><strong>Sorry, we can't play that file.</strong></p>
-        <p>{message}</p>
-        <ModalOKCancel
-          cancelText='CANCEL'
-          onCancel={dispatcher('backToList')}
-          okText={actionText}
-          onOK={onAction} />
-        <p className='error-text'>{errorMessage}</p>
-      </div>
-    )
-  }
-
-  onInstall () {
-    electron.shell.openExternal('http://www.videolan.org/vlc/')
-
-    // TODO: dcposch send a dispatch rather than modifying state directly
-    const state = this.props.state
-    state.modal.externalPlayerInstalled = true // Assume they'll install it successfully
-  }
-}

src/renderer/components/update-available-modal.js

@@ -1,35 +0,0 @@
-const React = require('react')
-const electron = require('electron')
-
-const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatch} = require('../lib/dispatcher')
-
-module.exports = class UpdateAvailableModal extends React.Component {
-  render () {
-    const state = this.props.state
-    return (
-      <div className='update-available-modal'>
-        <p><strong>A new version of WebTorrent is available: v{state.modal.version}</strong></p>
-        <p>
-          We have an auto-updater for Windows and Mac.
-          We don't have one for Linux yet, so you'll have to download the new version manually.
-        </p>
-        <ModalOKCancel
-          cancelText='SKIP THIS RELEASE'
-          onCancel={handleSkip}
-          okText='SHOW DOWNLOAD PAGE'
-          onOK={handleShow} />
-      </div>
-    )
-
-    function handleShow () {
-      electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
-      dispatch('exitModal')
-    }
-
-    function handleSkip () {
-      dispatch('skipVersion', state.modal.version)
-      dispatch('exitModal')
-    }
-  }
-}

src/renderer/controllers/media-controller.js

@@ -1,63 +0,0 @@
-const electron = require('electron')
-
-const ipcRenderer = electron.ipcRenderer
-
-const Playlist = require('../lib/playlist')
-
-// Controls local play back: the <video>/<audio> tag and VLC
-// Does not control remote casting (Chromecast etc)
-module.exports = class MediaController {
-  constructor (state) {
-    this.state = state
-  }
-
-  mediaSuccess () {
-    this.state.playing.result = 'success'
-  }
-
-  mediaStalled () {
-    this.state.playing.isStalled = true
-  }
-
-  mediaError (error) {
-    const state = this.state
-    if (state.location.url() === 'player') {
-      state.playing.result = 'error'
-      state.playing.location = 'error'
-      ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
-      ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
-        state.modal = {
-          id: 'unsupported-media-modal',
-          error: error,
-          externalPlayerInstalled: isInstalled
-        }
-      })
-    }
-  }
-
-  mediaTimeUpdate () {
-    this.state.playing.lastTimeUpdate = new Date().getTime()
-    this.state.playing.isStalled = false
-  }
-
-  mediaMouseMoved () {
-    this.state.playing.mouseStationarySince = new Date().getTime()
-  }
-
-  openExternalPlayer () {
-    const state = this.state
-    const mediaURL = Playlist.getCurrentLocalURL(this.state)
-    ipcRenderer.send('openExternalPlayer',
-      state.saved.prefs.externalPlayerPath,
-      mediaURL,
-      state.window.title)
-    state.playing.location = 'external'
-  }
-
-  externalPlayerNotFound () {
-    const modal = this.state.modal
-    if (modal && modal.id === 'unsupported-media-modal') {
-      modal.externalPlayerNotFound = true
-    }
-  }
-}

src/renderer/controllers/playback-controller.js

@@ -1,389 +0,0 @@
-const electron = require('electron')
-const path = require('path')
-
-const Cast = require('../lib/cast')
-const {dispatch} = require('../lib/dispatcher')
-const telemetry = require('../lib/telemetry')
-const {UnplayableFileError, UnplayableTorrentError,
-      PlaybackTimedOutError} = require('../lib/errors')
-const sound = require('../lib/sound')
-const TorrentPlayer = require('../lib/torrent-player')
-const TorrentSummary = require('../lib/torrent-summary')
-const Playlist = require('../lib/playlist')
-const State = require('../lib/state')
-
-const ipcRenderer = electron.ipcRenderer
-
-// Controls playback of torrents and files within torrents
-// both local (<video>,<audio>,external player) and remote (cast)
-module.exports = class PlaybackController {
-  constructor (state, config, update) {
-    this.state = state
-    this.config = config
-    this.update = update
-  }
-
-  // Play a file in a torrent.
-  // * Start torrenting, if necessary
-  // * Stream, if not already fully downloaded
-  // * If no file index is provided, restore the most recently viewed file or autoplay the first
-  playFile (infoHash, index /* optional */) {
-    const state = this.state
-    if (state.location.url() === 'player') {
-      this.updatePlayer(infoHash, index, false, (err) => {
-        if (err) dispatch('error', err)
-        else this.play()
-      })
-    } else {
-      let initialized = false
-      state.location.go({
-        url: 'player',
-        setup: (cb) => {
-          const torrentSummary = TorrentSummary.getByKey(state, infoHash)
-
-          if (index === undefined || initialized) index = torrentSummary.mostRecentFileIndex
-          if (index === undefined) index = torrentSummary.files.findIndex(TorrentPlayer.isPlayable)
-          if (index === undefined) return cb(new UnplayableTorrentError())
-
-          initialized = true
-
-          this.openPlayer(infoHash, index, (err) => {
-            if (!err) this.play()
-            cb(err)
-          })
-        },
-        destroy: () => this.closePlayer()
-      }, (err) => {
-        if (err) dispatch('error', err)
-      })
-    }
-  }
-
-  // Open a file in OS default app.
-  openItem (infoHash, index) {
-    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    const filePath = path.join(
-      torrentSummary.path,
-      torrentSummary.files[index].path)
-    ipcRenderer.send('openItem', filePath)
-  }
-
-  // Toggle (play or pause) the currently playing media
-  playPause () {
-    const state = this.state
-    if (state.location.url() !== 'player') return
-
-    // force rerendering if window is hidden,
-    // in order to bypass `raf` and play/pause media immediately
-    const mediaTag = document.querySelector('video,audio')
-    if (!state.window.isVisible && mediaTag) {
-      if (state.playing.isPaused) mediaTag.play()
-      else mediaTag.pause()
-    }
-
-    if (state.playing.isPaused) this.play()
-    else this.pause()
-  }
-
-  // Play next file in list (if any)
-  nextTrack () {
-    const state = this.state
-    if (Playlist.hasNext(state) && state.playing.location !== 'external') {
-      this.updatePlayer(
-          state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
-            if (err) dispatch('error', err)
-            else this.play()
-          })
-    }
-  }
-
-  // Play previous track in list (if any)
-  previousTrack () {
-    const state = this.state
-    if (Playlist.hasPrevious(state) && state.playing.location !== 'external') {
-      this.updatePlayer(
-        state.playing.infoHash, Playlist.getPreviousIndex(state), false, (err) => {
-          if (err) dispatch('error', err)
-          else this.play()
-        })
-    }
-  }
-
-  // Play (unpause) the current media
-  play () {
-    const state = this.state
-    if (!state.playing.isPaused) return
-    state.playing.isPaused = false
-    if (isCasting(state)) {
-      Cast.play()
-    }
-    ipcRenderer.send('onPlayerPlay')
-  }
-
-  // Pause the currently playing media
-  pause () {
-    const state = this.state
-    if (state.playing.isPaused) return
-    state.playing.isPaused = true
-    if (isCasting(state)) {
-      Cast.pause()
-    }
-    ipcRenderer.send('onPlayerPause')
-  }
-
-  // Skip specified number of seconds (backwards if negative)
-  skip (time) {
-    this.skipTo(this.state.playing.currentTime + time)
-  }
-
-  // Skip (aka seek) to a specific point, in seconds
-  skipTo (time) {
-    if (!Number.isFinite(time)) {
-      console.error('Tried to skip to a non-finite time ' + time)
-      return console.trace()
-    }
-    if (isCasting(this.state)) Cast.seek(time)
-    else this.state.playing.jumpToTime = time
-  }
-
-  // Change playback speed. 1 = faster, -1 = slower
-  // Playback speed ranges from 16 (fast forward) to 1 (normal playback)
-  // to 0.25 (quarter-speed playback), then goes to -0.25, -0.5, -1, -2, etc
-  // until -16 (fast rewind)
-  changePlaybackRate (direction) {
-    const state = this.state
-    let rate = state.playing.playbackRate
-    if (direction > 0 && rate >= 0.25 && rate < 2) {
-      rate += 0.25
-    } else if (direction < 0 && rate > 0.25 && rate <= 2) {
-      rate -= 0.25
-    } else if (direction < 0 && rate === 0.25) {
-      // When we set playback rate at 0 in html 5, playback hangs ;(
-      rate = -1
-    } else if (direction > 0 && rate === -1) {
-      rate = 0.25
-    } else if ((direction > 0 && rate >= 1 && rate < 16) ||
-      (direction < 0 && rate > -16 && rate <= -1)) {
-      rate *= 2
-    } else if ((direction < 0 && rate > 1 && rate <= 16) ||
-      (direction > 0 && rate >= -16 && rate < -1)) {
-      rate /= 2
-    }
-    state.playing.playbackRate = rate
-    if (isCasting(state) && !Cast.setRate(rate)) {
-      state.playing.playbackRate = 1
-    }
-  }
-
-  // Change the volume, in range [0, 1], by some amount
-  // For example, volume muted (0), changeVolume (0.3) increases to 30% volume
-  changeVolume (delta) {
-    // change volume with delta value
-    this.setVolume(this.state.playing.volume + delta)
-  }
-
-  // Set the volume to some value in [0, 1]
-  setVolume (volume) {
-    // check if its in [0.0 - 1.0] range
-    volume = Math.max(0, Math.min(1, volume))
-
-    const state = this.state
-    if (isCasting(state)) {
-      Cast.setVolume(volume)
-    } else {
-      state.playing.setVolume = volume
-    }
-  }
-
-  // Hide player controls while playing video, if the mouse stays still for a while
-  // Never hide the controls when:
-  // * The mouse is over the controls or we're scrubbing (see CSS)
-  // * The video is paused
-  // * The video is playing remotely on Chromecast or Airplay
-  showOrHidePlayerControls () {
-    const state = this.state
-    const hideControls = state.location.url() === 'player' &&
-      state.playing.mouseStationarySince !== 0 &&
-      new Date().getTime() - state.playing.mouseStationarySince > 2000 &&
-      !state.playing.isPaused &&
-      state.playing.location === 'local'
-
-    if (hideControls !== state.playing.hideControls) {
-      state.playing.hideControls = hideControls
-      return true
-    }
-    return false
-  }
-
-  // Opens the video player to a specific torrent
-  openPlayer (infoHash, index, cb) {
-    const state = this.state
-    const torrentSummary = TorrentSummary.getByKey(state, infoHash)
-
-    state.playing.infoHash = torrentSummary.infoHash
-
-    // update UI to show pending playback
-    if (torrentSummary.progress !== 1) sound.play('PLAY')
-    // TODO: remove torrentSummary.playStatus
-    torrentSummary.playStatus = 'requested'
-    this.update()
-
-    const timeout = setTimeout(() => {
-      telemetry.logPlayAttempt('timeout')
-      // TODO: remove torrentSummary.playStatus
-      torrentSummary.playStatus = 'timeout' /* no seeders available? */
-      sound.play('ERROR')
-      cb(new PlaybackTimedOutError())
-      this.update()
-    }, 10000) /* give it a few seconds */
-
-    this.startServer(torrentSummary, () => {
-      clearTimeout(timeout)
-
-      // if we timed out (user clicked play a long time ago), don't autoplay
-      const timedOut = torrentSummary.playStatus === 'timeout'
-      delete torrentSummary.playStatus
-      if (timedOut) {
-        ipcRenderer.send('wt-stop-server')
-        return this.update()
-      }
-
-      ipcRenderer.send('onPlayerOpen')
-      this.updatePlayer(infoHash, index, true, cb)
-    })
-  }
-
-  // Starts WebTorrent server for media streaming
-  startServer (torrentSummary, cb) {
-    if (torrentSummary.status === 'paused') {
-      dispatch('startTorrentingSummary', torrentSummary.torrentKey)
-      ipcRenderer.once('wt-ready-' + torrentSummary.infoHash,
-        () => onTorrentReady())
-    } else {
-      onTorrentReady()
-    }
-
-    function onTorrentReady () {
-      ipcRenderer.send('wt-start-server', torrentSummary.infoHash)
-      ipcRenderer.once('wt-server-' + torrentSummary.infoHash, () => cb())
-    }
-  }
-
-  // Called each time the current file changes
-  updatePlayer (infoHash, index, resume, cb) {
-    const state = this.state
-
-    const torrentSummary = TorrentSummary.getByKey(state, infoHash)
-    const fileSummary = torrentSummary.files[index]
-
-    if (!TorrentPlayer.isPlayable(fileSummary)) {
-      torrentSummary.mostRecentFileIndex = undefined
-      return cb(new UnplayableFileError())
-    }
-
-    torrentSummary.mostRecentFileIndex = index
-
-    // update state
-    state.playing.infoHash = infoHash
-    state.playing.fileIndex = index
-    state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
-      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
-      : 'other'
-
-    // pick up where we left off
-    let jumpToTime = 0
-    if (resume && fileSummary.currentTime) {
-      const fraction = fileSummary.currentTime / fileSummary.duration
-      const secondsLeft = fileSummary.duration - fileSummary.currentTime
-      if (fraction < 0.9 && secondsLeft > 10) {
-        jumpToTime = fileSummary.currentTime
-      }
-    }
-    state.playing.jumpToTime = jumpToTime
-
-    // if it's audio, parse out the metadata (artist, title, etc)
-    if (state.playing.type === 'audio' && !fileSummary.audioInfo) {
-      ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index)
-    }
-
-    // if it's video, check for subtitles files that are done downloading
-    dispatch('checkForSubtitles')
-
-    // enable previously selected subtitle track
-    if (fileSummary.selectedSubtitle) {
-      dispatch('addSubtitles', [fileSummary.selectedSubtitle], true)
-    }
-
-    state.window.title = fileSummary.name
-
-    // play in VLC if set as default player (Preferences / Playback / Play in VLC)
-    if (this.state.saved.prefs.openExternalPlayer) {
-      dispatch('openExternalPlayer')
-      this.update()
-      cb()
-      return
-    }
-
-    // otherwise, play the video
-    this.update()
-
-    ipcRenderer.send('onPlayerUpdate', Playlist.hasNext(state), Playlist.hasPrevious(state))
-    cb()
-  }
-
-  closePlayer () {
-    console.log('closePlayer')
-
-    // Quit any external players, like Chromecast/Airplay/etc or VLC
-    const state = this.state
-    if (isCasting(state)) {
-      Cast.stop()
-    }
-    if (state.playing.location === 'external') {
-      ipcRenderer.send('quitExternalPlayer')
-    }
-
-    // Save volume (this session only, not in state.saved)
-    state.previousVolume = state.playing.volume
-
-    // Telemetry: track what happens after the user clicks play
-    const result = state.playing.result // 'success' or 'error'
-    if (result === 'success') telemetry.logPlayAttempt('success') // first frame displayed
-    else if (result === 'error') telemetry.logPlayAttempt('error') // codec missing, etc
-    else if (result === undefined) telemetry.logPlayAttempt('abandoned') // user gave up waiting
-    else console.error('Unknown state.playing.result', state.playing.result)
-
-    // Reset the window contents back to the home screen
-    state.playing = State.getDefaultPlayState()
-    state.server = null
-
-    // Reset the window size and location back to where it was
-    if (state.window.isFullScreen) {
-      dispatch('toggleFullScreen', false)
-    }
-    restoreBounds(state)
-
-    // Tell the WebTorrent process to kill the torrent-to-HTTP server
-    ipcRenderer.send('wt-stop-server')
-
-    ipcRenderer.send('onPlayerClose')
-
-    this.update()
-  }
-}
-
-// Checks whether we are connected and already casting
-// Returns false if we not casting (state.playing.location === 'local')
-// or if we're trying to connect but haven't yet ('chromecast-pending', etc)
-function isCasting (state) {
-  return state.playing.location === 'chromecast' ||
-    state.playing.location === 'airplay' ||
-    state.playing.location === 'dlna'
-}
-
-function restoreBounds (state) {
-  ipcRenderer.send('setAspectRatio', 0)
-  if (state.window.bounds) {
-    ipcRenderer.send('setBounds', state.window.bounds, false)
-  }
-}

src/renderer/controllers/prefs-controller.js

@@ -1,62 +0,0 @@
-const State = require('../lib/state')
-const {dispatch} = require('../lib/dispatcher')
-const ipcRenderer = require('electron').ipcRenderer
-
-// Controls the Preferences screen
-module.exports = class PrefsController {
-  constructor (state, config) {
-    this.state = state
-    this.config = config
-  }
-
-  // Goes to the Preferences screen
-  show () {
-    const state = this.state
-    state.location.go({
-      url: 'preferences',
-      setup: function (cb) {
-        // initialize preferences
-        state.window.title = 'Preferences'
-        state.unsaved = Object.assign(state.unsaved || {}, {
-          prefs: Object.assign({}, state.saved.prefs)
-        })
-        ipcRenderer.send('setAllowNav', false)
-        cb()
-      },
-      destroy: () => {
-        ipcRenderer.send('setAllowNav', true)
-        this.save()
-      }
-    })
-  }
-
-  // Updates a single property in the UNSAVED prefs
-  // For example: updatePreferences('foo.bar', 'baz')
-  // Call save() to save to config.json
-  update (property, value) {
-    const path = property.split('.')
-    let obj = this.state.unsaved.prefs
-    let i
-    for (i = 0; i < path.length - 1; i++) {
-      if (typeof obj[path[i]] === 'undefined') {
-        obj[path[i]] = {}
-      }
-      obj = obj[path[i]]
-    }
-    obj[path[i]] = value
-  }
-
-  // All unsaved prefs take effect atomically, and are saved to config.json
-  save () {
-    const state = this.state
-    if (state.unsaved.prefs.isFileHandler !== state.saved.prefs.isFileHandler) {
-      ipcRenderer.send('setDefaultFileHandler', state.unsaved.prefs.isFileHandler)
-    }
-    if (state.unsaved.prefs.startup !== state.saved.prefs.startup) {
-      ipcRenderer.send('setStartup', state.unsaved.prefs.startup)
-    }
-    state.saved.prefs = Object.assign(state.saved.prefs || {}, state.unsaved.prefs)
-    State.save(state)
-    dispatch('checkDownloadPath')
-  }
-}

src/renderer/controllers/subtitles-controller.js

@@ -1,138 +0,0 @@
-const electron = require('electron')
-const fs = require('fs-extra')
-const path = require('path')
-const parallel = require('run-parallel')
-
-const remote = electron.remote
-
-const {dispatch} = require('../lib/dispatcher')
-
-module.exports = class SubtitlesController {
-  constructor (state) {
-    this.state = state
-  }
-
-  openSubtitles () {
-    remote.dialog.showOpenDialog({
-      title: 'Select a subtitles file.',
-      filters: [ { name: 'Subtitles', extensions: ['vtt', 'srt'] } ],
-      properties: [ 'openFile' ]
-    }, (filenames) => {
-      if (!Array.isArray(filenames)) return
-      this.addSubtitles(filenames, true)
-    })
-  }
-
-  selectSubtitle (ix) {
-    this.state.playing.subtitles.selectedIndex = ix
-  }
-
-  toggleSubtitlesMenu () {
-    const subtitles = this.state.playing.subtitles
-    subtitles.showMenu = !subtitles.showMenu
-  }
-
-  addSubtitles (files, autoSelect) {
-    // Subtitles are only supported when playing video files
-    if (this.state.playing.type !== 'video') return
-    if (files.length === 0) return
-    const subtitles = this.state.playing.subtitles
-
-    // Read the files concurrently, then add all resulting subtitle tracks
-    const tasks = files.map((file) => (cb) => loadSubtitle(file, cb))
-    parallel(tasks, function (err, tracks) {
-      if (err) return dispatch('error', err)
-
-      for (let i = 0; i < tracks.length; i++) {
-        // No dupes allowed
-        const track = tracks[i]
-        let trackIndex = subtitles.tracks.findIndex((t) =>
-          track.filePath === t.filePath)
-
-        // Add the track
-        if (trackIndex === -1) {
-          trackIndex = subtitles.tracks.push(track) - 1
-        }
-
-        // If we're auto-selecting a track, try to find one in the user's language
-        if (autoSelect && (i === 0 || isSystemLanguage(track.language))) {
-          subtitles.selectedIndex = trackIndex
-        }
-      }
-
-      // Finally, make sure no two tracks have the same label
-      relabelSubtitles(subtitles)
-    })
-  }
-
-  checkForSubtitles () {
-    if (this.state.playing.type !== 'video') return
-    const torrentSummary = this.state.getPlayingTorrentSummary()
-    if (!torrentSummary || !torrentSummary.progress) return
-
-    torrentSummary.progress.files.forEach((fp, ix) => {
-      if (fp.numPieces !== fp.numPiecesPresent) return // ignore incomplete files
-      const file = torrentSummary.files[ix]
-      if (!this.isSubtitle(file.name)) return
-      const filePath = path.join(torrentSummary.path, file.path)
-      this.addSubtitles([filePath], false)
-    })
-  }
-
-  isSubtitle (file) {
-    const name = typeof file === 'string' ? file : file.name
-    const ext = path.extname(name).toLowerCase()
-    return ext === '.srt' || ext === '.vtt'
-  }
-}
-
-function loadSubtitle (file, cb) {
-  // Lazy load to keep startup fast
-  const concat = require('simple-concat')
-  const LanguageDetect = require('languagedetect')
-  const srtToVtt = require('srt-to-vtt')
-
-  // Read the .SRT or .VTT file, parse it, add subtitle track
-  const filePath = file.path || file
-
-  const vttStream = fs.createReadStream(filePath).pipe(srtToVtt())
-
-  concat(vttStream, function (err, buf) {
-    if (err) return dispatch('error', 'Can\'t parse subtitles file.')
-
-    // Detect what language the subtitles are in
-    const vttContents = buf.toString().replace(/(.*-->.*)/g, '')
-    let langDetected = (new LanguageDetect()).detect(vttContents, 2)
-    langDetected = langDetected.length ? langDetected[0][0] : 'subtitle'
-    langDetected = langDetected.slice(0, 1).toUpperCase() + langDetected.slice(1)
-
-    const track = {
-      buffer: 'data:text/vtt;base64,' + buf.toString('base64'),
-      language: langDetected,
-      label: langDetected,
-      filePath: filePath
-    }
-
-    cb(null, track)
-  })
-}
-
-// Checks whether a language name like 'English' or 'German' matches the system
-// language, aka the current locale
-function isSystemLanguage (language) {
-  const iso639 = require('iso-639-1')
-  const osLangISO = window.navigator.language.split('-')[0] // eg 'en'
-  const langIso = iso639.getCode(language) // eg 'de' if language is 'German'
-  return langIso === osLangISO
-}
-
-// Make sure we don't have two subtitle tracks with the same label
-// Labels each track by language, eg 'German', 'English', 'English 2', ...
-function relabelSubtitles (subtitles) {
-  const counts = {}
-  subtitles.tracks.forEach(function (track) {
-    const lang = track.language
-    counts[lang] = (counts[lang] || 0) + 1
-    track.label = counts[lang] > 1 ? (lang + ' ' + counts[lang]) : lang
-  })
-}

src/renderer/controllers/torrent-controller.js

@@ -1,186 +0,0 @@
-const path = require('path')
-const ipcRenderer = require('electron').ipcRenderer
-
-const TorrentSummary = require('../lib/torrent-summary')
-const sound = require('../lib/sound')
-const {dispatch} = require('../lib/dispatcher')
-
-module.exports = class TorrentController {
-  constructor (state) {
-    this.state = state
-  }
-
-  torrentInfoHash (torrentKey, infoHash) {
-    let torrentSummary = this.getTorrentSummary(torrentKey)
-    console.log('got infohash for %s torrent %s',
-      torrentSummary ? 'existing' : 'new', torrentKey)
-
-    if (!torrentSummary) {
-      const torrents = this.state.saved.torrents
-
-      // Check if an existing (non-active) torrent has the same info hash
-      if (torrents.find((t) => t.infoHash === infoHash)) {
-        ipcRenderer.send('wt-stop-torrenting', infoHash)
-        return dispatch('error', 'Cannot add duplicate torrent')
-      }
-
-      torrentSummary = {
-        torrentKey: torrentKey,
-        status: 'new'
-      }
-      torrents.unshift(torrentSummary)
-      sound.play('ADD')
-    }
-
-    torrentSummary.infoHash = infoHash
-    dispatch('update')
-  }
-
-  torrentWarning (torrentKey, message) {
-    console.log('warning for torrent %s: %s', torrentKey, message)
-  }
-
-  torrentError (torrentKey, message) {
-    // TODO: WebTorrent needs semantic errors
-    if (message.startsWith('Cannot add duplicate torrent')) {
-      // Remove infohash from the message
-      message = 'Cannot add duplicate torrent'
-    }
-    dispatch('error', message)
-
-    const torrentSummary = this.getTorrentSummary(torrentKey)
-    if (torrentSummary) {
-      console.log('Pausing torrent %s due to error: %s', torrentSummary.infoHash, message)
-      torrentSummary.status = 'paused'
-      dispatch('update')
-    }
-  }
-
-  torrentMetadata (torrentKey, torrentInfo) {
-    // Summarize torrent
-    const torrentSummary = this.getTorrentSummary(torrentKey)
-    torrentSummary.status = 'downloading'
-    torrentSummary.name = torrentSummary.displayName || torrentInfo.name
-    torrentSummary.path = torrentInfo.path
-    torrentSummary.magnetURI = torrentInfo.magnetURI
-    // TODO: make torrentInfo immutable, save separately as torrentSummary.info
-    // For now, check whether torrentSummary.files has already been set:
-    const hasDetailedFileInfo = torrentSummary.files && torrentSummary.files[0].path
-    if (!hasDetailedFileInfo) {
-      torrentSummary.files = torrentInfo.files
-    }
-    if (!torrentSummary.selections) {
-      torrentSummary.selections = torrentSummary.files.map((x) => true)
-    }
-    dispatch('update')
-
-    // Save the .torrent file, if it hasn't been saved already
-    if (!torrentSummary.torrentFileName) ipcRenderer.send('wt-save-torrent-file', torrentKey)
-
-    // Auto-generate a poster image, if it hasn't been generated already
-    if (!torrentSummary.posterFileName) ipcRenderer.send('wt-generate-torrent-poster', torrentKey)
-  }
-
-  torrentDone (torrentKey, torrentInfo) {
-    // Update the torrent summary
-    const torrentSummary = this.getTorrentSummary(torrentKey)
-    torrentSummary.status = 'seeding'
-
-    // Notify the user that a torrent finished, but only if we actually DL'd at least part of it.
-    // Don't notify if we merely finished verifying data files that were already on disk.
-    if (torrentInfo.bytesReceived > 0) {
-      if (!this.state.window.isFocused) {
-        this.state.dock.badge += 1
-      }
-      showDoneNotification(torrentSummary)
-      ipcRenderer.send('downloadFinished', getTorrentPath(torrentSummary))
-    }
-
-    dispatch('update')
-  }
-
-  torrentProgress (progressInfo) {
-    // Overall progress across all active torrents, 0 to 1, or -1 to hide the progress bar
-    // Hide progress bar when client has no torrents, or progress is 100%
-    const progress = (!progressInfo.hasActiveTorrents || progressInfo.progress === 1)
-      ? -1
-      : progressInfo.progress
-
-    // Show progress bar under the WebTorrent taskbar icon, on OSX
-    this.state.dock.progress = progress
-
-    // Update progress for each individual torrent
-    progressInfo.torrents.forEach((p) => {
-      const torrentSummary = this.getTorrentSummary(p.torrentKey)
-      if (!torrentSummary) {
-        console.log('warning: got progress for missing torrent %s', p.torrentKey)
-        return
-      }
-      torrentSummary.progress = p
-    })
-
-    // TODO: Find an efficient way to re-enable this line, which allows subtitle
-    //       files which are completed after a video starts to play to be added
-    //       dynamically to the list of subtitles.
-    // checkForSubtitles()
-  }
-
-  torrentFileModtimes (torrentKey, fileModtimes) {
-    const torrentSummary = this.getTorrentSummary(torrentKey)
-    if (!torrentSummary) throw new Error('Not saving modtimes for deleted torrent ' + torrentKey)
-    torrentSummary.fileModtimes = fileModtimes
-    dispatch('saveStateThrottled')
-  }
-
-  torrentFileSaved (torrentKey, torrentFileName) {
-    console.log('torrent file saved %s: %s', torrentKey, torrentFileName)
-    const torrentSummary = this.getTorrentSummary(torrentKey)
-    torrentSummary.torrentFileName = torrentFileName
-    dispatch('saveStateThrottled')
-  }
-
-  torrentPosterSaved (torrentKey, posterFileName) {
-    const torrentSummary = this.getTorrentSummary(torrentKey)
-    torrentSummary.posterFileName = posterFileName
-    dispatch('saveStateThrottled')
-  }
-
-  torrentAudioMetadata (infoHash, index, info) {
-    const torrentSummary = this.getTorrentSummary(infoHash)
-    const fileSummary = torrentSummary.files[index]
-    fileSummary.audioInfo = info
-    dispatch('update')
-  }
-
-  torrentServerRunning (serverInfo) {
-    this.state.server = serverInfo
-  }
-
-  // Gets a torrent summary {name, infoHash, status} from state.saved.torrents
-  // Returns undefined if we don't know that infoHash
-  getTorrentSummary (torrentKey) {
-    return TorrentSummary.getByKey(this.state, torrentKey)
-  }
-}
-
-function getTorrentPath (torrentSummary) {
-  let itemPath = TorrentSummary.getFileOrFolder(torrentSummary)
-  if (torrentSummary.files.length > 1) {
-    itemPath = path.dirname(itemPath)
-  }
-  return itemPath
-}
-
-function showDoneNotification (torrent) {
-  const notif = new window.Notification('Download Complete', {
-    body: torrent.name,
-    silent: true
-  })
-
-  notif.onclick = function () {
-    ipcRenderer.send('show')
-  }
-
-  // Only play notification sound if player is inactive
-  if (this.state.playing.isPaused) sound.play('DONE')
-}

src/renderer/controllers/torrent-list-controller.js

@@ -1,312 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const electron = require('electron')
-
-const {dispatch} = require('../lib/dispatcher')
-const {TorrentKeyNotFoundError} = require('../lib/errors')
-const State = require('../lib/state')
-const sound = require('../lib/sound')
-const TorrentSummary = require('../lib/torrent-summary')
-
-const ipcRenderer = electron.ipcRenderer
-
-const instantIoRegex = /^(https:\/\/)?instant\.io\/#/
-
-// Controls the torrent list: creating, adding, deleting, & manipulating torrents
-module.exports = class TorrentListController {
-  constructor (state) {
-    this.state = state
-  }
-
-  // Adds a torrent to the list, starts downloading/seeding.
-  // TorrentID can be a magnet URI, infohash, or torrent file: https://git.io/vik9M
-  addTorrent (torrentId) {
-    if (torrentId.path) {
-      // Use path string instead of W3C File object
-      torrentId = torrentId.path
-    }
-
-    // Allow a instant.io link to be pasted
-    if (typeof torrentId === 'string' && instantIoRegex.test(torrentId)) {
-      torrentId = torrentId.slice(torrentId.indexOf('#') + 1)
-    }
-
-    const torrentKey = this.state.nextTorrentKey++
-    const path = this.state.saved.prefs.downloadPath
-
-    ipcRenderer.send('wt-start-torrenting', torrentKey, torrentId, path)
-
-    dispatch('backToList')
-  }
-
-  // Shows the Create Torrent page with options to seed a given file or folder
-  showCreateTorrent (files) {
-    // You can only create torrents from the home screen.
-    if (this.state.location.url() !== 'home') {
-      return dispatch('error', 'Please go back to the torrent list before creating a new torrent.')
-    }
-
-    // Files will either be an array of file objects, which we can send directly
-    // to the create-torrent screen
-    if (files.length === 0 || typeof files[0] !== 'string') {
-      this.state.location.go({
-        url: 'create-torrent',
-        files: files,
-        setup: (cb) => {
-          this.state.window.title = 'Create New Torrent'
-          cb(null)
-        }
-      })
-      return
-    }
-
-    // ... or it will be an array of mixed file and folder paths. We have to walk
-    // through all the folders and find the files
-    findFilesRecursive(files, (allFiles) => this.showCreateTorrent(allFiles))
-  }
-
-  // Creates a new torrent and start seeeding
-  createTorrent (options) {
-    const state = this.state
-    const torrentKey = state.nextTorrentKey++
-    ipcRenderer.send('wt-create-torrent', torrentKey, options)
-    state.location.cancel()
-  }
-
-  // Starts downloading and/or seeding a given torrentSummary.
-  startTorrentingSummary (torrentKey) {
-    const s = TorrentSummary.getByKey(this.state, torrentKey)
-    if (!s) throw new TorrentKeyNotFoundError(torrentKey)
-
-    // New torrent: give it a path
-    if (!s.path) {
-      // Use Downloads folder by default
-      s.path = this.state.saved.prefs.downloadPath
-      return start()
-    }
-
-    const fileOrFolder = TorrentSummary.getFileOrFolder(s)
-
-    // New torrent: metadata not yet received
-    if (!fileOrFolder) return start()
-
-    // Existing torrent: check that the path is still there
-    fs.stat(fileOrFolder, function (err) {
-      if (err) {
-        s.error = 'path-missing'
-        return
-      }
-      start()
-    })
-
-    function start () {
-      ipcRenderer.send('wt-start-torrenting',
-        s.torrentKey,
-        TorrentSummary.getTorrentID(s),
-        s.path,
-        s.fileModtimes,
-        s.selections)
-    }
-  }
-
-  // TODO: use torrentKey, not infoHash
-  toggleTorrent (infoHash) {
-    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    if (torrentSummary.status === 'paused') {
-      torrentSummary.status = 'new'
-      this.startTorrentingSummary(torrentSummary.torrentKey)
-      sound.play('ENABLE')
-    } else {
-      torrentSummary.status = 'paused'
-      ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
-      sound.play('DISABLE')
-    }
-  }
-
-  toggleTorrentFile (infoHash, index) {
-    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    torrentSummary.selections[index] = !torrentSummary.selections[index]
-
-    // Let the WebTorrent process know to start or stop fetching that file
-    if (torrentSummary.status !== 'paused') {
-      ipcRenderer.send('wt-select-files', infoHash, torrentSummary.selections)
-    }
-  }
-
-  confirmDeleteTorrent (infoHash, deleteData) {
-    this.state.modal = {
-      id: 'remove-torrent-modal',
-      infoHash,
-      deleteData
-    }
-  }
-
-  // TODO: use torrentKey, not infoHash
-  deleteTorrent (infoHash, deleteData) {
-    ipcRenderer.send('wt-stop-torrenting', infoHash)
-
-    const index = this.state.saved.torrents.findIndex((x) => x.infoHash === infoHash)
-
-    if (index > -1) {
-      const summary = this.state.saved.torrents[index]
-
-      // remove torrent and poster file
-      deleteFile(TorrentSummary.getTorrentPath(summary))
-      deleteFile(TorrentSummary.getPosterPath(summary))
-
-      // optionally delete the torrent data
-      if (deleteData) moveItemToTrash(summary)
-
-      // remove torrent from saved list
-      this.state.saved.torrents.splice(index, 1)
-      State.saveThrottled(this.state)
-    }
-
-    // prevent user from going forward to a deleted torrent
-    this.state.location.clearForward('player')
-    sound.play('DELETE')
-  }
-
-  toggleSelectTorrent (infoHash) {
-    if (this.state.selectedInfoHash === infoHash) {
-      this.state.selectedInfoHash = null
-    } else {
-      this.state.selectedInfoHash = infoHash
-    }
-  }
-
-  openTorrentContextMenu (infoHash) {
-    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    const menu = new electron.remote.Menu()
-
-    menu.append(new electron.remote.MenuItem({
-      label: 'Remove From List',
-      click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
-    }))
-
-    menu.append(new electron.remote.MenuItem({
-      label: 'Remove Data File',
-      click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
-    }))
-
-    menu.append(new electron.remote.MenuItem({
-      type: 'separator'
-    }))
-
-    if (torrentSummary.files) {
-      menu.append(new electron.remote.MenuItem({
-        label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
-        click: () => showItemInFolder(torrentSummary)
-      }))
-      menu.append(new electron.remote.MenuItem({
-        type: 'separator'
-      }))
-    }
-
-    menu.append(new electron.remote.MenuItem({
-      label: 'Copy Magnet Link to Clipboard',
-      click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
-    }))
-
-    menu.append(new electron.remote.MenuItem({
-      label: 'Copy Instant.io Link to Clipboard',
-      click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
-    }))
-
-    menu.append(new electron.remote.MenuItem({
-      label: 'Save Torrent File As...',
-      click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey)
-    }))
-
-    menu.popup(electron.remote.getCurrentWindow())
-  }
-
-  // Takes a torrentSummary or torrentKey
-  // Shows a Save File dialog, then saves the .torrent file wherever the user requests
-  saveTorrentFileAs (torrentKey) {
-    const torrentSummary = TorrentSummary.getByKey(this.state, torrentKey)
-    if (!torrentSummary) throw new Error('Missing torrentKey: ' + torrentKey)
-    const downloadPath = this.state.saved.prefs.downloadPath
-    const newFileName = path.parse(torrentSummary.name).name + '.torrent'
-    const win = electron.remote.getCurrentWindow()
-    const opts = {
-      title: 'Save Torrent File',
-      defaultPath: path.join(downloadPath, newFileName),
-      filters: [
-        { name: 'Torrent Files', extensions: ['torrent'] },
-        { name: 'All Files', extensions: ['*'] }
-      ]
-    }
-
-    electron.remote.dialog.showSaveDialog(win, opts, function (savePath) {
-      console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
-      if (!savePath) return // They clicked Cancel
-      const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
-      fs.readFile(torrentPath, function (err, torrentFile) {
-        if (err) return dispatch('error', err)
-        fs.writeFile(savePath, torrentFile, function (err) {
-          if (err) return dispatch('error', err)
-        })
-      })
-    })
-  }
-}
-
-// Recursively finds {name, path, size} for all files in a folder
-// Calls `cb` on success, calls `onError` on failure
-function findFilesRecursive (paths, cb) {
-  if (paths.length > 1) {
-    let numComplete = 0
-    let ret = []
-    paths.forEach(function (path) {
-      findFilesRecursive([path], function (fileObjs) {
-        ret.push(...fileObjs)
-        if (++numComplete === paths.length) {
-          ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
-          cb(ret)
-        }
-      })
-    })
-    return
-  }
-
-  const fileOrFolder = paths[0]
-  fs.stat(fileOrFolder, function (err, stat) {
-    if (err) return dispatch('error', err)
-
-    // Files: return name, path, and size
-    if (!stat.isDirectory()) {
-      const filePath = fileOrFolder
-      return cb([{
-        name: path.basename(filePath),
-        path: filePath,
-        size: stat.size
-      }])
-    }
-
-    // Folders: recurse, make a list of all the files
-    const folderPath = fileOrFolder
-    fs.readdir(folderPath, function (err, fileNames) {
-      if (err) return dispatch('error', err)
-      const paths = fileNames.map((fileName) => path.join(folderPath, fileName))
-      findFilesRecursive(paths, cb)
-    })
-  })
-}
-
-function deleteFile (path) {
-  if (!path) return
-  fs.unlink(path, function (err) {
-    if (err) dispatch('error', err)
-  })
-}
-
-// Delete all files in a torrent
-function moveItemToTrash (torrentSummary) {
-  const filePath = TorrentSummary.getFileOrFolder(torrentSummary)
-  if (filePath) ipcRenderer.send('moveItemToTrash', filePath)
-}
-
-function showItemInFolder (torrentSummary) {
-  ipcRenderer.send('showItemInFolder', TorrentSummary.getFileOrFolder(torrentSummary))
-}

src/renderer/controllers/update-controller.js

@@ -1,26 +0,0 @@
-const State = require('../lib/state')
-
-// Controls the UI checking for new versions of the app, prompting install
-module.exports = class UpdateController {
-  constructor (state) {
-    this.state = state
-  }
-
-  // Shows a modal saying that we have an update
-  updateAvailable (version) {
-    const skipped = this.state.saved.skippedVersions
-    if (skipped && skipped.includes(version)) {
-      console.log('new version skipped by user: v' + version)
-      return
-    }
-    this.state.modal = { id: 'update-available-modal', version: version }
-  }
-
-  // Don't show the modal again until the next version
-  skipVersion (version) {
-    let skipped = this.state.saved.skippedVersions
-    if (!skipped) skipped = this.state.saved.skippedVersions = []
-    skipped.push(version)
-    State.saveThrottled(this.state)
-  }
-}

src/renderer/lib/cast.js

@@ -1,496 +0,0 @@
-// The Cast module talks to Airplay and Chromecast
-// * Modifies state when things change
-// * Starts and stops casting, provides remote video controls
-module.exports = {
-  init,
-  toggleMenu,
-  selectDevice,
-  stop,
-  play,
-  pause,
-  seek,
-  setVolume,
-  setRate
-}
-
-const config = require('../../config')
-const {CastingError} = require('./errors')
-
-// Lazy load these for a ~300ms improvement in startup time
-let airplayer, chromecasts, dlnacasts
-
-// App state. Cast modifies state.playing and state.errors in response to events
-let state
-
-// Callback to notify module users when state has changed
-let update
-
-// setInterval() for updating cast status
-let statusInterval = null
-
-// Start looking for cast devices on the local network
-function init (appState, callback) {
-  state = appState
-  update = callback
-
-  // Don't actually cast during integration tests
-  // (Otherwise you'd need a physical Chromecast + AppleTV + DLNA TV to run them.)
-  if (config.IS_TEST) {
-    state.devices.chromecast = testPlayer('chromecast')
-    state.devices.airplay = testPlayer('airplay')
-    state.devices.dlna = testPlayer('dlna')
-    return
-  }
-
-  // Load modules, scan the network for devices
-  airplayer = require('airplayer')()
-  chromecasts = require('chromecasts')()
-  dlnacasts = require('dlnacasts')()
-
-  state.devices.chromecast = chromecastPlayer()
-  state.devices.dlna = dlnaPlayer()
-  state.devices.airplay = airplayPlayer()
-
-  // Listen for devices: Chromecast, DLNA and Airplay
-  chromecasts.on('update', function (device) {
-    // TODO: how do we tell if there are *no longer* any Chromecasts available?
-    // From looking at the code, chromecasts.players only grows, never shrinks
-    state.devices.chromecast.addDevice(device)
-  })
-
-  dlnacasts.on('update', function (device) {
-    state.devices.dlna.addDevice(device)
-  })
-
-  airplayer.on('update', function (device) {
-    state.devices.airplay.addDevice(device)
-  })
-}
-
-// integration test player implementation
-function testPlayer (type) {
-  return {
-    getDevices,
-    open,
-    play,
-    pause,
-    stop,
-    status,
-    seek,
-    volume
-  }
-
-  function getDevices () {
-    return [{name: type + '-1'}, {name: type + '-2'}]
-  }
-
-  function open () {}
-  function play () {}
-  function pause () {}
-  function stop () {}
-  function status () {}
-  function seek () {}
-  function volume () {}
-}
-
-// chromecast player implementation
-function chromecastPlayer () {
-  const ret = {
-    device: null,
-    addDevice,
-    getDevices,
-    open,
-    play,
-    pause,
-    stop,
-    status,
-    seek,
-    volume
-  }
-  return ret
-
-  function getDevices () {
-    return chromecasts.players
-  }
-
-  function addDevice (device) {
-    device.on('error', function (err) {
-      if (device !== ret.device) return
-      state.playing.location = 'local'
-      state.errors.push({
-        time: new Date().getTime(),
-        message: 'Could not connect to Chromecast. ' + err.message
-      })
-      update()
-    })
-    device.on('disconnect', function () {
-      if (device !== ret.device) return
-      state.playing.location = 'local'
-      update()
-    })
-  }
-
-  function open () {
-    const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
-      type: 'video/mp4',
-      title: config.APP_NAME + ' - ' + torrentSummary.name
-    }, function (err) {
-      if (err) {
-        state.playing.location = 'local'
-        state.errors.push({
-          time: new Date().getTime(),
-          message: 'Could not connect to Chromecast. ' + err.message
-        })
-      } else {
-        state.playing.location = 'chromecast'
-      }
-      update()
-    })
-  }
-
-  function play (callback) {
-    ret.device.play(null, null, callback)
-  }
-
-  function pause (callback) {
-    ret.device.pause(callback)
-  }
-
-  function stop (callback) {
-    ret.device.stop(callback)
-  }
-
-  function status () {
-    ret.device.status(handleStatus)
-  }
-
-  function seek (time, callback) {
-    ret.device.seek(time, callback)
-  }
-
-  function volume (volume, callback) {
-    ret.device.volume(volume, callback)
-  }
-}
-
-// airplay player implementation
-function airplayPlayer () {
-  const ret = {
-    device: null,
-    addDevice,
-    getDevices,
-    open,
-    play,
-    pause,
-    stop,
-    status,
-    seek,
-    volume
-  }
-  return ret
-
-  function addDevice (player) {
-    player.on('event', function (event) {
-      switch (event.state) {
-        case 'loading':
-          break
-        case 'playing':
-          state.playing.isPaused = false
-          break
-        case 'paused':
-          state.playing.isPaused = true
-          break
-        case 'stopped':
-          break
-      }
-      update()
-    })
-  }
-
-  function getDevices () {
-    return airplayer.players
-  }
-
-  function open () {
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, function (err, res) {
-      if (err) {
-        state.playing.location = 'local'
-        state.errors.push({
-          time: new Date().getTime(),
-          message: 'Could not connect to AirPlay. ' + err.message
-        })
-      } else {
-        state.playing.location = 'airplay'
-      }
-      update()
-    })
-  }
-
-  function play (callback) {
-    ret.device.resume(callback)
-  }
-
-  function pause (callback) {
-    ret.device.pause(callback)
-  }
-
-  function stop (callback) {
-    ret.device.stop(callback)
-  }
-
-  function status () {
-    ret.device.playbackInfo(function (err, res, status) {
-      if (err) {
-        state.playing.location = 'local'
-        state.errors.push({
-          time: new Date().getTime(),
-          message: 'Could not connect to AirPlay. ' + err.message
-        })
-      } else {
-        state.playing.isPaused = status.rate === 0
-        state.playing.currentTime = status.position
-        update()
-      }
-    })
-  }
-
-  function seek (time, callback) {
-    ret.device.scrub(time, callback)
-  }
-
-  function volume (volume, callback) {
-    // AirPlay doesn't support volume
-    // TODO: We should just disable the volume slider
-    state.playing.volume = volume
-  }
-}
-
-// DLNA player implementation
-function dlnaPlayer (player) {
-  const ret = {
-    device: null,
-    addDevice,
-    getDevices,
-    open,
-    play,
-    pause,
-    stop,
-    status,
-    seek,
-    volume
-  }
-  return ret
-
-  function getDevices () {
-    return dlnacasts.players
-  }
-
-  function addDevice (device) {
-    device.on('error', function (err) {
-      if (device !== ret.device) return
-      state.playing.location = 'local'
-      state.errors.push({
-        time: new Date().getTime(),
-        message: 'Could not connect to DLNA. ' + err.message
-      })
-      update()
-    })
-    device.on('disconnect', function () {
-      if (device !== ret.device) return
-      state.playing.location = 'local'
-      update()
-    })
-  }
-
-  function open () {
-    const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
-      type: 'video/mp4',
-      title: config.APP_NAME + ' - ' + torrentSummary.name,
-      seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
-    }, function (err) {
-      if (err) {
-        state.playing.location = 'local'
-        state.errors.push({
-          time: new Date().getTime(),
-          message: 'Could not connect to DLNA. ' + err.message
-        })
-      } else {
-        state.playing.location = 'dlna'
-      }
-      update()
-    })
-  }
-
-  function play (callback) {
-    ret.device.play(null, null, callback)
-  }
-
-  function pause (callback) {
-    ret.device.pause(callback)
-  }
-
-  function stop (callback) {
-    ret.device.stop(callback)
-  }
-
-  function status () {
-    ret.device.status(handleStatus)
-  }
-
-  function seek (time, callback) {
-    ret.device.seek(time, callback)
-  }
-
-  function volume (volume, callback) {
-    ret.device.volume(volume, function (err) {
-      // quick volume update
-      state.playing.volume = volume
-      callback(err)
-    })
-  }
-}
-
-function handleStatus (err, status) {
-  if (err || !status) {
-    return console.log('error getting %s status: %o',
-      state.playing.location,
-      err || 'missing response')
-  }
-  state.playing.isPaused = status.playerState === 'PAUSED'
-  state.playing.currentTime = status.currentTime
-  state.playing.volume = status.volume.muted ? 0 : status.volume.level
-  update()
-}
-
-// Start polling cast device state, whenever we're connected
-function startStatusInterval () {
-  statusInterval = setInterval(function () {
-    const player = getPlayer()
-    if (player) player.status()
-  }, 1000)
-}
-
-/*
- * Shows the device menu for a given cast type ('chromecast', 'airplay', etc)
- * The menu lists eg. all Chromecasts detected; the user can click one to cast.
- * If the menu was already showing for that type, hides the menu.
- */
-function toggleMenu (location) {
-  // If the menu is already showing, hide it
-  if (state.devices.castMenu && state.devices.castMenu.location === location) {
-    state.devices.castMenu = null
-    return
-  }
-
-  // Never cast to two devices at the same time
-  if (state.playing.location !== 'local') {
-    throw new CastingError(
-      `You can't connect to ${location} when already connected to another device`
-    ) }
-
-  // Find all cast devices of the given type
-  const player = getPlayer(location)
-  const devices = player ? player.getDevices() : []
-  if (devices.length === 0) {
-    throw new CastingError(`No ${location} devices available`)
-  }
-
-  // Show a menu
-  state.devices.castMenu = {location, devices}
-}
-
-function selectDevice (index) {
-  const {location, devices} = state.devices.castMenu
-
-  // Start casting
-  const player = getPlayer(location)
-  player.device = devices[index]
-  player.open()
-
-  // Poll the casting device's status every few seconds
-  startStatusInterval()
-
-  // Show the Connecting... screen
-  state.devices.castMenu = null
-  state.playing.castName = devices[index].name
-  state.playing.location = location + '-pending'
-  update()
-}
-
-// Stops casting, move video back to local screen
-function stop () {
-  const player = getPlayer()
-  if (player) {
-    player.stop(function () {
-      player.device = null
-      stoppedCasting()
-    })
-    clearInterval(statusInterval)
-  } else {
-    stoppedCasting()
-  }
-}
-
-function stoppedCasting () {
-  state.playing.location = 'local'
-  state.playing.jumpToTime = Number.isFinite(state.playing.currentTime)
-    ? state.playing.currentTime
-    : 0
-  update()
-}
-
-function getPlayer (location) {
-  if (location) {
-    return state.devices[location]
-  } else if (state.playing.location === 'chromecast') {
-    return state.devices.chromecast
-  } else if (state.playing.location === 'airplay') {
-    return state.devices.airplay
-  } else if (state.playing.location === 'dlna') {
-    return state.devices.dlna
-  } else {
-    return null
-  }
-}
-
-function play () {
-  const player = getPlayer()
-  if (player) player.play(castCallback)
-}
-
-function pause () {
-  const player = getPlayer()
-  if (player) player.pause(castCallback)
-}
-
-function setRate (rate) {
-  let player
-  let result = true
-  if (state.playing.location === 'chromecast') {
-    // TODO find how to control playback rate on chromecast
-    castCallback()
-    result = false
-  } else if (state.playing.location === 'airplay') {
-    player = state.devices.airplay
-    player.rate(rate, castCallback)
-  } else {
-    result = false
-  }
-  return result
-}
-
-function seek (time) {
-  const player = getPlayer()
-  if (player) player.seek(time, castCallback)
-}
-
-function setVolume (volume) {
-  const player = getPlayer()
-  if (player) player.volume(volume, castCallback)
-}
-
-function castCallback () {
-  console.log('%s callback: %o', state.playing.location, arguments)
-}

src/renderer/lib/dispatcher.js

@@ -1,39 +0,0 @@
-module.exports = {
-  dispatch,
-  dispatcher,
-  setDispatch
-}
-
-const dispatchers = {}
-let _dispatch = function () {}
-
-function setDispatch (dispatch) {
-  _dispatch = dispatch
-}
-
-function dispatch (...args) {
-  _dispatch(...args)
-}
-
-// Most DOM event handlers are trivial functions like `() => dispatch(<args>)`.
-// For these, `dispatcher(<args>)` is preferred because it memoizes the handler
-// function. This prevents React from updating the listener functions on
-// each update().
-function dispatcher (...args) {
-  const str = JSON.stringify(args)
-  let handler = dispatchers[str]
-  if (!handler) {
-    handler = dispatchers[str] = function (e) {
-      // Do not propagate click to elements below the button
-      e.stopPropagation()
-
-      if (e.currentTarget.classList.contains('disabled')) {
-        // Ignore clicks on disabled elements
-        return
-      }
-
-      dispatch(...args)
-    }
-  }
-  return handler
-}

src/renderer/lib/errors.js

@@ -1,49 +0,0 @@
-const ExtendableError = require('es6-error')
-
-/* Generic errors */
-
-class CastingError extends ExtendableError {}
-class PlaybackError extends ExtendableError {}
-class SoundError extends ExtendableError {}
-class TorrentError extends ExtendableError {}
-
-/* Playback */
-
-class UnplayableTorrentError extends PlaybackError {
-  constructor () { super('Can\'t play any files in torrent') }
-}
-
-class UnplayableFileError extends PlaybackError {
-  constructor () { super('Can\'t play that file') }
-}
-
-class PlaybackTimedOutError extends PlaybackError {
-  constructor () { super('Playback timed out. Try again.') }
-}
-
-/* Sound */
-
-class InvalidSoundNameError extends SoundError {
-  constructor (name) { super(`Invalid sound name: ${name}`) }
-}
-
-/* Torrent */
-
-class TorrentKeyNotFoundError extends TorrentError {
-  constructor (torrentKey) { super(`Can't resolve torrent key ${torrentKey}`) }
-}
-
-class InvalidTorrentError extends TorrentError {}
-
-module.exports = {
-  CastingError,
-  PlaybackError,
-  SoundError,
-  TorrentError,
-  UnplayableTorrentError,
-  UnplayableFileError,
-  PlaybackTimedOutError,
-  InvalidSoundNameError,
-  TorrentKeyNotFoundError,
-  InvalidTorrentError
-}

src/renderer/lib/migrations.js

@@ -1,147 +0,0 @@
-/* eslint-disable camelcase */
-
-module.exports = {
-  run
-}
-
-const semver = require('semver')
-const config = require('../../config')
-const TorrentSummary = require('./torrent-summary')
-const fs = require('fs')
-
-// Change `state.saved` (which will be saved back to config.json on exit) as
-// needed, for example to deal with config.json format changes across versions
-function run (state) {
-  // Replace '{ version: 1 }' with app version (semver)
-  if (!semver.valid(state.saved.version)) {
-    state.saved.version = '0.0.0' // Pre-0.7.0 version, so run all migrations
-  }
-
-  const version = state.saved.version
-
-  if (semver.lt(version, '0.7.0')) {
-    migrate_0_7_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.7.2')) {
-    migrate_0_7_2(state.saved)
-  }
-
-  if (semver.lt(version, '0.11.0')) {
-    migrate_0_11_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.12.0')) {
-    migrate_0_12_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.14.0')) {
-    migrate_0_14_0(state.saved)
-  }
-
-  // Config is now on the new version
-  state.saved.version = config.APP_VERSION
-}
-
-function migrate_0_7_0 (saved) {
-  const fs = require('fs-extra')
-  const path = require('path')
-
-  saved.torrents.forEach(function (ts) {
-    const infoHash = ts.infoHash
-
-    // Replace torrentPath with torrentFileName
-    // There are a number of cases to handle here:
-    // * Originally we used absolute paths
-    // * Then, relative paths for the default torrents, eg '../static/sintel.torrent'
-    // * Then, paths computed at runtime for default torrents, eg 'sintel.torrent'
-    // * Finally, now we're getting rid of torrentPath altogether
-    let src, dst
-    if (ts.torrentPath) {
-      if (path.isAbsolute(ts.torrentPath) || ts.torrentPath.startsWith('..')) {
-        src = ts.torrentPath
-      } else {
-        src = path.join(config.STATIC_PATH, ts.torrentPath)
-      }
-      dst = path.join(config.TORRENT_PATH, infoHash + '.torrent')
-      // Synchronous FS calls aren't ideal, but probably OK in a migration
-      // that only runs once
-      if (src !== dst) fs.copySync(src, dst)
-
-      delete ts.torrentPath
-      ts.torrentFileName = infoHash + '.torrent'
-    }
-
-    // Replace posterURL with posterFileName
-    if (ts.posterURL) {
-      const extension = path.extname(ts.posterURL)
-      src = path.isAbsolute(ts.posterURL)
-        ? ts.posterURL
-        : path.join(config.STATIC_PATH, ts.posterURL)
-      dst = path.join(config.POSTER_PATH, infoHash + extension)
-      // Synchronous FS calls aren't ideal, but probably OK in a migration
-      // that only runs once
-      if (src !== dst) fs.copySync(src, dst)
-
-      delete ts.posterURL
-      ts.posterFileName = infoHash + extension
-    }
-
-    // Fix exception caused by incorrect file ordering.
-    // https://github.com/feross/webtorrent-desktop/pull/604#issuecomment-222805214
-    delete ts.defaultPlayFileIndex
-    delete ts.files
-    delete ts.selections
-    delete ts.fileModtimes
-  })
-}
-
-function migrate_0_7_2 (saved) {
-  if (saved.prefs == null) {
-    saved.prefs = {
-      downloadPath: config.DEFAULT_DOWNLOAD_PATH
-    }
-  }
-}
-
-function migrate_0_11_0 (saved) {
-  if (saved.prefs.isFileHandler == null) {
-    // The app used to make itself the default torrent file handler automatically
-    saved.prefs.isFileHandler = true
-  }
-}
-
-function migrate_0_12_0 (saved) {
-  if (saved.prefs.openExternalPlayer == null && saved.prefs.playInVlc != null) {
-    saved.prefs.openExternalPlayer = saved.prefs.playInVlc
-  }
-  delete saved.prefs.playInVlc
-
-  // Undo a terrible bug where clicking Play on a default torrent on a fresh
-  // install results in a "path missing" error
-  // See https://github.com/feross/webtorrent-desktop/pull/806
-  const defaultTorrentFiles = [
-    '6a9759bffd5c0af65319979fb7832189f4f3c35d.torrent',
-    '88594aaacbde40ef3e2510c47374ec0aa396c08e.torrent',
-    '6a02592d2bbc069628cd5ed8a54f88ee06ac0ba5.torrent',
-    '02767050e0be2fd4db9a2ad6c12416ac806ed6ed.torrent',
-    '3ba219a8634bf7bae3d848192b2da75ae995589d.torrent'
-  ]
-  saved.torrents.forEach(function (torrentSummary) {
-    if (!defaultTorrentFiles.includes(torrentSummary.torrentFileName)) return
-    const fileOrFolder = TorrentSummary.getFileOrFolder(torrentSummary)
-    if (!fileOrFolder) return
-    try {
-      fs.statSync(fileOrFolder)
-    } catch (e) {
-      // Default torrent with "missing path" error. Clear path.
-      delete torrentSummary.path
-    }
-  })
-}
-
-function migrate_0_14_0 (saved) {
-  saved.torrents.forEach(function (ts) {
-    delete ts.defaultPlayFileIndex
-  })
-}

src/renderer/lib/playlist.js

@@ -1,85 +0,0 @@
-module.exports = {
-  hasNext,
-  getNextIndex,
-  hasPrevious,
-  getPreviousIndex,
-  getCurrentLocalURL
-}
-
-const TorrentSummary = require('./torrent-summary')
-const TorrentPlayer = require('./torrent-player')
-
-const cache = {
-  infoHash: null,
-  previousIndex: null,
-  currentIndex: null,
-  nextIndex: null
-}
-
-function hasNext (state) {
-  updateCache(state)
-  return cache.nextIndex !== null
-}
-
-function getNextIndex (state) {
-  updateCache(state)
-  return cache.nextIndex
-}
-
-function hasPrevious (state) {
-  updateCache(state)
-  return cache.previousIndex !== null
-}
-
-function getPreviousIndex (state) {
-  updateCache(state)
-  return cache.previousIndex
-}
-
-function getCurrentLocalURL (state) {
-  return state.server.localURL + '/' + state.playing.fileIndex
-}
-
-function updateCache (state) {
-  const infoHash = state.playing.infoHash
-  const fileIndex = state.playing.fileIndex
-
-  if (infoHash === cache.infoHash) {
-    switch (fileIndex) {
-      case cache.currentIndex:
-        return
-      case cache.nextIndex:
-        cache.previousIndex = cache.currentIndex
-        cache.currentIndex = fileIndex
-        cache.nextIndex = findNextIndex(state)
-        return
-      case cache.previousIndex:
-        cache.previousIndex = findPreviousIndex(state)
-        cache.nextIndex = cache.currentIndex
-        cache.currentIndex = fileIndex
-        return
-    }
-  } else {
-    cache.infoHash = infoHash
-  }
-
-  cache.previousIndex = findPreviousIndex(state)
-  cache.currentIndex = fileIndex
-  cache.nextIndex = findNextIndex(state)
-}
-
-function findPreviousIndex (state) {
-  const files = TorrentSummary.getByKey(state, state.playing.infoHash).files
-  for (var i = state.playing.fileIndex - 1; i >= 0; i--) {
-    if (TorrentPlayer.isPlayable(files[i])) return i
-  }
-  return null
-}
-
-function findNextIndex (state) {
-  const files = TorrentSummary.getByKey(state, state.playing.infoHash).files
-  for (var i = state.playing.fileIndex + 1; i < files.length; i++) {
-    if (TorrentPlayer.isPlayable(files[i])) return i
-  }
-  return null
-}

src/renderer/lib/state.js

@@ -1,240 +0,0 @@
-const appConfig = require('application-config')('WebTorrent')
-const path = require('path')
-const {EventEmitter} = require('events')
-
-const config = require('../../config')
-const migrations = require('./migrations')
-
-const State = module.exports = Object.assign(new EventEmitter(), {
-  getDefaultPlayState,
-  load,
-  save,
-  saveThrottled
-})
-
-appConfig.filePath = path.join(config.CONFIG_PATH, 'config.json')
-
-function getDefaultState () {
-  const LocationHistory = require('location-history')
-
-  return {
-    /*
-     * Temporary state disappears once the program exits.
-     * It can contain complex objects like open connections, etc.
-     */
-    client: null, /* the WebTorrent client */
-    server: null, /* local WebTorrent-to-HTTP server */
-    prev: { /* used for state diffing in updateElectron() */
-      title: null,
-      progress: -1,
-      badge: null
-    },
-    location: new LocationHistory(),
-    window: {
-      bounds: null, /* {x, y, width, height } */
-      isFocused: true,
-      isFullScreen: false,
-      title: config.APP_WINDOW_TITLE
-    },
-    selectedInfoHash: null, /* the torrent we've selected to view details. see state.torrents */
-    playing: getDefaultPlayState(), /* the media (audio or video) that we're currently playing */
-    devices: {}, /* playback devices like Chromecast and AppleTV */
-    dock: {
-      badge: 0,
-      progress: 0
-    },
-    modal: null, /* modal popover */
-    errors: [], /* user-facing errors */
-    nextTorrentKey: 1, /* identify torrents for IPC between the main and webtorrent windows */
-
-    /*
-     * Saved state is read from and written to a file every time the app runs.
-     * It should be simple and minimal and must be JSON.
-     * It must never contain absolute paths since we have a portable app.
-     *
-     * Config path:
-     *
-     * Mac                  ~/Library/Application Support/WebTorrent/config.json
-     * Linux (XDG)          $XDG_CONFIG_HOME/WebTorrent/config.json
-     * Linux (Legacy)       ~/.config/WebTorrent/config.json
-     * Windows (> Vista)    %LOCALAPPDATA%/WebTorrent/config.json
-     * Windows (XP, 2000)   %USERPROFILE%/Local Settings/Application Data/WebTorrent/config.json
-     *
-     * Also accessible via `require('application-config')('WebTorrent').filePath`
-     */
-    saved: {},
-
-    /*
-     * Getters, for convenience
-     */
-    getPlayingTorrentSummary,
-    getPlayingFileSummary,
-    getExternalPlayerName
-  }
-}
-
-/* Whenever we stop playing video or audio, here's what we reset state.playing to */
-function getDefaultPlayState () {
-  return {
-    infoHash: null, /* the info hash of the torrent we're playing */
-    fileIndex: null, /* the zero-based index within the torrent */
-    location: 'local', /* 'local', 'chromecast', 'airplay' */
-    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
-    currentTime: 0, /* seconds */
-    duration: 1, /* seconds */
-    isPaused: true,
-    isStalled: false,
-    lastTimeUpdate: 0, /* Unix time in ms */
-    mouseStationarySince: 0, /* Unix time in ms */
-    playbackRate: 1,
-    volume: 1,
-    subtitles: {
-      tracks: [], /* subtitle tracks, each {label, language, ...} */
-      selectedIndex: -1, /* current subtitle track */
-      showMenu: false /* popover menu, above the video */
-    },
-    aspectRatio: 0 /* aspect ratio of the video */
-  }
-}
-
-/* If the saved state file doesn't exist yet, here's what we use instead */
-function setupSavedState (cb) {
-  const fs = require('fs-extra')
-  const parseTorrent = require('parse-torrent')
-  const parallel = require('run-parallel')
-
-  const saved = {
-    prefs: {
-      downloadPath: config.DEFAULT_DOWNLOAD_PATH,
-      isFileHandler: false,
-      openExternalPlayer: false,
-      externalPlayerPath: null,
-      startup: false
-    },
-    torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
-    version: config.APP_VERSION /* make sure we can upgrade gracefully later */
-  }
-
-  const tasks = []
-
-  config.DEFAULT_TORRENTS.map(function (t, i) {
-    const infoHash = saved.torrents[i].infoHash
-    tasks.push(function (cb) {
-      fs.copy(
-        path.join(config.STATIC_PATH, t.posterFileName),
-        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName)),
-        cb
-      )
-    })
-    tasks.push(function (cb) {
-      fs.copy(
-        path.join(config.STATIC_PATH, t.torrentFileName),
-        path.join(config.TORRENT_PATH, infoHash + '.torrent'),
-        cb
-      )
-    })
-  })
-
-  parallel(tasks, function (err) {
-    if (err) return cb(err)
-    cb(null, saved)
-  })
-
-  function createTorrentObject (t) {
-    const torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
-    const parsedTorrent = parseTorrent(torrent)
-
-    return {
-      status: 'paused',
-      infoHash: parsedTorrent.infoHash,
-      name: t.name,
-      displayName: t.name,
-      posterFileName: parsedTorrent.infoHash + path.extname(t.posterFileName),
-      torrentFileName: parsedTorrent.infoHash + '.torrent',
-      magnetURI: parseTorrent.toMagnetURI(parsedTorrent),
-      files: parsedTorrent.files,
-      selections: parsedTorrent.files.map((x) => true),
-      testID: t.testID
-    }
-  }
-}
-
-function getPlayingTorrentSummary () {
-  const infoHash = this.playing.infoHash
-  return this.saved.torrents.find((x) => x.infoHash === infoHash)
-}
-
-function getPlayingFileSummary () {
-  const torrentSummary = this.getPlayingTorrentSummary()
-  if (!torrentSummary) return null
-  return torrentSummary.files[this.playing.fileIndex]
-}
-
-function getExternalPlayerName () {
-  const playerPath = this.saved.prefs.externalPlayerPath
-  if (!playerPath) return 'VLC'
-  return path.basename(playerPath).split('.')[0]
-}
-
-function load (cb) {
-  const state = getDefaultState()
-
-  appConfig.read(function (err, saved) {
-    if (err || !saved.version) {
-      console.log('Missing config file: Creating new one')
-      setupSavedState(onSaved)
-    } else {
-      onSaved(null, saved)
-    }
-  })
-
-  function onSaved (err, saved) {
-    if (err) return cb(err)
-    state.saved = saved
-    migrations.run(state)
-    cb(null, state)
-  }
-}
-
-// Write state.saved to the JSON state file
-function save (state, cb) {
-  console.log('Saving state to ' + appConfig.filePath)
-  delete state.saveStateTimeout
-
-  // Clean up, so that we're not saving any pending state
-  const copy = Object.assign({}, state.saved)
-  // Remove torrents pending addition to the list, where we haven't finished
-  // reading the torrent file or file(s) to seed & don't have an infohash
-  copy.torrents = copy.torrents
-    .filter((x) => x.infoHash)
-    .map(function (x) {
-      const torrent = {}
-      for (let key in x) {
-        if (key === 'progress' || key === 'torrentKey') {
-          continue // Don't save progress info or key for the webtorrent process
-        }
-        if (key === 'playStatus') {
-          continue // Don't save whether a torrent is playing / pending
-        }
-        if (key === 'error') {
-          continue // Don't save error states
-        }
-        torrent[key] = x[key]
-      }
-      return torrent
-    })
-
-  appConfig.write(copy, (err) => {
-    if (err) console.error(err)
-    else State.emit('savedState')
-  })
-}
-
-// Write, but no more than once a second
-function saveThrottled (state) {
-  if (state.saveStateTimeout) return
-  state.saveStateTimeout = setTimeout(function () {
-    if (!state.saveStateTimeout) return
-    save(state)
-  }, 1000)
-}

src/renderer/lib/telemetry.js

@@ -1,240 +0,0 @@
-// Collects anonymous usage stats and uncaught errors
-// Reports back so that we can improve WebTorrent Desktop
-module.exports = {
-  init,
-  logUncaughtError,
-  logPlayAttempt
-}
-
-const crypto = require('crypto')
-const electron = require('electron')
-const https = require('https')
-const os = require('os')
-const url = require('url')
-
-const config = require('../../config')
-
-let telemetry
-
-function init (state) {
-  telemetry = state.saved.telemetry
-  if (!telemetry) {
-    telemetry = state.saved.telemetry = createSummary()
-    reset()
-  }
-
-  const now = new Date()
-  telemetry.version = config.APP_VERSION
-  telemetry.timestamp = now.toISOString()
-  telemetry.localTime = now.toTimeString()
-  telemetry.screens = getScreenInfo()
-  telemetry.system = getSystemInfo()
-  telemetry.torrentStats = getTorrentStats(state)
-  telemetry.approxNumTorrents = telemetry.torrentStats.approxCount
-
-  if (config.IS_PRODUCTION) {
-    postToServer()
-    // If the user keeps WebTorrent running for a long time, post every 12h
-    setInterval(postToServer, 12 * 3600 * 1000)
-  } else {
-    // Development: telemetry used only for local debugging
-    // Empty uncaught errors, etc at the start of every run
-    reset()
-  }
-}
-
-function reset () {
-  telemetry.uncaughtErrors = []
-  telemetry.playAttempts = {
-    minVersion: config.APP_VERSION,
-    total: 0,
-    success: 0,
-    timeout: 0,
-    error: 0,
-    abandoned: 0
-  }
-}
-
-function postToServer () {
-  // Serialize the telemetry summary
-  const payload = new Buffer(JSON.stringify(telemetry), 'utf8')
-
-  // POST to our server
-  const options = url.parse(config.TELEMETRY_URL)
-  options.method = 'POST'
-  options.headers = {
-    'Content-Type': 'application/json',
-    'Content-Length': payload.length
-  }
-
-  const req = https.request(options, function (res) {
-    if (res.statusCode === 200) {
-      console.log('Successfully posted telemetry summary')
-      reset()
-    } else {
-      console.error('Couldn\'t post telemetry summary, got HTTP ' + res.statusCode)
-    }
-  })
-  req.on('error', function (e) {
-    console.error('Couldn\'t post telemetry summary', e)
-  })
-  req.write(payload)
-  req.end()
-}
-
-// Creates a new telemetry summary. Gives the user a unique ID,
-// collects screen resolution, etc
-function createSummary () {
-  // Make a 256-bit random unique ID
-  const userID = crypto.randomBytes(32).toString('hex')
-  return { userID }
-}
-
-// Track screen resolution
-function getScreenInfo () {
-  return electron.screen.getAllDisplays().map((screen) => ({
-    width: screen.size.width,
-    height: screen.size.height,
-    scaleFactor: screen.scaleFactor
-  }))
-}
-
-// Track basic system info like OS version and amount of RAM
-function getSystemInfo () {
-  return {
-    osPlatform: process.platform,
-    osRelease: os.type() + ' ' + os.release(),
-    architecture: os.arch(),
-    systemArchitecture: config.OS_SYSARCH,
-    totalMemoryMB: roundPow2(os.totalmem() / (1 << 20)),
-    numCores: os.cpus().length
-  }
-}
-
-// Get stats like the # of torrents currently active, # in list, total size
-function getTorrentStats (state) {
-  const count = state.saved.torrents.length
-  let sizeMB = 0
-  let byStatus = {
-    new: { count: 0, sizeMB: 0 },
-    downloading: { count: 0, sizeMB: 0 },
-    seeding: { count: 0, sizeMB: 0 },
-    paused: { count: 0, sizeMB: 0 }
-  }
-
-  // First, count torrents & total file size
-  for (let i = 0; i < count; i++) {
-    const t = state.saved.torrents[i]
-    const stat = byStatus[t.status]
-    if (!t || !t.files || !stat) continue
-    stat.count++
-    for (let j = 0; j < t.files.length; j++) {
-      const f = t.files[j]
-      if (!f || !f.length) continue
-      const fileSizeMB = f.length / (1 << 20)
-      sizeMB += fileSizeMB
-      stat.sizeMB += fileSizeMB
-    }
-  }
-
-  // Then, round all the counts and sums to the nearest power of 2
-  const ret = roundTorrentStats({count, sizeMB})
-  ret.byStatus = {
-    new: roundTorrentStats(byStatus.new),
-    downloading: roundTorrentStats(byStatus.downloading),
-    seeding: roundTorrentStats(byStatus.seeding),
-    paused: roundTorrentStats(byStatus.paused)
-  }
-  return ret
-}
-
-function roundTorrentStats (stats) {
-  return {
-    approxCount: roundPow2(stats.count),
-    approxSizeMB: roundPow2(stats.sizeMB)
-  }
-}
-
-// Rounds to the nearest power of 2, for privacy and easy bucketing.
-// Rounds 35 to 32, 70 to 64, 5 to 4, 1 to 1, 0 to 0.
-// Supports nonnegative numbers only.
-function roundPow2 (n) {
-  if (n <= 0) return 0
-  // Otherwise, return 1, 2, 4, 8, etc by rounding in log space
-  const log2 = Math.log(n) / Math.log(2)
-  return Math.pow(2, Math.round(log2))
-}
-
-// An uncaught error happened in the main process or in one of the windows
-function logUncaughtError (procName, e) {
-  // Not initialized yet? Ignore.
-  // Hopefully uncaught errors immediately on startup are fixed in dev
-  if (!telemetry) return
-
-  let message
-  let stack = ''
-  if (e == null) {
-    message = 'Unexpected undefined error'
-  } else if (e.error) {
-    // Uncaught Javascript errors (window.onerror), err is an ErrorEvent
-    if (!e.error.message) {
-      message = 'Unexpected ErrorEvent.error: ' + Object.keys(e.error).join(' ')
-    } else {
-      message = e.error.message
-      stack = e.error.stack
-    }
-  } else if (e.message) {
-    // err is either an Error or a plain object {message, stack}
-    message = e.message
-    stack = e.stack
-  } else {
-    // Resource errors (captured element.onerror), err is an Event
-    if (!e.target) {
-      message = 'Unexpected unknown error'
-    } else if (!e.target.error) {
-      message = 'Unexpected resource loading error: ' + getElemString(e.target)
-    } else {
-      message = 'Resource error ' + getElemString(e.target) + ': ' + e.target.error.code
-    }
-  }
-
-  if (typeof stack !== 'string') stack = 'Unexpected stack: ' + stack
-  if (typeof message !== 'string') message = 'Unexpected message: ' + message
-
-  // Remove the first part of each file path in the stack trace.
-  // - Privacy: remove personal info like C:\Users\<full name>
-  // - Aggregation: this lets us find which stacktraces occur often
-  stack = stack.replace(/\(.*app.asar/g, '(...')
-  stack = stack.replace(/at .*app.asar/g, 'at ...')
-
-  // We need to POST the telemetry object, make sure it stays < 100kb
-  if (telemetry.uncaughtErrors.length > 20) return
-  if (message.length > 1000) message = message.substring(0, 1000)
-  if (stack.length > 1000) stack = stack.substring(0, 1000)
-
-  // Log the app version *at the time of the error*
-  const version = config.APP_VERSION
-
-  telemetry.uncaughtErrors.push({process: procName, message, stack, version})
-}
-
-// Turns a DOM element into a string, eg "DIV.my-class.visible"
-function getElemString (elem) {
-  let ret = elem.tagName
-  try {
-    ret += '.' + Array.from(elem.classList).join('.')
-  } catch (e) {}
-  return ret
-}
-
-// The user pressed play. It either worked, timed out, or showed the
-// 'Play in VLC' codec error
-function logPlayAttempt (result) {
-  if (!['success', 'timeout', 'error', 'abandoned'].includes(result)) {
-    return console.error('Unknown play attempt result', result)
-  }
-
-  const attempts = telemetry.playAttempts
-  attempts.total = (attempts.total || 0) + 1
-  attempts[result] = (attempts[result] || 0) + 1
-}

src/renderer/lib/torrent-player.js

@@ -1,61 +0,0 @@
-module.exports = {
-  isPlayable,
-  isVideo,
-  isAudio,
-  isTorrent,
-  isPlayableTorrentSummary
-}
-
-const path = require('path')
-
-// Checks whether a fileSummary or file path is audio/video that we can play,
-// based on the file extension
-function isPlayable (file) {
-  return isVideo(file) || isAudio(file)
-}
-
-// Checks whether a fileSummary or file path is playable video
-function isVideo (file) {
-  return [
-    '.avi',
-    '.m4v',
-    '.mkv',
-    '.mov',
-    '.mp4',
-    '.mpg',
-    '.ogv',
-    '.webm',
-    '.wmv'
-  ].includes(getFileExtension(file))
-}
-
-// Checks whether a fileSummary or file path is playable audio
-function isAudio (file) {
-  return [
-    '.aac',
-    '.ac3',
-    '.mp3',
-    '.ogg',
-    '.wav',
-    '.m4a'
-  ].includes(getFileExtension(file))
-}
-
-// Checks if the argument is either:
-// - a string that's a valid filename ending in .torrent
-// - a file object where obj.name is ends in .torrent
-// - a string that's a magnet link (magnet://...)
-function isTorrent (file) {
-  const isTorrentFile = getFileExtension(file) === '.torrent'
-  const isMagnet = typeof file === 'string' && /^(stream-)?magnet:/.test(file)
-  return isTorrentFile || isMagnet
-}
-
-function getFileExtension (file) {
-  const name = typeof file === 'string' ? file : file.name
-  return path.extname(name).toLowerCase()
-}
-
-function isPlayableTorrentSummary (torrentSummary) {
-  return torrentSummary.files && torrentSummary.files.some(isPlayable)
-}

src/renderer/lib/torrent-summary.js

@@ -1,57 +0,0 @@
-module.exports = {
-  getPosterPath,
-  getTorrentPath,
-  getByKey,
-  getTorrentID,
-  getFileOrFolder
-}
-
-const path = require('path')
-const config = require('../../config')
-
-// Expects a torrentSummary
-// Returns an absolute path to the torrent file, or null if unavailable
-function getTorrentPath (torrentSummary) {
-  if (!torrentSummary || !torrentSummary.torrentFileName) return null
-  return path.join(config.TORRENT_PATH, torrentSummary.torrentFileName)
-}
-
-// Expects a torrentSummary
-// Returns an absolute path to the poster image, or null if unavailable
-function getPosterPath (torrentSummary) {
-  if (!torrentSummary || !torrentSummary.posterFileName) return null
-  const posterPath = path.join(config.POSTER_PATH, torrentSummary.posterFileName)
-  // Work around a Chrome bug (reproduced in vanilla Chrome, not just Electron):
-  // Backslashes in URLS in CSS cause bizarre string encoding issues
-  return posterPath.replace(/\\/g, '/')
-}
-
-// Expects a torrentSummary
-// Returns a torrentID: filename, magnet URI, or infohash
-function getTorrentID (torrentSummary) {
-  const s = torrentSummary
-  if (s.torrentFileName) { // Load torrent file from disk
-    return getTorrentPath(s)
-  } else { // Load torrent from DHT
-    return s.magnetURI || s.infoHash
-  }
-}
-
-// Expects a torrentKey or infoHash
-// Returns the corresponding torrentSummary, or undefined
-function getByKey (state, torrentKey) {
-  if (!torrentKey) return undefined
-  return state.saved.torrents.find((x) =>
-    x.torrentKey === torrentKey || x.infoHash === torrentKey)
-}
-
-// Returns the path to either the file (in a single-file torrent) or the root
-// folder (in  multi-file torrent)
-// WARNING: assumes that multi-file torrents consist of a SINGLE folder.
-// TODO: make this assumption explicit, enforce it in the `create-torrent`
-// module. Store root folder explicitly to avoid hacky path processing below.
-function getFileOrFolder (torrentSummary) {
-  const ts = torrentSummary
-  if (!ts.path || !ts.files || ts.files.length === 0) return null
-  return path.join(ts.path, ts.files[0].path.split('/')[0])
-}