Add "Paste Torrent Address" button to context menu.

Closes #834.

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,3 @@
-<!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
-
 **What version of WebTorrent Desktop?** (See the 'About WebTorrent' menu)
 
 **What operating system and version?**

AUTHORS.md

@@ -34,18 +34,5 @@
 - PurgingPanda (t3ch0wn3r@gmail.com)
 - Kai Curtis (morecode@kcurtis.com)
 - Omri Litov (omrilitov@gmail.com)
-- Alexey Romanov (romanalexey@gmail.com)
-- Karan Thakkar (karanjthakkar@gmail.com)
-- Nuno Campos (nuno.campos@me.com)
-- Ebrahim Byagowi (ebrahim@gnu.org)
-- Josip Janzic (josip@jjanzic.com)
-- Emil Bay (github@tixz.dk)
-- Borewit (borewit@users.noreply.github.com)
-- greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
-- Auyer (rafa_auyer@icloud.com)
-- SimplyAhmazing (ahmad19526@gmail.com)
-- Cezar Carneiro (cezargcarneiro@gmail.com)
-- Terry Hau (terryhau@gmail.com)
-- Vítor Galvão (info@vitorgalvao.com)
 
 #### Generated by bin/update-authors.sh.

CHANGELOG.md

@@ -1,68 +1,5 @@
 # WebTorrent Desktop Version History
 
