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?**

CHANGELOG.md

@@ -1,33 +1,5 @@
 # WebTorrent Desktop Version History
 
-## v0.18.0
-
-### 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
@@ -127,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)
@@ -146,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)
@@ -159,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`.
@@ -180,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)
@@ -187,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
@@ -217,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
@@ -232,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)
@@ -254,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
@@ -264,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.
@@ -271,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.
@@ -282,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)
@@ -291,6 +288,7 @@
 - Add announcement feature
 
 ### Changed
+
 - Nicer player UI
 - Reduce startup jank, improve startup time (#568)
 - Cleanup unsupported codec detection (#569, #570)
@@ -298,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
@@ -308,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)
@@ -329,6 +332,7 @@
 ## v0.4.0 - 2016-05-13
 
 ### Added
+
 - Better Windows support!
   - Windows 32-bit build.
   - Windows Portable App build.
@@ -351,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.
@@ -361,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)
@@ -385,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)
@@ -406,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)
@@ -421,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
@@ -445,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
@@ -453,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

bin/package.js

@@ -89,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,
@@ -104,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')
+  // The Electron version with which the app is built (without the leading 'v')
-  electronVersion: require('electron/package.json').version
+  version: require('electron/package.json').version
 }
 
 const darwin = {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "webtorrent-desktop",
   "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.18.0",
+  "version": "0.17.1",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
@@ -24,12 +24,13 @@
     "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.16.0",
+    "lodash.merge": "^4.6.0",
+    "material-ui": "^0.15.4",
     "mkdirp": "^0.5.1",
     "musicmetadata": "^2.0.2",
     "network-address": "^1.1.0",
@@ -37,7 +38,7 @@
     "prettier-bytes": "^1.0.1",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
-    "react-tap-event-plugin": "^2.0.1",
+    "react-tap-event-plugin": "^1.0.0",
     "rimraf": "^2.5.2",
     "run-parallel": "^1.1.6",
     "semver": "^5.1.0",
@@ -50,16 +51,16 @@
     "zero-fill": "^2.2.3"
   },
   "devDependencies": {
-    "buble": "^0.15.2",
+    "buble": "^0.14.0",
     "cross-zip": "^2.0.1",
     "depcheck": "^0.6.4",
-    "electron": "1.4.15",
+    "electron": "1.4.2",
-    "electron-osx-sign": "0.4.3",
+    "electron-osx-sign": "^0.3.0",
-    "electron-packager": "~8.5.1",
+    "electron-packager": "^8.0.0",
-    "electron-winstaller": "~2.5.2",
+    "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",
@@ -89,7 +90,6 @@
   "optionalDependencies": {
     "appdmg": "^0.4.3"
   },
-  "private": true,
   "productName": "WebTorrent",
   "repository": {
     "type": "git",
@@ -103,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-2017 ' + 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,

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',
@@ -368,7 +355,7 @@ function getMenuTemplate () {
     })
 
     // Add Window menu (Mac)
-    template.splice(6, 0, {
+    template.splice(5, 0, {
       role: 'window',
       submenu: [
         {

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
   })

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}
+          onClick={onOK} />
-          autoFocus />
       </div>
     )
   }

src/renderer/controllers/media-controller.js

@@ -1,5 +1,7 @@
-const {ipcRenderer} = require('electron')
+const electron = require('electron')
-const telemetry = require('../lib/telemetry')
+
+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 () {
+    let open = function () {
-      state.playing.isReady = true
-      telemetry.logPlayAttempt('external')
-
       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()
+    if (state.server != null) open()
-    else ipcRenderer.once('wt-server-running', onServerRunning)
+    else ipcRenderer.once('wt-server-running', open)
   }
 
   externalPlayerNotFound () {

src/renderer/controllers/playback-controller.js

@@ -211,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')
@@ -223,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,
@@ -235,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 })
     }
   }
 
@@ -324,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()

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

@@ -128,27 +128,6 @@ module.exports = class TorrentListController {
     }
   }
 
-  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')
-  }
-
   toggleTorrentFile (infoHash, index) {
     const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
     torrentSummary.selections[index] = !torrentSummary.selections[index]
@@ -203,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({
+    const menuTemplate = [
-      label: 'Remove From List',
+      {
-      click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
+        label: 'Remove From List',
-    }))
+        click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
-
+      },
-    menu.append(new electron.remote.MenuItem({
+      {
-      label: 'Remove Data File',
+        label: 'Remove Data File',
-      click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
+        enabled: torrentStarted,
-    }))
+        click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
-
+      },
-    menu.append(new electron.remote.MenuItem({
+      {
-      type: 'separator'
-    }))
-
-    if (torrentSummary.files) {
-      menu.append(new electron.remote.MenuItem({
-        label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
-        click: () => showItemInFolder(torrentSummary)
-      }))
-      menu.append(new electron.remote.MenuItem({
         type: 'separator'
-      }))
+      },
-    }
+      {
-
+        label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
-    menu.append(new electron.remote.MenuItem({
+        enabled: torrentStarted,
-      label: 'Copy Magnet Link to Clipboard',
+        click: () => showItemInFolder(torrentSummary)
-      click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
+      },
-    }))
+      {
-
+        type: 'separator'
-    menu.append(new electron.remote.MenuItem({
+      },
-      label: 'Copy Instant.io Link to Clipboard',
+      {
-      click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
+        label: 'Copy Magnet Link to Clipboard',
-    }))
+        click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
-
+      },
-    menu.append(new electron.remote.MenuItem({
+      {
-      label: 'Save Torrent File As...',
+        label: 'Copy Instant.io Link to Clipboard',
-      click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey),
+        click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
-      enabled: torrentSummary.torrentFileName != null
+      },
-    }))
+      {
+        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())
   }
 

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/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 */

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,
+// The user pressed play. It either worked, timed out, or showed the
-// open an external player or did user abandon the attempt?
+// '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/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)
 }
@@ -225,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) =>
@@ -472,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

@@ -275,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 className='progress'>{fileProgress}%</span> downloaded,
-        <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
+        <span>↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
-        <span> ↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
+        <span>↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
       </div>
     </div>
   )
@@ -599,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++) {
@@ -629,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>)
 }
 

test/test-add-torrent.js

@@ -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'