-## v0.20.0 - 2018-04-26
-
-### Added
-
-- Added support for additional audio extensions: 'aiff', 'ape', 'mp2', 'oga', 'opus', 'wma' (#1240)
-
-### Changed
-
-- Displaying filename while music metadata is being downloaded (#1361)
-- Improved the poster selection for audio/music based torrents (#1334)
-- Launch VLC player without the `--video-on-top` flag (#1286)
-
-### Fixed
-
-- Fix silently failing to open magnets links on Linux (#1367)
-
-## v0.19.0 - 2018-01-26
-
-### Added
-- Added watch folder feature: Automatically add new torrent files added to a folder on disk (#1154)
-- Added highest playback priority feature: pauses other active torrents when playback starts (#840)
-- Add 'Start Speaking' and 'Stop Speaking' menu item (Mac) (#439)
-- Add pinch-to-zoom gesture to enter/exit fullscreen (#1148)
-
-### Changed
-- [SECURITY] Mitigate Electron protocol handler issue (Windows)
-- Moved project from Feross's GitHub account to the WebTorrent GitHub organization
-- Updated to electron@1.6.16
-- Updated to material-ui@0.17
-- Treat .FLAC as playable audio (#1127)
-
-### Fixed
-- Fix time and duration so it doesn't bounce in the UI (#1233)
-- Fix 'About WebTorrent' menu location on Windows (#1120)
-
-## v0.18.0 - 2017-02-03
-
-### Added
-- Add a new "Transfers" menu for pausing or resuming all torrents (#1027)
-
-### Changed
-- Update Electron to 1.4.15
-  - Windows 32-bit: App can use 4GB of memory instead of just 2GB
-  - Fix "Portable App" writing crash reports to "%APPDATA%\Temp" (Windows)
-- Updated WebTorrent engine to 0.98.5
-  - Fix issue where http web seeds would sometimes stall
-  - Don't send 'completed' event to tracker again if torrent is already complete
-  - Add more peer ID entropy
-  - Set user-agent header for tracker http requests
-
-### Fixed
-- Fix paste shortcut in tracker list on Create Torrent page (#1112)
-- Auto-focus the 'OK' button in modal dialogs (#1058)
-- Fix formatting issue in the speed stats on the Player page (#1039)
-
-## v0.17.2 - 2016-10-10
-
-### Fixed
-- Windows: Fix impossible-to-delete "Wired CD" default torrent
-- Throttle browser-window 'move' and 'resize' events
-- Fix crash ("Cannot read property 'files' of null" error)
-- Fix crash ("TypeError: Cannot read property 'startPiece' of undefined")
-
 ## v0.17.1 - 2016-10-03
 
 ### Changed
@@ -102,7 +39,7 @@
 ## v0.16.0 - 2016-09-18
 
 ### Added
-- **Windows 64-bit support!** (#931)
+- **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
 
@@ -162,13 +99,16 @@
 ## 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
 
 ### 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)
@@ -181,11 +121,13 @@
 - 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)
@@ -194,11 +136,13 @@
 ## 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`.
@@ -215,6 +159,7 @@
   - 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)
@@ -222,29 +167,35 @@
 ## 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
@@ -252,14 +203,17 @@
 - 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
@@ -267,19 +221,23 @@
 ## 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)
@@ -289,6 +247,7 @@
   - 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
@@ -299,6 +258,7 @@
 - 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.
@@ -306,6 +266,7 @@
 ## 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.
@@ -317,6 +278,7 @@
 ## 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)
@@ -326,6 +288,7 @@
 - Add announcement feature
 
 ### Changed
+
 - Nicer player UI
 - Reduce startup jank, improve startup time (#568)
 - Cleanup unsupported codec detection (#569, #570)
@@ -333,6 +296,7 @@
 - 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
@@ -343,19 +307,23 @@
 ## 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)
@@ -364,6 +332,7 @@
 ## v0.4.0 - 2016-05-13
 
 ### Added
+
 - Better Windows support!
   - Windows 32-bit build.
   - Windows Portable App build.
@@ -386,6 +355,7 @@
 - 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.
@@ -396,6 +366,7 @@
 - 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)
@@ -420,20 +391,24 @@ to this release!
 ## v0.3.3 - 2016-04-07
 
 ### Fixed
+
 - App icon was incorrect (OS X)
 
 ## v0.3.2 - 2016-04-07
 
 ### Added
+
 - Register WebTorrent as default handler for magnet links (OS X)
 
 ### Changed
+
 - Faster startup time (50ms)
 - Update Electron to 0.37.5
   - Remove the white flash when loading pages and resizing the window
   - Fix crash when sending IPC messages
 
 ### Fixed
+
 - Fix installation bugs with .deb file (Linux)
 - Pause audio reliably when closing the window
 - Enforce minimimum window size when resizing player (for audio-only .mov files, which are 0x0)
@@ -441,14 +416,17 @@ to this release!
 ## v0.3.1 - 2016-04-06
 
 ### Added
+
 - Add crash reporter to torrent engine process
 
 ### Fixed
+
 - Fix cast screen background: cover, don't tile
 
 ## v0.3.0 - 2016-04-06
 
 ### Added
+
 - **Ubuntu/Debian support!** (.deb installer)
 - **DLNA streaming support**
 - Add "File > Quit" menu item (Linux)
@@ -456,12 +434,14 @@ to this release!
 - Crash reporting
 
 ### Changed
+
 - On startup, do not re-verify files when timestamps are unchanged
 - Moved torrent engine to an independent process, for better UI performance
 - Removed media queries (UI resizing based on window width)
 - Improved Chromecast icon, when connected
 
 ### Fixed
+
 - "Download Complete" notification shows consistently
 - Create new torrents and seed them without copying to temporary folder
 - Clicking the "Download Complete" notification will always activate app
@@ -480,6 +460,7 @@ Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
 ## v0.2.0 - 2016-03-29
 
 ### Added
+
 - Minimise to tray (Windows, Linux)
 - Show spinner and download speed when player is stalled waiting for data
 - Highlight window on drag-and-drop
@@ -488,10 +469,12 @@ Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
     Linux users need to download new versions manually.
 
 ### Changed
+
 - Renamed WebTorrent.app to WebTorrent Desktop
 - Add Cosmos Laundromat as a default torrent
 
 ### Fixed
+
 - Only capture media keys when player is active
 - Update WebTorrent to 0.88.1 for performance improvements
   - When seeding, do not proactively connect to new peers
@@ -551,7 +534,7 @@ Windows, and Linux. For now, we're only releasing binaries for OS X.
 
 WebTorrent Desktop is in ALPHA and under very active development – expect lots more polish in
 the coming weeks! If you know JavaScript and want to help us out, there's
-[lots to do](https://github.com/webtorrent/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
+[lots to do](https://github.com/feross/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
 
 ### Features
 

CONTRIBUTING.md

@@ -24,7 +24,7 @@ and to avoid style arguments. `npm test` runs `standard` automatically, so you d
 to!
 
 [standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
-[standard-url]: https://standardjs.com
+[standard-url]: https://github.com/feross/standard
 
 ## Project Governance
 
@@ -36,7 +36,7 @@ standard guarded open source project.
 
 There are a few basic ground-rules for contributors:
 
-1. **No `--force` pushes to master** or modifying history in any way. Rebasing and force pushing your own PR branch is fine.
+1. **No `--force` pushes** or modifying the Git history in any way.
 2. **Non-master branches** should be used for ongoing work.
 3. **Significant modifications** like API changes should be subject to a **pull request**
    to solicit feedback from other contributors.
@@ -74,99 +74,6 @@ By making a contribution to this project, I certify that:
   including my sign-off) is maintained indefinitely and may be redistributed consistent
   with this project or the open source license(s) involved.
 
-## Release Procedure
-
-### 1. Create a new version
-
-- Update `AUTHORS`
-
-  ```
-  npm run update-authors
-  ```
-
-  Commit if necessary. The commit message should be "authors".
-
-- Write the changelog
-
-  You can use `git log --oneline <last version tag>..HEAD` to get a list of changes.
-
-  Summarize them concisely in `CHANGELOG.md`. The commit  message should be "changelog".
-
-- Update the version
-
-  ```
-  npm version [major|minor|patch]
-  ```
-
-  This creates both a commit and a git tag.
-
-- Make a PR
-
-  Once the PR is reviewed, merge it:
-
-  ```
-  git push origin <branch-name>:master
-  ```
-
-  This makes it so that the commit hash on master matches the commit hash of the version tag.
-
-  Finally, run:
-
-  ```
-  git push --tags
-  ```
-
-### 2. Create the release binaries
-
-- On a Mac:
-
-  ```
-  npm run package -- darwin --sign
-  npm run package -- linux --sign
-  ```
-
-- On Windows, or in a Windows VM:
-
-  ```
-  npm run package -- win32 --sign
-  ```
-
-- Then, upload the release binaries to Github:
-
-  ```
-  npm run gh-release
-  ```
-
-  Follow the URL to a newly created Github release page. Manually upload the binaries from
-  `webtorrent-desktop/dist/`. Open the previous release in another tab, and make sure that you
-  are uploading the same set of files, no more, no less.
-
-### 3. Test it
-
-**This is the most important part.**
-
- - Manually download the binaries for each platform from Github.
-
-  **Do not use your locally built binaries.** Modern OSs treat executables differently if they've
-  been downloaded, even though the files are byte for byte identical. This ensures that the
-  codesigning worked and is valid.
-
-- Smoke test WebTorrent Desktop on each platform.
-
-  See Smoke Tests below for details. Open DevTools
-  on Windows and Mac, and ensure that the auto updater is running. If the auto updater does not
-  run, users will successfully auto update to this new version, and then be stuck there forever.
-
-### 4. Ship it
-
-- Update the website
-
-  Create a pull request in [webtorrent.io](https://github.com/webtorrent/webtorrent.io). Update
-  `config.js`, updating the desktop app version.
-
-  As soon as this PR is merged, Jenkins will automatically redeploy the WebTorrent website, and
-  hundreds of thousands of users around the world will start auto updating. **Merge with care.**
-
 ## Smoke Tests
 
 Before a release, check that the following basic use cases work correctly:

README.md

@@ -1,8 +1,6 @@
 <h1 align="center">
   <br>
-  <a href="https://webtorrent.io">
-    <img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200">
-  </a>
+  <a href="https://webtorrent.io"><img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200"></a>
   <br>
   WebTorrent Desktop
   <br>
@@ -12,21 +10,16 @@
 <h4 align="center">The streaming torrent app. For Mac, Windows, and Linux.</h4>
 
 <p align="center">
-  <a href="https://gitter.im/webtorrent/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="gitter"></a>
-  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release"></a>
-  <a href="https://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></a>
-  <a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>
+  <a href="https://gitter.im/feross/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="Gitter"></a>
+  <a href="https://travis-ci.org/feross/webtorrent-desktop"><img src="https://img.shields.io/travis/feross/webtorrent-desktop/master.svg" alt="Travis"></a>
+  <a href="https://github.com/feross/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/feross/webtorrent-desktop.svg" alt="Release"></a>
 </p>
 
 ## Install
 
 Download the latest version of WebTorrent Desktop from
 [the official website](https://webtorrent.io/desktop/) or the
-[GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page. Alternatively, you can install it with [Homebrew-Cask](https://github.com/caskroom/homebrew-cask):
-
-```
-$ brew cask install webtorrent
-```
+[GitHub 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
@@ -44,7 +37,7 @@ instructions below in the ["How to Contribute"](#how-to-contribute) section.
 ### Get the code
 
 ```
-$ git clone https://github.com/webtorrent/webtorrent-desktop.git
+$ git clone https://github.com/feross/webtorrent-desktop.git
 $ cd webtorrent-desktop
 $ npm install
 ```
@@ -75,25 +68,19 @@ $ npm test
 $ npm run test-integration
 ```
 
-The integration tests use Spectron and Tape. They click through the app, taking screenshots and
-comparing each one to a reference. Why screenshots?
+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.
+* 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! See
-  https://github.com/blog/817-behold-image-view-modes
+* 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. Your screen should have
-the same resolution as a 2016 12" Macbook.
+For MacOS, you'll need a Retina screen for the integration tests to pass. Your screen should have the same resolution as a 2016 12" Macbook.
 
 For Windows, you'll need Windows 10 with a 1366x768 screen.
 
-When running integration tests, keep the mouse on the edge of the screen and don't touch the mouse
-or keyboard while the tests are running.
+When running integration tests, keep the mouse on the edge of the screen and don't touch the mouse or keyboard while the tests are running.
 
 ### Package the app
 
@@ -123,7 +110,7 @@ The following optional arguments are available:
    - `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.
+*-darwin.zip for Mac) will always be produced.
 
 #### Windows build notes
 
@@ -158,6 +145,10 @@ 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).

SECURITY.md

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

bin/clean.js

@@ -25,7 +25,7 @@ let tmpPath
 try {
   tmpPath = path.join(fs.statSync('/tmp') && '/tmp', 'webtorrent')
 } catch (err) {
-  tmpPath = path.join(os.tmpdir(), 'webtorrent')
+  tmpPath = path.join(os.tmpDir(), 'webtorrent')
 }
 rimraf.sync(tmpPath)
 

bin/package.js

@@ -21,7 +21,6 @@ const pkg = require('../package.json')
 const BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
 const BUILD_PATH = path.join(config.ROOT_PATH, 'build')
 const DIST_PATH = path.join(config.ROOT_PATH, 'dist')
-const NODE_MODULES_PATH = path.join(config.ROOT_PATH, 'node_modules')
 
 const argv = minimist(process.argv.slice(2), {
   boolean: [
@@ -37,12 +36,6 @@ const argv = minimist(process.argv.slice(2), {
 })
 
 function build () {
-  console.log('Reinstalling node_modules...')
-  rimraf.sync(NODE_MODULES_PATH)
-  cp.execSync('npm install', { stdio: 'inherit' })
-  cp.execSync('npm dedupe', { stdio: 'inherit' })
-
-  console.log('Nuking dist/ and build/...')
   rimraf.sync(DIST_PATH)
   rimraf.sync(BUILD_PATH)
 
@@ -96,7 +89,7 @@ const all = {
 
   // 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: /^\/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)$/,
 
   // The application name.
   name: config.APP_NAME,
@@ -111,8 +104,8 @@ const all = {
   // "devDependencies" before starting to package the app.
   prune: true,
 
-  // The Electron version that the app is built with (without the leading 'v')
-  electronVersion: require('electron/package.json').version
+  // The Electron version with which the app is built (without the leading 'v')
+  version: require('electron/package.json').version
 }
 
 const darwin = {
@@ -449,51 +442,51 @@ function buildWin32 (cb) {
         usePackageJson: false,
         version: pkg.version
       })
-        .then(function () {
-          console.log(`Windows: Created ${destArch} installer.`)
+      .then(function () {
+        console.log(`Windows: Created ${destArch} installer.`)
 
-          /**
+        /**
          * Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
          * versions of the app)
          */
-          fs.readdirSync(DIST_PATH)
-            .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
-            .forEach((filename) => {
-              fs.unlinkSync(path.join(DIST_PATH, filename))
-            })
+        fs.readdirSync(DIST_PATH)
+          .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
+          .forEach((filename) => {
+            fs.unlinkSync(path.join(DIST_PATH, filename))
+          })
 
-          if (destArch === 'ia32') {
-            console.log('Windows: Renaming ia32 installer files...')
+        if (destArch === 'ia32') {
+          console.log('Windows: Renaming ia32 installer files...')
 
-            // RELEASES -> RELEASES-ia32
-            const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
-            fs.renameSync(
-              path.join(DIST_PATH, 'RELEASES'),
-              relPath
-            )
+          // RELEASES -> RELEASES-ia32
+          const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
+          fs.renameSync(
+            path.join(DIST_PATH, 'RELEASES'),
+            relPath
+          )
 
-            // WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
-            fs.renameSync(
-              path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
-              path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
-            )
+          // WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
+          fs.renameSync(
+            path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
+            path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
+          )
 
-            // Change file name inside RELEASES-ia32 to match renamed file
-            const relContent = fs.readFileSync(relPath, 'utf8')
-            const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
-            fs.writeFileSync(relPath, relContent32)
+          // Change file name inside RELEASES-ia32 to match renamed file
+          const relContent = fs.readFileSync(relPath, 'utf8')
+          const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
+          fs.writeFileSync(relPath, relContent32)
 
-            if (relContent === relContent32) {
+          if (relContent === relContent32) {
             // Sanity check
-              throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
-            }
-
-            console.log('Windows: Renamed ia32 installer files.')
+            throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
           }
 
-          cb(null)
-        })
-        .catch(cb)
+          console.log('Windows: Renamed ia32 installer files.')
+        }
+
+        cb(null)
+      })
+      .catch(cb)
     }
 
     function packagePortable (filesPath, destArch, cb) {

bin/release-_post.sh

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

bin/release-_pre.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+git pull
+rm -rf node_modules/
+npm install
+npm dedupe
+npm test

bin/release-major.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+BIN=`dirname $0`
+
+$BIN/release-_pre.sh
+npm version major
+$BIN/release-_post.sh

bin/release-minor.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+BIN=`dirname $0`
+
+$BIN/release-_pre.sh
+npm version minor
+$BIN/release-_post.sh

bin/release-patch.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+BIN=`dirname $0`
+
+$BIN/release-_pre.sh
+npm version patch
+$BIN/release-_post.sh

package.json

@@ -1,14 +1,14 @@
 {
   "name": "webtorrent-desktop",
   "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.20.0",
+  "version": "0.17.1",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
     "url": "https://webtorrent.io"
   },
   "bugs": {
-    "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
+    "url": "https://github.com/feross/webtorrent-desktop/issues"
   },
   "dependencies": {
     "airplayer": "^2.0.0",
@@ -17,7 +17,6 @@
     "auto-launch": "^4.0.1",
     "bitfield": "^1.0.2",
     "capture-frame": "^1.0.0",
-    "chokidar": "^1.6.1",
     "chromecasts": "^1.8.0",
     "cp-file": "^4.0.1",
     "create-torrent": "^3.24.5",
@@ -25,20 +24,21 @@
     "deep-equal": "^1.0.1",
     "dlnacasts": "^0.1.0",
     "drag-drop": "^2.12.1",
-    "es6-error": "^4.0.0",
+    "es6-error": "^3.0.1",
     "fn-getter": "^1.0.0",
     "iso-639-1": "^1.2.1",
     "languagedetect": "^1.1.1",
     "location-history": "^1.0.0",
-    "material-ui": "^0.17.0",
+    "lodash.merge": "^4.6.0",
+    "material-ui": "^0.15.4",
     "mkdirp": "^0.5.1",
-    "music-metadata": "^0.9.15",
+    "musicmetadata": "^2.0.2",
     "network-address": "^1.1.0",
     "parse-torrent": "^5.7.3",
     "prettier-bytes": "^1.0.1",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "react-tap-event-plugin": "^2.0.1",
+    "react": "^15.2.1",
+    "react-dom": "^15.2.1",
+    "react-tap-event-plugin": "^1.0.0",
     "rimraf": "^2.5.2",
     "run-parallel": "^1.1.6",
     "semver": "^5.1.0",
@@ -51,16 +51,16 @@
     "zero-fill": "^2.2.3"
   },
   "devDependencies": {
-    "buble": "^0.19.3",
+    "buble": "^0.14.0",
     "cross-zip": "^2.0.1",
     "depcheck": "^0.6.4",
-    "electron": "1.6.16",
-    "electron-osx-sign": "0.4.3",
-    "electron-packager": "~8.5.1",
-    "electron-winstaller": "~2.5.2",
+    "electron": "1.4.2",
+    "electron-osx-sign": "^0.3.0",
+    "electron-packager": "^8.0.0",
+    "electron-winstaller": "^2.3.0",
     "gh-release": "^2.0.3",
     "minimist": "^1.2.0",
-    "nobin-debian-installer": "0.0.10",
+    "nobin-debian-installer": "^0.0.10",
     "nodemon": "^1.10.2",
     "open": "0.0.5",
     "plist": "^2.0.1",
@@ -90,11 +90,10 @@
   "optionalDependencies": {
     "appdmg": "^0.4.3"
   },
-  "private": true,
   "productName": "WebTorrent",
   "repository": {
     "type": "git",
-    "url": "git://github.com/webtorrent/webtorrent-desktop.git"
+    "url": "git://github.com/feross/webtorrent-desktop.git"
   },
   "scripts": {
     "build": "buble src --output build",
@@ -104,7 +103,7 @@
     "package": "node ./bin/package.js",
     "prepublish": "npm run build",
     "start": "npm run build && electron .",
-    "test": "standard && depcheck --ignores=buble,nodemon,gh-release --ignore-dirs=build,dist && node ./bin/extra-lint.js",
+    "test": "standard && depcheck --ignores=buble,lodash.merge,nodemon,gh-release --ignore-dirs=build,dist && node ./bin/extra-lint.js",
     "test-integration": "npm run build && node ./test",
     "update-authors": "./bin/update-authors.sh",
     "watch": "nodemon --exec \"npm run start\" --ext js,css --ignore build/ --ignore dist/"

src/config.js

@@ -23,7 +23,7 @@ module.exports = {
   CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
   TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',
 
-  APP_COPYRIGHT: 'Copyright © 2014-2018 ' + APP_TEAM,
+  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,
@@ -70,9 +70,9 @@ module.exports = {
 
   DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),
 
-  GITHUB_URL: 'https://github.com/webtorrent/webtorrent-desktop',
-  GITHUB_URL_ISSUES: 'https://github.com/webtorrent/webtorrent-desktop/issues',
-  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master',
+  GITHUB_URL: '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',
 

src/main/dock.js

@@ -32,7 +32,7 @@ function downloadFinished (path) {
  */
 function setBadge (count) {
   if (process.platform === 'darwin' ||
-      (process.platform === 'linux' && app.isUnityRunning())) {
+      process.platform === 'linux' && app.isUnityRunning()) {
     log(`setBadge: ${count}`)
     app.setBadgeCount(Number(count))
   }

src/main/external-player.js

@@ -17,8 +17,8 @@ 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(cb)
-  process.nextTick(() => cb(null))
+  if (playerPath == null) return vlcCommand((err) => cb(!err))
+  process.nextTick(() => cb(true))
 }
 
 function spawn (playerPath, url, title) {
@@ -29,6 +29,7 @@ function spawn (playerPath, url, title) {
     if (err) return windows.main.dispatch('externalPlayerNotFound')
     const args = [
       '--play-and-exit',
+      '--video-on-top',
       '--quiet',
       `--meta-title=${JSON.stringify(title)}`,
       url

src/main/folder-watcher.js

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

src/main/handlers.js

@@ -44,7 +44,7 @@ function installDarwin () {
 
 function uninstallDarwin () {}
 
-const EXEC_COMMAND = [ process.execPath, '--' ]
+const EXEC_COMMAND = [ process.execPath ]
 
 if (!config.IS_PRODUCTION) {
   EXEC_COMMAND.push(config.ROOT_PATH)

src/main/index.js

@@ -72,16 +72,13 @@ function init () {
     if (err) throw err
 
     isReady = true
-    const state = results.state
 
-    windows.main.init(state, {hidden: hidden})
+    windows.main.init(results.state, {hidden: hidden})
     windows.webtorrent.init()
     menu.init()
 
     // To keep app startup fast, some code is delayed.
-    setTimeout(() => {
-      delayedInit(state)
-    }, config.DELAYED_INIT)
+    setTimeout(delayedInit, config.DELAYED_INIT)
 
     // Report uncaught exceptions
     process.on('uncaughtException', (err) => {
@@ -124,24 +121,17 @@ function init () {
   })
 }
 
-function delayedInit (state) {
+function delayedInit () {
   if (app.isQuitting) return
 
   const announcement = require('./announcement')
   const dock = require('./dock')
   const updater = require('./updater')
-  const FolderWatcher = require('./folder-watcher')
-  const folderWatcher = new FolderWatcher({window: windows.main, state})
 
   announcement.init()
   dock.init()
   updater.init()
 
-  ipc.setModule('folderWatcher', folderWatcher)
-  if (folderWatcher.isEnabled()) {
-    folderWatcher.start()
-  }
-
   if (process.platform === 'win32') {
     const userTasks = require('./user-tasks')
     userTasks.init()
@@ -188,7 +178,7 @@ function onAppOpen (newArgv) {
 function sliceArgv (argv) {
   return argv.slice(config.IS_PRODUCTION ? 1
     : config.IS_TEST ? 4
-      : 2)
+    : 2)
 }
 
 function processArgv (argv) {
@@ -208,7 +198,7 @@ function processArgv (argv) {
       // Ignore hidden argument, already being handled
     } else if (arg.startsWith('-psn')) {
       // Ignore Mac launchd "process serial number" argument
-      // Issue: https://github.com/webtorrent/webtorrent-desktop/issues/214
+      // Issue: https://github.com/feross/webtorrent-desktop/issues/214
     } else if (arg.startsWith('--')) {
       // Ignore Spectron flags
     } else if (arg === 'data:,') {

src/main/ipc.js

@@ -1,6 +1,5 @@
 module.exports = {
-  init,
-  setModule
+  init
 }
 
 const electron = require('electron')
@@ -14,14 +13,6 @@ const windows = require('./windows')
 // Messages from the main process, to be sent once the WebTorrent process starts
 const messageQueueMainToWebTorrent = []
 
-// Will hold modules injected from the app that will be used on fired
-// IPC events.
-const modules = {}
-
-function setModule (name, module) {
-  modules[name] = module
-}
-
 function init () {
   const ipc = electron.ipcMain
 
@@ -67,7 +58,7 @@ function init () {
   })
 
   /**
-   * Player Events
+   * Events
    */
 
   ipc.on('onPlayerOpen', function () {
@@ -115,28 +106,6 @@ function init () {
     thumbar.onPlayerPause()
   })
 
-  /**
-   * Folder Watcher Events
-   */
-
-  ipc.on('startFolderWatcher', function () {
-    if (!modules['folderWatcher']) {
-      log('IPC ERR: folderWatcher module is not defined.')
-      return
-    }
-
-    modules['folderWatcher'].start()
-  })
-
-  ipc.on('stopFolderWatcher', function () {
-    if (!modules['folderWatcher']) {
-      log('IPC ERR: folderWatcher module is not defined.')
-      return
-    }
-
-    modules['folderWatcher'].stop()
-  })
-
   /**
    * Shell
    */
@@ -197,8 +166,8 @@ function init () {
   ipc.on('checkForExternalPlayer', function (e, path) {
     const externalPlayer = require('./external-player')
 
-    externalPlayer.checkInstall(path, function (err) {
-      windows.main.send('checkForExternalPlayer', !err)
+    externalPlayer.checkInstall(path, function (isInstalled) {
+      windows.main.send('checkForExternalPlayer', isInstalled)
     })
   })
 

src/main/menu.js

@@ -278,19 +278,6 @@ function getMenuTemplate () {
         }
       ]
     },
-    {
-      label: 'Transfers',
-      submenu: [
-        {
-          label: 'Pause All',
-          click: () => windows.main.dispatch('pauseAllTorrents')
-        },
-        {
-          label: 'Resume All',
-          click: () => windows.main.dispatch('resumeAllTorrents')
-        }
-      ]
-    },
     {
       label: 'Help',
       role: 'help',
@@ -324,7 +311,7 @@ function getMenuTemplate () {
   ]
 
   if (process.platform === 'darwin') {
-    // WebTorrent menu (Mac)
+    // Add WebTorrent app menu (Mac)
     template.unshift({
       label: config.APP_NAME,
       submenu: [
@@ -367,26 +354,8 @@ function getMenuTemplate () {
       ]
     })
 
-    // Edit menu (Mac)
-    template[2].submenu.push(
-      {
-        type: 'separator'
-      },
-      {
-        label: 'Speech',
-        submenu: [
-          {
-            role: 'startspeaking'
-          },
-          {
-            role: 'stopspeaking'
-          }
-        ]
-      }
-    )
-
-    // Window menu (Mac)
-    template.splice(6, 0, {
+    // Add Window menu (Mac)
+    template.splice(5, 0, {
       role: 'window',
       submenu: [
         {
@@ -426,7 +395,7 @@ function getMenuTemplate () {
       })
 
     // Help menu (Windows, Linux)
-    template[5].submenu.push(
+    template[4].submenu.push(
       {
         type: 'separator'
       },

src/main/tray.js

@@ -36,8 +36,8 @@ function setWindowFocus (flag) {
 }
 
 function initLinux () {
-  checkLinuxTraySupport(function (err) {
-    if (!err) createTray()
+  checkLinuxTraySupport(function (supportsTray) {
+    if (supportsTray) createTray()
   })
 }
 
@@ -55,14 +55,10 @@ function checkLinuxTraySupport (cb) {
   // 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(err)
+    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:
-    if (stdout.endsWith('\tinstall\n')) {
-      cb(null)
-    } else {
-      cb(new Error('debian package not installed'))
-    }
+    cb(stdout.endsWith('\tinstall\n'))
   })
 }
 

src/main/windows/main.js

@@ -32,17 +32,16 @@ function init (state, options) {
 
   const win = main.win = new electron.BrowserWindow({
     backgroundColor: '#282828',
-    backgroundThrottling: false, // do not throttle animations/timers when page is background
     darkTheme: true, // Forces dark theme (GTK+3)
-    height: initialBounds.height,
     icon: getIconPath(), // Window icon (Windows, Linux)
-    minHeight: config.WINDOW_MIN_HEIGHT,
     minWidth: config.WINDOW_MIN_WIDTH,
-    show: false,
+    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
+    show: false,
     width: initialBounds.width,
+    height: initialBounds.height,
     x: initialBounds.x,
     y: initialBounds.y
   })
@@ -166,8 +165,8 @@ function setBounds (bounds, maximize) {
     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))
+      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

src/main/windows/webtorrent.js

@@ -13,7 +13,6 @@ const config = require('../../config')
 function init () {
   const win = webtorrent.win = new electron.BrowserWindow({
     backgroundColor: '#1E1E1E',
-    backgroundThrottling: false, // do not throttle animations/timers when page is background
     center: true,
     fullscreen: false,
     fullscreenable: false,

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

@@ -17,8 +17,7 @@ module.exports = class ModalOKCancel extends React.Component {
           className='control ok'
           primary
           label={okText}
-          onClick={onOK}
-          autoFocus />
+          onClick={onOK} />
       </div>
     )
   }

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

@@ -23,8 +23,7 @@ module.exports = class UpdateAvailableModal extends React.Component {
     )
 
     function handleShow () {
-      // TODO: use the GitHub urls from config.js
-      electron.shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
+      electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
       dispatch('exitModal')
     }
 

src/renderer/controllers/folder-watcher-controller.js

@@ -1,13 +0,0 @@
-const {ipcRenderer} = require('electron')
-
-module.exports = class FolderWatcherController {
-  start () {
-    console.log('-- IPC: start folder watcher')
-    ipcRenderer.send('startFolderWatcher')
-  }
-
-  stop () {
-    console.log('-- IPC: stop folder watcher')
-    ipcRenderer.send('stopFolderWatcher')
-  }
-}

src/renderer/controllers/media-controller.js

@@ -1,5 +1,7 @@
-const {ipcRenderer} = require('electron')
-const telemetry = require('../lib/telemetry')
+const electron = require('electron')
+
+const ipcRenderer = electron.ipcRenderer
+
 const Playlist = require('../lib/playlist')
 
 // Controls local play back: the <video>/<audio> tag and VLC
@@ -10,7 +12,7 @@ module.exports = class MediaController {
   }
 
   mediaSuccess () {
-    telemetry.logPlayAttempt('success')
+    this.state.playing.result = 'success'
   }
 
   mediaStalled () {
@@ -20,7 +22,7 @@ module.exports = class MediaController {
   mediaError (error) {
     const state = this.state
     if (state.location.url() === 'player') {
-      telemetry.logPlayAttempt('error')
+      state.playing.result = 'error'
       state.playing.location = 'error'
       ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
       ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
@@ -56,10 +58,7 @@ module.exports = class MediaController {
     const state = this.state
     state.playing.location = 'external'
 
-    const onServerRunning = function () {
-      state.playing.isReady = true
-      telemetry.logPlayAttempt('external')
-
+    let open = function () {
       const mediaURL = Playlist.getCurrentLocalURL(state)
       ipcRenderer.send('openExternalPlayer',
         state.saved.prefs.externalPlayerPath,
@@ -67,8 +66,8 @@ module.exports = class MediaController {
         state.window.title)
     }
 
-    if (state.server != null) onServerRunning()
-    else ipcRenderer.once('wt-server-running', onServerRunning)
+    if (state.server != null) open()
+    else ipcRenderer.once('wt-server-running', open)
   }
 
   externalPlayerNotFound () {

src/renderer/controllers/playback-controller.js

@@ -27,8 +27,6 @@ module.exports = class PlaybackController {
   // * 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 */) {
-    this.pauseActiveTorrents(infoHash)
-
     const state = this.state
     if (state.location.url() === 'player') {
       this.updatePlayer(infoHash, index, false, (err) => {
@@ -86,26 +84,15 @@ module.exports = class PlaybackController {
     else this.pause()
   }
 
-  pauseActiveTorrents (infoHash) {
-    // Playback Priority: pause all active torrents if needed.
-    if (!this.state.saved.prefs.highestPlaybackPriority) return
-
-    // Do not pause active torrents if playing a fully downloaded torrent.
-    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    if (torrentSummary.status === 'seeding') return
-
-    dispatch('prioritizeTorrent', infoHash)
-  }
-
   // 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()
-        })
+          state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
+            if (err) dispatch('error', err)
+            else this.play()
+          })
     }
   }
 
@@ -224,7 +211,6 @@ module.exports = class PlaybackController {
     const torrentSummary = TorrentSummary.getByKey(state, infoHash)
 
     state.playing.infoHash = torrentSummary.infoHash
-    state.playing.isReady = false
 
     // update UI to show pending playback
     sound.play('PLAY')
@@ -236,8 +222,6 @@ module.exports = class PlaybackController {
 
   // Starts WebTorrent server for media streaming
   startServer (torrentSummary) {
-    const state = this.state
-
     if (torrentSummary.status === 'paused') {
       dispatch('startTorrentingSummary', torrentSummary.torrentKey)
       ipcRenderer.once('wt-ready-' + torrentSummary.infoHash,
@@ -248,7 +232,6 @@ module.exports = class PlaybackController {
 
     function onTorrentReady () {
       ipcRenderer.send('wt-start-server', torrentSummary.infoHash)
-      ipcRenderer.once('wt-server-running', () => { state.playing.isReady = true })
     }
   }
 
@@ -271,7 +254,7 @@ module.exports = class PlaybackController {
     state.playing.fileIndex = index
     state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
       : TorrentPlayer.isAudio(fileSummary) ? 'audio'
-        : 'other'
+      : 'other'
 
     // pick up where we left off
     let jumpToTime = 0
@@ -337,7 +320,12 @@ module.exports = class PlaybackController {
     // Save volume (this session only, not in state.saved)
     state.previousVolume = state.playing.volume
 
-    if (!state.playing.isReady) telemetry.logPlayAttempt('abandoned') // user gave up waiting
+    // 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()
@@ -354,11 +342,6 @@ module.exports = class PlaybackController {
 
     ipcRenderer.send('onPlayerClose')
 
-    // Playback Priority: resume previously paused downloads.
-    if (this.state.saved.prefs.highestPlaybackPriority) {
-      dispatch('resumePausedTorrents')
-    }
-
     this.update()
   }
 }

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

@@ -121,66 +121,11 @@ module.exports = class TorrentListController {
       torrentSummary.status = 'new'
       this.startTorrentingSummary(torrentSummary.torrentKey)
       sound.play('ENABLE')
-      return
+    } else {
+      torrentSummary.status = 'paused'
+      ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
+      sound.play('DISABLE')
     }
-
-    this.pauseTorrent(torrentSummary, true)
-  }
-
-  pauseAllTorrents () {
-    this.state.saved.torrents.forEach((torrentSummary) => {
-      if (torrentSummary.status === 'downloading' ||
-          torrentSummary.status === 'seeding') {
-        torrentSummary.status = 'paused'
-        ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
-      }
-    })
-    sound.play('DISABLE')
-  }
-
-  resumeAllTorrents () {
-    this.state.saved.torrents.forEach((torrentSummary) => {
-      if (torrentSummary.status === 'paused') {
-        torrentSummary.status = 'downloading'
-        this.startTorrentingSummary(torrentSummary.torrentKey)
-      }
-    })
-    sound.play('ENABLE')
-  }
-
-  pauseTorrent (torrentSummary, playSound) {
-    torrentSummary.status = 'paused'
-    ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
-
-    if (playSound) sound.play('DISABLE')
-  }
-
-  prioritizeTorrent (infoHash) {
-    this.state.saved.torrents
-      .filter((torrent) => { // We're interested in active torrents only.
-        return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
-      })
-      .map((torrent) => { // Pause all active torrents except the one that started playing.
-        if (infoHash === torrent.infoHash) return
-
-        // Pause torrent without playing sounds.
-        this.pauseTorrent(torrent, false)
-
-        this.state.saved.torrentsToResume.push(torrent.infoHash)
-      })
-
-    console.log('Playback Priority: paused torrents: ', this.state.saved.torrentsToResume)
-  }
-
-  resumePausedTorrents () {
-    console.log('Playback Priority: resuming paused torrents')
-    if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
-    this.state.saved.torrentsToResume.map((infoHash) => {
-      this.toggleTorrent(infoHash)
-    })
-
-    // reset paused torrents
-    this.state.saved.torrentsToResume = []
   }
 
   toggleTorrentFile (infoHash, index) {
@@ -237,48 +182,51 @@ module.exports = class TorrentListController {
 
   openTorrentContextMenu (infoHash) {
     const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    const menu = new electron.remote.Menu()
+    const torrentStarted = !!(torrentSummary.files && torrentSummary.progress)
 
-    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({
+    const menuTemplate = [
+      {
+        label: 'Remove From List',
+        click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
+      },
+      {
+        label: 'Remove Data File',
+        enabled: torrentStarted,
+        click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
+      },
+      {
         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),
-      enabled: torrentSummary.torrentFileName != null
-    }))
+      },
+      {
+        label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
+        enabled: torrentStarted,
+        click: () => showItemInFolder(torrentSummary)
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Copy Magnet Link to Clipboard',
+        click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
+      },
+      {
+        label: 'Copy Instant.io Link to Clipboard',
+        click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
+      },
+      {
+        label: 'Save Torrent File As...',
+        click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey)
+      },
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Paste Torrent Address',
+        role: 'paste'
+      }
+    ]
 
+    const menu = electron.remote.Menu.buildFromTemplate(menuTemplate)
     menu.popup(electron.remote.getCurrentWindow())
   }
 
@@ -315,7 +263,7 @@ module.exports = class TorrentListController {
 
 // Recursively finds {name, path, size} for all files in a folder
 // Calls `cb` on success, calls `onError` on failure
-function findFilesRecursive (paths, cb_) {
+function findFilesRecursive (paths, cb) {
   if (paths.length > 1) {
     let numComplete = 0
     let ret = []
@@ -324,7 +272,7 @@ function findFilesRecursive (paths, cb_) {
         ret.push(...fileObjs)
         if (++numComplete === paths.length) {
           ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
-          cb_(ret)
+          cb(ret)
         }
       })
     })
@@ -338,7 +286,7 @@ function findFilesRecursive (paths, cb_) {
     // Files: return name, path, and size
     if (!stat.isDirectory()) {
       const filePath = fileOrFolder
-      return cb_([{
+      return cb([{
         name: path.basename(filePath),
         path: filePath,
         size: stat.size
@@ -350,7 +298,7 @@ function findFilesRecursive (paths, cb_) {
     fs.readdir(folderPath, function (err, fileNames) {
       if (err) return dispatch('error', err)
       const paths = fileNames.map((fileName) => path.join(folderPath, fileName))
-      findFilesRecursive(paths, cb_)
+      findFilesRecursive(paths, cb)
     })
   })
 }

src/renderer/lib/cast.js

@@ -388,8 +388,7 @@ function toggleMenu (location) {
   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)

src/renderer/lib/migrations.js

@@ -78,7 +78,7 @@ function migrate_0_7_0 (saved) {
     }
 
     // Fix exception caused by incorrect file ordering.
-    // https://github.com/webtorrent/webtorrent-desktop/pull/604#issuecomment-222805214
+    // https://github.com/feross/webtorrent-desktop/pull/604#issuecomment-222805214
     delete ts.defaultPlayFileIndex
     delete ts.files
     delete ts.selections
@@ -111,7 +111,7 @@ function migrate_0_12_0 (saved) {
 
   // 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/webtorrent/webtorrent-desktop/pull/806
+  // See https://github.com/feross/webtorrent-desktop/pull/806
   const defaultTorrentFiles = [
     '6a9759bffd5c0af65319979fb7832189f4f3c35d.torrent',
     '88594aaacbde40ef3e2510c47374ec0aa396c08e.torrent',
@@ -153,7 +153,7 @@ function migrate_0_17_0 (saved) {
 function migrate_0_17_2 (saved) {
   // Remove the trailing dot (.) from the Wired CD torrent name, since
   // folders/files that end in a trailing dot (.) or space are not deletable from
-  // Windows Explorer. See: https://github.com/webtorrent/webtorrent-desktop/issues/905
+  // Windows Explorer. See: https://github.com/feross/webtorrent-desktop/issues/905
 
   const cpFile = require('cp-file')
   const rimraf = require('rimraf')

src/renderer/lib/state.js

@@ -92,7 +92,6 @@ function getDefaultPlayState () {
     type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
     currentTime: 0, /* seconds */
     duration: 1, /* seconds */
-    isReady: false,
     isPaused: true,
     isStalled: false,
     lastTimeUpdate: 0, /* Unix time in ms */
@@ -121,13 +120,9 @@ function setupStateSaved (cb) {
       isFileHandler: false,
       openExternalPlayer: false,
       externalPlayerPath: null,
-      startup: false,
-      autoAddTorrents: false,
-      torrentsFolderPath: '',
-      highestPlaybackPriority: true
+      startup: false
     },
     torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
-    torrentsToResume: [],
     version: config.APP_VERSION /* make sure we can upgrade gracefully later */
   }
 

src/renderer/lib/telemetry.js

@@ -66,8 +66,8 @@ function reset () {
     minVersion: config.APP_VERSION,
     total: 0,
     success: 0,
+    timeout: 0,
     error: 0,
-    external: 0,
     abandoned: 0
   }
 }
@@ -210,10 +210,10 @@ function getElemString (elem) {
   return ret
 }
 
-// The user pressed play. Did it work, display an error,
-// open an external player or did user abandon the attempt?
+// The user pressed play. It either worked, timed out, or showed the
+// 'Play in VLC' codec error
 function logPlayAttempt (result) {
-  if (!['success', 'error', 'external', 'abandoned'].includes(result)) {
+  if (!['success', 'timeout', 'error', 'abandoned'].includes(result)) {
     return console.error('Unknown play attempt result', result)
   }
 

src/renderer/lib/torrent-player.js

@@ -33,18 +33,11 @@ function isVideo (file) {
 function isAudio (file) {
   return [
     '.aac',
-    '.aiff',
-    '.ape',
     '.ac3',
-    '.flac',
-    '.m4a',
-    '.mp2',
     '.mp3',
-    '.oga',
     '.ogg',
-    '.opus',
     '.wav',
-    '.wma'
+    '.m4a'
   ].includes(getFileExtension(file))
 }
 

src/renderer/lib/torrent-poster.js

@@ -3,145 +3,39 @@ module.exports = torrentPoster
 const captureFrame = require('capture-frame')
 const path = require('path')
 
-const mediaExtensions = {
-  audio: ['.aac', '.asf', '.flac', '.m2a', '.m4a', '.mp2', '.mp4', '.mp3', '.oga', '.ogg', '.opus',
-    '.wma', '.wav', '.wv', '.wvp'],
-  video: ['.mp4', '.m4v', '.webm', '.mov', '.mkv'],
-  image: ['.gif', '.jpg', '.jpeg', '.png']
-}
-
 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 extractPoster(posterFile, cb)
+  if (posterFile) return torrentPosterFromImage(posterFile, torrent, cb)
 
-  // 'score' each media type based on total size present in torrent
-  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
-    return {
-      type: mediaType,
-      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType])}
-  }).sort((a, b) => { // sort descending on size
-    return b.size - a.size
-  })[0]
+  // Second, try to use the largest video file
+  // Filter out file formats that the <video> tag definitely can't play
+  const videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
+  if (videoFile) return torrentPosterFromVideo(videoFile, torrent, cb)
 
-  if (bestScore.size === 0) {
-    // Admit defeat, no video, audio or image had a significant presence
-    return cb(new Error('Cannot generate a poster from any files in the torrent'))
-  }
+  // Third, try to use the largest image file
+  const imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.jpeg', '.png'])
+  if (imgFile) return torrentPosterFromImage(imgFile, torrent, cb)
 
-  // Based on which media type is dominant we select the corresponding poster function
-  switch (bestScore.type) {
-    case 'audio':
-      return torrentPosterFromAudio(torrent, cb)
-    case 'image':
-      return torrentPosterFromImage(torrent, cb)
-    case 'video':
-      return torrentPosterFromVideo(torrent, cb)
-  }
+  // TODO: generate a waveform from the largest sound file
+  // Finally, admit defeat
+  return cb(new Error('Cannot generate a poster from any files in the torrent'))
 }
 
-/**
- * Calculate the total data size of file matching one of the provided extensions
- * @param torrent
- * @param extensions List of extension to match
- * @returns {number} total size, of matches found (>= 0)
- */
-function calculateDataLengthByExtension (torrent, extensions) {
-  const files = filterOnExtension(torrent, extensions)
-  if (files.length === 0) return 0
-  return files
-    .map(file => file.length)
-    .reduce((a, b) => {
-      return a + b
-    })
-}
-
-/**
- * Get the largest file of a given torrent, filtered by provided extension
- * @param torrent Torrent to search in
- * @param extensions Extension whitelist filter
- * @returns Torrent file object
- */
 function getLargestFileByExtension (torrent, extensions) {
-  const files = filterOnExtension(torrent, extensions)
+  const files = torrent.files.filter(function (file) {
+    const extname = path.extname(file.name).toLowerCase()
+    return extensions.indexOf(extname) !== -1
+  })
   if (files.length === 0) return undefined
-  return files.reduce((a, b) => {
+  return files.reduce(function (a, b) {
     return a.length > b.length ? a : b
   })
 }
 
-/**
- * Filter file on a list extension, can be used to find al image files
- * @param torrent Torrent to filter files from
- * @param extensions File extensions to filter on
- * @returns {number} Array of torrent file objects matching one of the given extensions
- */
-function filterOnExtension (torrent, extensions) {
-  return torrent.files.filter(file => {
-    const extname = path.extname(file.name).toLowerCase()
-    return extensions.indexOf(extname) !== -1
-  })
-}
-
-/**
- * Returns a score how likely the file is suitable as a poster
- * @param imgFile File object of an image
- * @returns {number} Score, higher score is a better match
- */
-function scoreAudioCoverFile (imgFile) {
-  const fileName = path.basename(imgFile.name, path.extname(imgFile.name)).toLowerCase()
-  const relevanceScore = {
-    cover: 80,
-    folder: 80,
-    album: 80,
-    front: 80,
-    back: 20
-  }
-
-  for (let keyword in relevanceScore) {
-    if (fileName === keyword) {
-      return relevanceScore[keyword]
-    }
-    if (fileName.indexOf(keyword) !== -1) {
-      return 0.8 * relevanceScore[keyword]
-    }
-  }
-  return 0
-}
-
-function torrentPosterFromAudio (torrent, cb) {
-  const imageFiles = filterOnExtension(torrent, mediaExtensions.image)
-
-  const bestCover = imageFiles.map(file => {
-    return {
-      file: file,
-      score: scoreAudioCoverFile(file)
-    }
-  }).reduce((a, b) => {
-    if (a.score > b.score) {
-      return a
-    }
-    if (b.score > a.score) {
-      return b
-    }
-    // If score is equal, pick the largest file, aiming for highest resolution
-    if (a.file.length > b.file.length) {
-      return a
-    }
-    return b
-  })
-
-  if (!bestCover) return cb(new Error('Generated poster contains no data'))
-
-  const extname = path.extname(bestCover.file.name)
-  bestCover.file.getBuffer((err, buf) => cb(err, buf, extname))
-}
-
-function torrentPosterFromVideo (torrent, cb) {
-  const file = getLargestFileByExtension(torrent, mediaExtensions.video)
-
+function torrentPosterFromVideo (file, torrent, cb) {
   const index = torrent.files.indexOf(file)
 
   const server = torrent.createServer(0)
@@ -183,12 +77,7 @@ function torrentPosterFromVideo (torrent, cb) {
   }
 }
 
-function torrentPosterFromImage (torrent, cb) {
-  const file = getLargestFileByExtension(torrent, mediaExtensions.image)
-  extractPoster(file, cb)
-}
-
-function extractPoster (file, cb) {
+function torrentPosterFromImage (file, torrent, cb) {
   const extname = path.extname(file.name)
-  file.getBuffer((err, buf) => { return cb(err, buf, extname) })
+  file.getBuffer((err, buf) => cb(err, buf, extname))
 }

src/renderer/main.js

@@ -1,6 +1,10 @@
 /**
  * Perf optimization: Hook into require() to modify how certain modules load:
  *
+ * - `lodash/merge` (used by `material-ui`) causes 119 require() calls at startup,
+ *   which take ~100ms. Replace it with `lodash.merge` which is equivalent.
+ *   See: https://github.com/callemall/material-ui/pull/4380#issuecomment-250894552
+ *
  * - `inline-style-prefixer` (used by `material-ui`) takes ~40ms. It is not
  *   actually used because auto-prefixing is disabled with
  *   `darkBaseTheme.userAgent = false`. Return a fake object.
@@ -8,6 +12,7 @@
 let Module = require('module')
 const _require = Module.prototype.require
 Module.prototype.require = function (id) {
+  if (id === 'lodash/merge') id = 'lodash.merge'
   if (id === 'inline-style-prefixer') return {}
   return _require.apply(this, arguments)
 }
@@ -24,7 +29,6 @@ const State = require('./lib/state')
 State.load(onState)
 
 const createGetter = require('fn-getter')
-const debounce = require('debounce')
 const dragDrop = require('drag-drop')
 const electron = require('electron')
 const fs = require('fs')
@@ -111,10 +115,6 @@ function onState (err, _state) {
     update: createGetter(() => {
       const UpdateController = require('./controllers/update-controller')
       return new UpdateController(state)
-    }),
-    folderWatcher: createGetter(() => {
-      const FolderWatcherController = require('./controllers/folder-watcher-controller')
-      return new FolderWatcherController()
     })
   }
 
@@ -150,18 +150,6 @@ function onState (err, _state) {
   // ...same thing if you paste a torrent
   document.addEventListener('paste', onPaste)
 
-  const debouncedFullscreenToggle = debounce(function () {
-    dispatch('toggleFullScreen')
-  }, 1000, true)
-
-  document.addEventListener('wheel', function (event) {
-    // ctrlKey detects pinch to zoom, http://crbug.com/289887
-    if (event.ctrlKey) {
-      event.preventDefault()
-      debouncedFullscreenToggle()
-    }
-  })
-
   // ...focus and blur. Needed to show correct dock icon text ('badge') in OSX
   window.addEventListener('focus', onFocus)
   window.addEventListener('blur', onBlur)
@@ -242,8 +230,6 @@ const dispatchHandlers = {
   'showCreateTorrent': (paths) => controllers.torrentList().showCreateTorrent(paths),
   'createTorrent': (options) => controllers.torrentList().createTorrent(options),
   'toggleTorrent': (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
-  'pauseAllTorrents': () => controllers.torrentList().pauseAllTorrents(),
-  'resumeAllTorrents': () => controllers.torrentList().resumeAllTorrents(),
   'toggleTorrentFile': (infoHash, index) =>
     controllers.torrentList().toggleTorrentFile(infoHash, index),
   'confirmDeleteTorrent': (infoHash, deleteData) =>
@@ -258,8 +244,6 @@ const dispatchHandlers = {
     controllers.torrentList().startTorrentingSummary(torrentKey),
   'saveTorrentFileAs': (torrentKey) =>
     controllers.torrentList().saveTorrentFileAs(torrentKey),
-  'prioritizeTorrent': (infoHash) => controllers.torrentList().prioritizeTorrent(infoHash),
-  'resumePausedTorrents': () => controllers.torrentList().resumePausedTorrents(),
 
   // Playback
   'playFile': (infoHash, index) => controllers.playback().playFile(infoHash, index),
@@ -300,8 +284,6 @@ const dispatchHandlers = {
   'preferences': () => controllers.prefs().show(),
   'updatePreferences': (key, value) => controllers.prefs().update(key, value),
   'checkDownloadPath': checkDownloadPath,
-  'startFolderWatcher': () => controllers.folderWatcher().start(),
-  'stopFolderWatcher': () => controllers.folderWatcher().stop(),
 
   // Update (check for new versions on Linux, where there's no auto updater)
   'updateAvailable': (version) => controllers.update().updateAvailable(version),
@@ -362,7 +344,6 @@ function setupIpc () {
   ipcRenderer.on('wt-infohash', (e, ...args) => tc.torrentInfoHash(...args))
   ipcRenderer.on('wt-metadata', (e, ...args) => tc.torrentMetadata(...args))
   ipcRenderer.on('wt-done', (e, ...args) => tc.torrentDone(...args))
-  ipcRenderer.on('wt-done', () => controllers.torrentList().resumePausedTorrents())
   ipcRenderer.on('wt-warning', (e, ...args) => tc.torrentWarning(...args))
   ipcRenderer.on('wt-error', (e, ...args) => tc.torrentError(...args))
 
@@ -459,13 +440,6 @@ function setDimensions (dimensions) {
 function onOpen (files) {
   if (!Array.isArray(files)) files = [ files ]
 
-  // File API seems to transform "magnet:?foo" in "magnet:///?foo"
-  // this is a sanitization
-  files = files.map(file => {
-    if (typeof file !== 'string') return file
-    return file.replace(/^magnet:\/+\?/i, 'magnet:?')
-  })
-
   const url = state.location.url()
   const allTorrents = files.every(TorrentPlayer.isTorrent)
   const allSubtitles = files.every(controllers.subtitles().isSubtitle)
@@ -501,10 +475,8 @@ function onError (err) {
   update()
 }
 
-const editableHtmlTags = new Set(['input', 'textarea'])
-
 function onPaste (e) {
-  if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
+  if (e.target.tagName.toLowerCase() === 'input') return
   controllers.torrentList().addTorrent(electron.clipboard.readText())
 
   update()

src/renderer/pages/player-page.js

@@ -160,7 +160,6 @@ function renderMedia (state) {
     } else {
       // When the last video completes, pause the video instead of looping
       state.playing.isPaused = true
-      if (state.window.isFullScreen) dispatch('toggleFullScreen')
     }
   }
 
@@ -207,18 +206,25 @@ function renderOverlay (state) {
 function renderAudioMetadata (state) {
   const fileSummary = state.getPlayingFileSummary()
   if (!fileSummary.audioInfo) return
-  const common = fileSummary.audioInfo.common || {}
+  const info = fileSummary.audioInfo
 
   // Get audio track info
-  const title = common.title ? common.title : fileSummary.name
+  let title = info.title
+  if (!title) {
+    title = fileSummary.name
+  }
+  let artist = info.artist && info.artist[0]
+  let album = info.album
+  if (album && info.year && !album.includes(info.year)) {
+    album += ' (' + info.year + ')'
+  }
+  let track
+  if (info.track && info.track.no && info.track.of) {
+    track = info.track.no + ' of ' + info.track.of
+  }
 
   // Show a small info box in the middle of the screen with title/album/etc
   const elems = []
-
-  // Audio metadata: artist(s)
-  const artist = common.albumartist || common.artist ||
-    (common.artists && common.artists.filter(function (a) { return a }).join(', ')) ||
-    '(Unknown Artist)'
   if (artist) {
     elems.push((
       <div key='artist' className='audio-artist'>
@@ -226,44 +232,14 @@ function renderAudioMetadata (state) {
       </div>
     ))
   }
-
-  // Audio metadata: album
-  if (common.album) {
+  if (album) {
     elems.push((
       <div key='album' className='audio-album'>
-        <label>Album</label>{common.album}
+        <label>Album</label>{album}
       </div>
     ))
   }
-
-  // Audio metadata: year
-  if (common.year) {
-    elems.push((
-      <div key='year' className='audio-year'>
-        <label>Year</label>{common.year}
-      </div>
-    ))
-  }
-
-  // Audio metadata: release information (label & catalog-number)
-  if (common.label || common.catalognumber) {
-    const releaseInfo = []
-    if (common.label) {
-      releaseInfo.push(common.label)
-    }
-    if (common.catalognumber) {
-      releaseInfo.push(common.catalognumber)
-    }
-    elems.push((
-      <div key='release' className='audio-release'>
-        <label>Release</label>{ releaseInfo.join(' / ') }
-      </div>
-    ))
-  }
-
-  // Audio metadata: track-number
-  if (common.track && common.track.no && common.track.of) {
-    const track = common.track.no + ' of ' + common.track.of
+  if (track) {
     elems.push((
       <div key='track' className='audio-track'>
         <label>Track</label>{track}
@@ -271,38 +247,6 @@ function renderAudioMetadata (state) {
     ))
   }
 
-  // Audio metadata: format
-  const format = []
-  fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
-  if (fileSummary.audioInfo.format.dataformat) {
-    format.push(fileSummary.audioInfo.format.dataformat)
-  }
-  if (fileSummary.audioInfo.format.bitrate) {
-    format.push(fileSummary.audioInfo.format.bitrate / 1000 + ' kbps')
-  }
-  if (fileSummary.audioInfo.format.sampleRate) {
-    format.push(fileSummary.audioInfo.format.sampleRate / 1000 + ' kHz')
-  }
-  if (fileSummary.audioInfo.format.bitsPerSample) {
-    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
-  }
-  if (format.length > 0) {
-    elems.push((
-      <div key='format' className='audio-format'>
-        <label>Format</label>{ format.join(', ') }
-      </div>
-    ))
-  }
-
-  // Audio metadata: comments
-  if (common.comment) {
-    elems.push((
-      <div key='comments' className='audio-comments'>
-        <label>Comments</label>{common.comment.join(' / ')}
-      </div>
-    ))
-  }
-
   // Align the title with the other info, if available. Otherwise, center title
   const emptyLabel = (<label />)
   elems.unshift((
@@ -331,9 +275,9 @@ function renderLoadingSpinner (state) {
     <div key='loading' className='media-stalled'>
       <div key='loading-spinner' className='loading-spinner'>&nbsp;</div>
       <div key='loading-progress' className='loading-status ellipsis'>
-        <span className='progress'>{fileProgress}%</span> downloaded
-        <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
-        <span> ↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
+        <span className='progress'>{fileProgress}%</span> downloaded,
+        <span>↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
+        <span>↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
       </div>
     </div>
   )
@@ -359,7 +303,7 @@ function renderCastScreen (state) {
     isCast = false
   } else if (state.playing.location === 'error') {
     castIcon = 'error_outline'
-    castType = 'Unable to Play'
+    castType = 'Error'
     isCast = false
   }
 
@@ -553,9 +497,9 @@ function renderPlayerControls (state) {
   const volume = state.playing.volume
   const volumeIcon = 'volume_' + (
     volume === 0 ? 'off'
-      : volume < 0.3 ? 'mute'
-        : volume < 0.6 ? 'down'
-          : 'up')
+    : volume < 0.3 ? 'mute'
+    : volume < 0.6 ? 'down'
+    : 'up')
   const volumeStyle = {
     background: '-webkit-gradient(linear, left top, right top, ' +
       'color-stop(' + (volume * 100) + '%, #eee), ' +
@@ -579,8 +523,8 @@ function renderPlayerControls (state) {
   ))
 
   // Show video playback progress
-  const currentTimeStr = formatTime(state.playing.currentTime, state.playing.duration)
-  const durationStr = formatTime(state.playing.duration, state.playing.duration)
+  const currentTimeStr = formatTime(state.playing.currentTime)
+  const durationStr = formatTime(state.playing.duration)
   elements.push((
     <span key='time' className='time float-left'>
       {currentTimeStr} / {durationStr}
@@ -655,15 +599,12 @@ function renderLoadingBar (state) {
 
   const torrentSummary = state.getPlayingTorrentSummary()
   if (!torrentSummary.progress) {
-    return null
+    return []
   }
 
   // Find all contiguous parts of the torrent which are loaded
   const prog = torrentSummary.progress
   const fileProg = prog.files[state.playing.fileIndex]
-
-  if (!fileProg) return null
-
   const parts = []
   let lastPiecePresent = false
   for (let i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
@@ -685,7 +626,6 @@ function renderLoadingBar (state) {
 
     return (<div key={i} className='loading-bar-part' style={style} />)
   })
-
   return (<div key='loading-bar' className='loading-bar'>{loadingBarElems}</div>)
 }
 
@@ -702,19 +642,17 @@ function cssBackgroundImageDarkGradient () {
     'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
 }
 
-function formatTime (time, total) {
+function formatTime (time) {
   if (typeof time !== 'number' || Number.isNaN(time)) {
     return '0:00'
   }
 
-  let totalHours = Math.floor(total / 3600)
-  let totalMinutes = Math.floor(total % 3600 / 60)
   let hours = Math.floor(time / 3600)
   let minutes = Math.floor(time % 3600 / 60)
-  if (totalMinutes > 9) {
+  if (hours > 0) {
     minutes = zeroFill(2, minutes)
   }
   let seconds = zeroFill(2, Math.floor(time % 60))
 
-  return (totalHours > 0 ? hours + ':' : '') + minutes + ':' + seconds
+  return (hours > 0 ? hours + ':' : '') + minutes + ':' + seconds
 }

src/renderer/pages/preferences-page.js

@@ -62,24 +62,6 @@ class PreferencesPage extends React.Component {
     dispatch('updatePreferences', 'openExternalPlayer', !isChecked)
   }
 
-  highestPlaybackPriorityCheckbox () {
-    return (
-      <Preference>
-        <Checkbox
-          className='control'
-          checked={this.props.state.unsaved.prefs.highestPlaybackPriority}
-          label={'Highest Playback Priority'}
-          onCheck={this.handleHighestPlaybackPriorityChange}
-        />
-        <p>Pauses all active torrents to allow playback to use all of the available bandwidth.</p>
-      </Preference>
-    )
-  }
-
-  handleHighestPlaybackPriorityChange (e, isChecked) {
-    dispatch('updatePreferences', 'highestPlaybackPriority', isChecked)
-  }
-
   externalPlayerPathSelector () {
     const playerPath = this.props.state.unsaved.prefs.externalPlayerPath
     const playerName = this.props.state.getExternalPlayerName()
@@ -108,59 +90,6 @@ class PreferencesPage extends React.Component {
     dispatch('updatePreferences', 'externalPlayerPath', filePath)
   }
 
-  autoAddTorrentsCheckbox () {
-    return (
-      <Preference>
-        <Checkbox
-          className='control'
-          checked={this.props.state.unsaved.prefs.autoAddTorrents}
-          label={'Watch for new .torrent files and add them immediately'}
-          onCheck={(e, value) => { this.handleAutoAddTorrentsChange(e, value) }}
-        />
-      </Preference>
-    )
-  }
-
-  handleAutoAddTorrentsChange (e, isChecked) {
-    const torrentsFolderPath = this.props.state.unsaved.prefs.torrentsFolderPath
-    if (isChecked && !torrentsFolderPath) {
-      alert('Select a torrents folder first.') // eslint-disable-line
-      e.preventDefault()
-      return
-    }
-
-    dispatch('updatePreferences', 'autoAddTorrents', isChecked)
-
-    if (isChecked) {
-      dispatch('startFolderWatcher', null)
-      return
-    }
-
-    dispatch('stopFolderWatcher', null)
-  }
-
-  torrentsFolderPathSelector () {
-    const torrentsFolderPath = this.props.state.unsaved.prefs.torrentsFolderPath
-
-    return (
-      <Preference>
-        <PathSelector
-          dialog={{
-            title: 'Select folder to watch for new torrents',
-            properties: [ 'openDirectory' ]
-          }}
-          displayValue={torrentsFolderPath || ''}
-          onChange={this.handletorrentsFolderPathChange}
-          title='Folder to watch'
-          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null} />
-      </Preference>
-    )
-  }
-
-  handletorrentsFolderPathChange (filePath) {
-    dispatch('updatePreferences', 'torrentsFolderPath', filePath)
-  }
-
   setDefaultAppButton () {
     const isFileHandler = this.props.state.unsaved.prefs.isFileHandler
     if (isFileHandler) {
@@ -216,15 +145,12 @@ class PreferencesPage extends React.Component {
     }
     return (
       <div style={style}>
-        <PreferencesSection title='Folders'>
+        <PreferencesSection title='Downloads'>
           {this.downloadPathSelector()}
-          {this.autoAddTorrentsCheckbox()}
-          {this.torrentsFolderPathSelector()}
         </PreferencesSection>
         <PreferencesSection title='Playback'>
           {this.openExternalPlayerCheckbox()}
           {this.externalPlayerPathSelector()}
-          {this.highestPlaybackPriorityCheckbox()}
         </PreferencesSection>
         <PreferencesSection title='Default torrent app'>
           {this.setDefaultAppButton()}

src/renderer/pages/torrent-list-page.js

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

src/renderer/webtorrent.js

@@ -8,7 +8,7 @@ const defaultAnnounceList = require('create-torrent').announceList
 const electron = require('electron')
 const fs = require('fs')
 const mkdirp = require('mkdirp')
-const mm = require('music-metadata')
+const musicmetadata = require('musicmetadata')
 const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
@@ -98,7 +98,7 @@ function init () {
 
   window.addEventListener('error', (e) =>
     ipc.send('wt-uncaught-error', {message: e.error.message, stack: e.error.stack}),
-  true)
+    true)
 
   setInterval(updateTorrentProgress, 1000)
   console.timeEnd('init')
@@ -128,7 +128,6 @@ function startTorrenting (torrentKey, torrentID, path, fileModtimes, selections)
 }
 
 function stopTorrenting (infoHash) {
-  console.log('--- STOP TORRENTING: ', infoHash)
   const torrent = client.get(infoHash)
   if (torrent) torrent.destroy()
 }
@@ -334,30 +333,16 @@ function stopServer () {
   server = null
 }
 
-console.log('Initializing...')
-
 function getAudioMetadata (infoHash, index) {
   const torrent = client.get(infoHash)
   const file = torrent.files[index]
-
-  // Set initial matadata to display the filename first.
-  const metadata = { title: file.name }
-  ipc.send('wt-audio-metadata', infoHash, index, metadata)
-
-  const options = {native: false, skipCovers: true, fileSize: file.length}
-  const onMetaData = file.done
-    // If completed; use direct file access
-    ? mm.parseFile(path.join(torrent.path, file.path), options)
-    // otherwise stream
-    : mm.parseStream(file.createReadStream(), file.name, options)
-
-  onMetaData
-    .then(function (metadata) {
-      console.log('got audio metadata for %s (length=%s): %o', file.name, file.length, metadata)
-      ipc.send('wt-audio-metadata', infoHash, index, metadata)
-    }).catch(function (err) {
-      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-    })
+  musicmetadata(file.createReadStream(), function (err, info) {
+    if (err) return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
+    const { artist, album, albumartist, title, year, track, disk, genre } = info
+    const importantInfo = { artist, album, albumartist, title, year, track, disk, genre }
+    console.log('got audio metadata for %s: %o', file.name, importantInfo)
+    ipc.send('wt-audio-metadata', infoHash, index, importantInfo)
+  })
 }
 
 function selectFiles (torrentOrInfoHash, selections) {

static/main.css

@@ -615,7 +615,6 @@ body.drag .app::after {
   font-size: 13px;
   margin: 9px 8px 8px 8px;
   opacity: 0.8;
-  font-variant-numeric: tabular-nums;
 }
 
 .player .controls .icon.closed-caption {
@@ -820,17 +819,12 @@ video::-webkit-media-text-track-container {
 
 .audio-metadata label {
   display:inline-block;
-  width: 120px;
+  width: 100px;
   text-align: right;
   font-weight: normal;
   margin-right: 25px;
 }
 
-.audio-metadata .audio-format,
-.audio-metadata .audio-comments {
-  font-weight: normal;
-}
-
 /*
  * ERRORS
  */

test/index.js

@@ -10,7 +10,7 @@ test('app runs', function (t) {
   setup.waitForLoad(app, t)
     .then(() => setup.screenshotCreateOrCompare(app, t, 'app-basic'))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })
 
 require('./test-torrent-list')

test/setup.js

@@ -122,7 +122,7 @@ function compareIgnoringTransparency (bufActual, bufExpected) {
   const de = pngE.data
   for (let y = 0; y < h; y++) {
     for (let x = 0; x < w; x++) {
-      const i = ((y * w) + x) * 4
+      const i = (y * w + x) * 4
       if (de[i + 3] === 0) continue // Skip transparent pixels
       const ca = (da[i] << 16) | (da[i + 1] << 8) | da[i + 2]
       const ce = (de[i] << 16) | (de[i + 1] << 8) | de[i + 2]

test/test-add-torrent.js

@@ -30,7 +30,7 @@ test('add-torrent', function (t) {
     .then(() => app.client.moveToObject('.torrent'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'add-torrent-100-percent'))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })
 
 test('create-torrent', function (t) {
@@ -38,12 +38,11 @@ test('create-torrent', function (t) {
 
   const expectedTorrent = {
     announce: [
-      'udp://explodie.org:6969',
+      'udp://exodus.desync.com:6969',
       'udp://tracker.coppersurfer.tk:6969',
+      'udp://tracker.internetwarriors.net:1337',
       'udp://tracker.leechers-paradise.org:6969',
       'udp://tracker.openbittorrent.com:80',
-      'udp://tracker.opentrackr.org:1337',
-      'udp://zer0day.ch:1337',
       'wss://tracker.btorrent.xyz',
       'wss://tracker.fastcast.nz',
       'wss://tracker.openwebtorrent.com'
@@ -84,5 +83,5 @@ test('create-torrent', function (t) {
       config.SAVED_TORRENT_FILE,
       expectedTorrent))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })

test/test-audio.js

@@ -53,5 +53,5 @@ test('audio-streaming', function (t) {
     .then(() => app.webContents.executeJavaScript('dispatch("skipTo", 2)'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'play-torrent-wired-5'))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })

test/test-select-poster.js

@@ -1,25 +0,0 @@
-const test = require('tape')
-
-const fs = require('fs')
-const path = require('path')
-
-const WebTorrent = require('webtorrent')
-const torrentPoster = require('../build/renderer/lib/torrent-poster')
-
-const client = new WebTorrent()
-
-test("get cover from: 'wiredCd.torrent'", (t) => {
-  const torrentPath = path.join(__dirname, '..', 'static', 'wiredCd.torrent')
-  const torrentData = fs.readFileSync(torrentPath)
-
-  client.add(torrentData, (torrent) => {
-    torrentPoster(torrent, (err, buf, extension) => {
-      if (err) {
-        t.fail(err)
-      } else {
-        t.equals(extension, '.jpg')
-        t.end()
-      }
-    })
-  })
-})

test/test-torrent-list.js

@@ -22,7 +22,7 @@ test('torrent-list: show download path missing', function (t) {
     .then((windowTitle) => t.equal(windowTitle, 'Preferences', 'window title'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'prefs-basic'))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })
 
 test('torrent-list: start, stop, and delete torrents', function (t) {
@@ -54,7 +54,7 @@ test('torrent-list: start, stop, and delete torrents', function (t) {
     .then(() => app.client.click('.control.ok'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-deleted'))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })
 
 test('torrent-list: expand torrent, unselect file', function (t) {
@@ -79,7 +79,7 @@ test('torrent-list: expand torrent, unselect file', function (t) {
     // Make sure that it creates all files EXCEPT the deslected one
     .then(() => setup.compareDownloadFolder(t, 'CosmosLaundromatFirstCycle', [
       // TODO: the .gif should NOT be here, since we just deselected it.
-      // This is a bug. See https://github.com/webtorrent/webtorrent-desktop/issues/719
+      // This is a bug. See https://github.com/feross/webtorrent-desktop/issues/719
       'Cosmos Laundromat - First Cycle (1080p).gif',
       'Cosmos Laundromat - First Cycle (1080p).mp4',
       'Cosmos Laundromat - First Cycle (1080p).ogv',
@@ -101,5 +101,5 @@ test('torrent-list: expand torrent, unselect file', function (t) {
     // Make sure that all the files are gone
     .then(() => setup.compareDownloadFolder(t, 'CosmosLaundromatFirstCycle', null))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })

test/test-video.js

@@ -31,5 +31,5 @@ test('video-streaming', function (t) {
     // Take another screenshot to verify that the window resized correctly
     .then(() => setup.screenshotCreateOrCompare(app, t, 'play-torrent-return'))
     .then(() => setup.endTest(app, t),
-      (err) => setup.endTest(app, t, err || 'error'))
+          (err) => setup.endTest(app, t, err || 'error'))
 })