Show error details in case it is not a 'NotSupportedError' error.

Report when files are being verified

.github/FUNDING.yml

@@ -1,2 +1 @@
 github: feross
-custom: https://paypal.me/borewit

.gitignore

@@ -2,3 +2,7 @@ node_modules/
 build/
 dist/
 npm-debug.log*
+
+# JetBrains IntelliJ IDEA project files
+.idea
+*.iml

AUTHORS.md

@@ -65,6 +65,9 @@
 - greenkeeper[bot] (23040076+greenkeeper[bot]@users.noreply.github.com)
 - hicom150 (hicom150@gmail.com)
 - Jimmy Wärting (jimmy@warting.se)
+- Julen Garcia Leunda (hicom150@gmail.com)
 - Feross (feross@feross.org)
+- Daniele Debernardi (drebrez@gmail.com)
+- Chandan Chowdary Bhagam (chandandharana@gmail.com)
 
 #### Generated by bin/update-authors.sh.

README.md

@@ -97,7 +97,7 @@ comparing each one to a reference. Why screenshots?
   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.
+the same resolution as a 2018 MacBook Pro 13".
 
 For Windows, you'll need Windows 10 with a 1366x768 screen.
 
@@ -125,6 +125,7 @@ The following optional arguments are available:
 - `--sign` - Sign the application (Mac, Windows)
 - `--package=[type]` - Package single output type.
    - `deb` - Debian package
+   - `rpm` - RedHat package
    - `zip` - Linux zip file
    - `dmg` - Mac disk image
    - `exe` - Windows installer
@@ -141,11 +142,12 @@ The Windows app can be packaged from **any** platform.
 Note: Windows code signing only works from **Windows**, for now.
 
 Note: To package the Windows app from non-Windows platforms,
-[Wine](https://www.winehq.org/) needs to be installed. For example on Mac, first
-install [XQuartz](http://www.xquartz.org/), then run:
+[Wine](https://www.winehq.org/) and [Mono](https://www.mono-project.com/) need
+to be installed. For example on Mac, first install
+[XQuartz](http://www.xquartz.org/), then run:
 
 ```
-brew install wine
+brew install wine mono
 ```
 
 (Requires the [Homebrew](http://brew.sh/) package manager.)
@@ -158,7 +160,11 @@ The Mac app can only be packaged from **macOS**.
 
 The Linux app can be packaged from **any** platform.
 
+If packaging from Mac, install system dependencies with Homebrew by running:
 
+```
+npm run install-system-deps
+```
 #### Recommended readings to start working in the app
 
 Electron (Framework to make native apps for Windows, OSX and Linux in Javascript):

bin/open-config.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
 const { CONFIG_PATH } = require('../src/config')
-const opn = require('opn')
+const open = require('open')
 
-opn(CONFIG_PATH)
+open(CONFIG_PATH)

bin/package.js

@@ -173,8 +173,8 @@ const linux = {
   // Build for Linux.
   platform: 'linux',
 
-  // Build x64 binary onle.
-  arch: 'x64'
+  // Build x64 and arm64 binaries.
+  arch: ['x64', 'arm64']
 
   // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
 }
@@ -485,11 +485,16 @@ function buildLinux (cb) {
 
     const tasks = []
     buildPath.forEach(function (filesPath) {
+      const destArch = filesPath.split('-').pop()
+
       if (argv.package === 'deb' || argv.package === 'all') {
-        tasks.push((cb) => packageDeb(filesPath, cb))
+        tasks.push((cb) => packageDeb(filesPath, destArch, cb))
+      }
+      if (argv.package === 'rpm' || argv.package === 'all') {
+        tasks.push((cb) => packageRpm(filesPath, destArch, cb))
       }
       if (argv.package === 'zip' || argv.package === 'all') {
-        tasks.push((cb) => packageZip(filesPath, cb))
+        tasks.push((cb) => packageZip(filesPath, destArch, cb))
       }
     })
     series(tasks, cb)
@@ -497,50 +502,83 @@ function buildLinux (cb) {
     cb(err)
   })
 
-  function packageDeb (filesPath, cb) {
+  function packageDeb (filesPath, destArch, cb) {
+    // Linux convention for Debian based 'x64' is 'amd64'
+    if (destArch === 'x64') {
+      destArch = 'amd64'
+    }
+
     // Create .deb file for Debian-based platforms
-    console.log('Linux: Creating deb...')
+    console.log(`Linux: Creating ${destArch} deb...`)
 
-    const deb = require('nobin-debian-installer')()
-    const destPath = path.join('/opt', pkg.name)
+    const installer = require('electron-installer-debian')
 
-    deb.pack({
-      package: pkg,
-      info: {
-        arch: 'amd64',
-        targetDir: DIST_PATH,
-        depends: 'gconf2, libgtk2.0-0, libnss3, libxss1',
-        scripts: {
-          postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
-          prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
-        }
-      }
-    }, [{
-      src: ['./**'],
-      dest: destPath,
-      expand: true,
-      cwd: filesPath
-    }, {
-      src: ['./**'],
-      dest: path.join('/usr', 'share'),
-      expand: true,
-      cwd: path.join(config.STATIC_PATH, 'linux', 'share')
-    }], function (err) {
-      if (err) return cb(err)
-      console.log('Linux: Created deb.')
-      cb(null)
-    })
+    const options = {
+      src: filesPath + '/',
+      dest: DIST_PATH,
+      arch: destArch,
+      bin: 'WebTorrent',
+      icon: {
+        '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
+        '256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
+      },
+      categories: ['Network', 'FileTransfer', 'P2P'],
+      mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
+      desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs')
+    }
+
+    installer(options).then(
+      () => {
+        console.log(`Linux: Created ${destArch} deb.`)
+        cb(null)
+      },
+      (err) => cb(err)
+    )
   }
 
-  function packageZip (filesPath, cb) {
+  function packageRpm (filesPath, destArch, cb) {
+    // Linux convention for RedHat based 'x64' is 'x86_64'
+    if (destArch === 'x64') {
+      destArch = 'x86_64'
+    }
+
+    // Create .rpm file for RedHat-based platforms
+    console.log(`Linux: Creating ${destArch} rpm...`)
+
+    const installer = require('electron-installer-redhat')
+
+    const options = {
+      src: filesPath + '/',
+      dest: DIST_PATH,
+      arch: destArch,
+      bin: 'WebTorrent',
+      icon: {
+        '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
+        '256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
+      },
+      categories: ['Network', 'FileTransfer', 'P2P'],
+      mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
+      desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs')
+    }
+
+    installer(options).then(
+      () => {
+        console.log(`Linux: Created ${destArch} rpm.`)
+        cb(null)
+      },
+      (err) => cb(err)
+    )
+  }
+
+  function packageZip (filesPath, destArch, cb) {
     // Create .zip file for Linux
-    console.log('Linux: Creating zip...')
+    console.log(`Linux: Creating ${destArch} zip...`)
 
     const inPath = path.join(DIST_PATH, path.basename(filesPath))
-    const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux.zip')
+    const outPath = path.join(DIST_PATH, `${BUILD_NAME}-linux-${destArch}.zip`)
     zip.zipSync(inPath, outPath)
 
-    console.log('Linux: Created zip.')
+    console.log(`Linux: Created ${destArch} zip.`)
     cb(null)
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "webtorrent-desktop",
   "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "author": {
     "name": "WebTorrent, LLC",
     "email": "feross@webtorrent.io",
@@ -11,7 +11,7 @@
     "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
   },
   "dependencies": {
-    "airplayer": "^2.0.0",
+    "airplayer": "github:webtorrent/airplayer#fix-security",
     "application-config": "^1.0.1",
     "arch": "^2.1.1",
     "auto-launch": "^5.0.5",
@@ -19,8 +19,7 @@
     "capture-frame": "^3.0.0",
     "chokidar": "^3.0.2",
     "chromecasts": "^1.9.1",
-    "cp-file": "^7.0.0",
-    "create-torrent": "^4.3.1",
+    "create-torrent": "^4.4.1",
     "debounce": "^1.2.0",
     "deep-equal": "^1.1.0",
     "dlnacasts": "^0.1.0",
@@ -32,9 +31,8 @@
     "location-history": "^1.1.1",
     "material-ui": "^0.20.2",
     "mkdirp": "^0.5.1",
-    "music-metadata": "^4.5.0",
+    "music-metadata": "^4.5.3",
     "network-address": "^1.1.2",
-    "nobin-debian-installer": "github:webtorrent/nobin-debian-installer",
     "parse-torrent": "^7.0.1",
     "prettier-bytes": "^1.0.4",
     "prop-types": "^15.7.2",
@@ -47,7 +45,7 @@
     "simple-get": "^3.0.3",
     "srt-to-vtt": "^1.1.3",
     "vlc-command": "^1.2.0",
-    "webtorrent": ">=0.107.7",
+    "webtorrent": ">=0.107.16",
     "winreg": "^1.2.4"
   },
   "devDependencies": {
@@ -55,14 +53,14 @@
     "buble": "^0.19.8",
     "cross-zip": "^2.1.6",
     "depcheck": "^0.8.3",
-    "electron": "~6.0.7",
-    "electron-osx-sign": "^0.4.12",
-    "electron-packager": "^14.0.5",
+    "electron": "~6.0.9",
+    "electron-osx-sign": "^0.4.13",
+    "electron-packager": "^14.0.6",
     "electron-winstaller": "^4.0.0",
     "gh-release": "^3.5.0",
     "minimist": "^1.2.0",
     "nodemon": "^1.19.2",
-    "opn": "^6.0.0",
+    "open": "^6.4.0",
     "plist": "^3.0.1",
     "pngjs": "^3.4.0",
     "run-series": "^1.1.8",
@@ -88,7 +86,9 @@
   "license": "MIT",
   "main": "index.js",
   "optionalDependencies": {
-    "appdmg": "^0.6.0"
+    "appdmg": "^0.6.0",
+    "electron-installer-debian": "^2.0.0",
+    "electron-installer-redhat": "^2.0.0"
   },
   "private": true,
   "productName": "WebTorrent",
@@ -97,12 +97,12 @@
     "url": "git://github.com/webtorrent/webtorrent-desktop.git"
   },
   "scripts": {
-    "build": "buble src --output build",
+    "build": "buble src --target chrome:71 --output build",
     "clean": "node ./bin/clean.js",
     "gh-release": "gh-release",
+    "install-system-deps": "brew install fakeroot dpkg rpm",
     "open-config": "node ./bin/open-config.js",
     "package": "node ./bin/package.js",
-    "prepublish": "npm run build",
     "start": "npm run build && electron .",
     "test": "standard && depcheck --ignores=standard,babel-eslint --ignore-dirs=build,dist && node ./bin/extra-lint.js",
     "test-integration": "npm run build && node ./test",

src/config.js

@@ -73,8 +73,10 @@ module.exports = {
   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_RELEASES: 'https://github.com/webtorrent/webtorrent-desktop/releases',
 
   HOME_PAGE_URL: 'https://webtorrent.io',
+  TWITTER_PAGE_URL: 'https://twitter.com/WebTorrentApp',
 
   IS_PORTABLE: IS_PORTABLE,
   IS_PRODUCTION: IS_PRODUCTION,

src/main/handlers.js

@@ -12,8 +12,6 @@ function install () {
       break
     case 'win32': installWin32()
       break
-    case 'linux': installLinux()
-      break
   }
 }
 
@@ -23,8 +21,6 @@ function uninstall () {
       break
     case 'win32': uninstallWin32()
       break
-    case 'linux': uninstallLinux()
-      break
   }
 }
 
@@ -269,100 +265,3 @@ function uninstallWin32 () {
 function commandToArgs (command) {
   return command.map((arg) => `"${arg}"`).join(' ')
 }
-
-function installLinux () {
-  const fs = require('fs')
-  const os = require('os')
-  const path = require('path')
-
-  const config = require('../config')
-  const log = require('./log')
-
-  // Do not install in user dir if running on system
-  if (/^\/opt/.test(process.execPath)) return
-
-  installDesktopFile()
-  installIconFile()
-
-  function installDesktopFile () {
-    const templatePath = path.join(
-      config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
-    )
-    fs.readFile(templatePath, 'utf8', writeDesktopFile)
-  }
-
-  function writeDesktopFile (err, desktopFile) {
-    if (err) return log.error(err.message)
-
-    const appPath = config.IS_PRODUCTION
-      ? path.dirname(process.execPath)
-      : config.ROOT_PATH
-
-    desktopFile = desktopFile
-      .replace(/\$APP_NAME/g, config.APP_NAME)
-      .replace(/\$APP_PATH/g, appPath)
-      .replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
-      .replace(/\$TRY_EXEC_PATH/g, process.execPath)
-
-    const desktopFilePath = path.join(
-      os.homedir(),
-      '.local',
-      'share',
-      'applications',
-      'webtorrent-desktop.desktop'
-    )
-    fs.mkdirp(path.dirname(desktopFilePath))
-    fs.writeFile(desktopFilePath, desktopFile, err => {
-      if (err) return log.error(err.message)
-    })
-  }
-
-  function installIconFile () {
-    const iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
-    fs.readFile(iconStaticPath, writeIconFile)
-  }
-
-  function writeIconFile (err, iconFile) {
-    if (err) return log.error(err.message)
-
-    const mkdirp = require('mkdirp')
-
-    const iconFilePath = path.join(
-      os.homedir(),
-      '.local',
-      'share',
-      'icons',
-      'webtorrent-desktop.png'
-    )
-    mkdirp(path.dirname(iconFilePath), err => {
-      if (err) return log.error(err.message)
-      fs.writeFile(iconFilePath, iconFile, err => {
-        if (err) log.error(err.message)
-      })
-    })
-  }
-}
-
-function uninstallLinux () {
-  const os = require('os')
-  const path = require('path')
-  const rimraf = require('rimraf')
-
-  const desktopFilePath = path.join(
-    os.homedir(),
-    '.local',
-    'share',
-    'applications',
-    'webtorrent-desktop.desktop'
-  )
-  rimraf.sync(desktopFilePath)
-
-  const iconFilePath = path.join(
-    os.homedir(),
-    '.local',
-    'share',
-    'icons',
-    'webtorrent-desktop.png'
-  )
-  rimraf.sync(iconFilePath)
-}

src/main/menu.js

@@ -302,6 +302,13 @@ function getMenuTemplate () {
             shell.openExternal(config.HOME_PAGE_URL)
           }
         },
+        {
+          label: 'Release Notes',
+          click: () => {
+            const shell = require('./shell')
+            shell.openExternal(config.GITHUB_URL_RELEASES)
+          }
+        },
         {
           label: 'Contribute on GitHub',
           click: () => {
@@ -318,6 +325,13 @@ function getMenuTemplate () {
             const shell = require('./shell')
             shell.openExternal(config.GITHUB_URL_ISSUES)
           }
+        },
+        {
+          label: 'Follow us on Twitter',
+          click: () => {
+            const shell = require('./shell')
+            shell.openExternal(config.TWITTER_PAGE_URL)
+          }
         }
       ]
     }

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

@@ -1,8 +1,10 @@
 const React = require('react')
 const TextField = require('material-ui/TextField').default
+const { clipboard } = require('electron')
 
 const ModalOKCancel = require('./modal-ok-cancel')
 const { dispatch, dispatcher } = require('../lib/dispatcher')
+const { isMagnetLink } = require('../lib/torrent-player')
 
 module.exports = class OpenTorrentAddressModal extends React.Component {
   render () {
@@ -30,6 +32,12 @@ module.exports = class OpenTorrentAddressModal extends React.Component {
 
   componentDidMount () {
     this.torrentURL.input.focus()
+    const clipboardContent = clipboard.readText()
+
+    if (isMagnetLink(clipboardContent)) {
+      this.torrentURL.input.value = clipboardContent
+      this.torrentURL.input.select()
+    }
   }
 }
 

src/renderer/components/path-selector.js

@@ -32,7 +32,7 @@ class PathSelector extends React.Component {
 
   handleClick () {
     const opts = Object.assign({
-      defaultPath: this.props.value && path.dirname(this.props.value),
+      defaultPath: path.dirname(this.props.value || ''),
       properties: ['openFile', 'openDirectory']
     }, this.props.dialog)
 

src/renderer/controllers/torrent-controller.js

@@ -10,7 +10,7 @@ module.exports = class TorrentController {
     this.state = state
   }
 
-  torrentInfoHash (torrentKey, infoHash) {
+  torrentParsed (torrentKey, infoHash, magnetURI) {
     let torrentSummary = this.getTorrentSummary(torrentKey)
     console.log('got infohash for %s torrent %s',
       torrentSummary ? 'existing' : 'new', torrentKey)
@@ -33,6 +33,7 @@ module.exports = class TorrentController {
     }
 
     torrentSummary.infoHash = infoHash
+    torrentSummary.magnetURI = magnetURI
     dispatch('update')
   }
 
@@ -62,7 +63,6 @@ module.exports = class TorrentController {
     torrentSummary.status = 'downloading'
     torrentSummary.name = torrentSummary.displayName || torrentInfo.name
     torrentSummary.path = torrentInfo.path
-    torrentSummary.magnetURI = torrentInfo.magnetURI
     // TODO: make torrentInfo immutable, save separately as torrentSummary.info
     // For now, check whether torrentSummary.files has already been set:
     const hasDetailedFileInfo = torrentSummary.files && torrentSummary.files[0].path

src/renderer/lib/migrations.js

@@ -29,13 +29,14 @@ function run (state) {
   if (semver.lt(version, '0.17.0')) migrate_0_17_0(saved)
   if (semver.lt(version, '0.17.2')) migrate_0_17_2(saved)
   if (semver.lt(version, '0.21.0')) migrate_0_21_0(saved)
+  if (semver.lt(version, '0.21.1')) migrate_0_21_1(saved)
 
   // Config is now on the new version
   state.saved.version = config.APP_VERSION
 }
 
 function migrate_0_7_0 (saved) {
-  const cpFile = require('cp-file')
+  const { copyFileSync } = require('fs')
   const path = require('path')
 
   saved.torrents.forEach(function (ts) {
@@ -57,7 +58,7 @@ function migrate_0_7_0 (saved) {
       dst = path.join(config.TORRENT_PATH, infoHash + '.torrent')
       // Synchronous FS calls aren't ideal, but probably OK in a migration
       // that only runs once
-      if (src !== dst) cpFile.sync(src, dst)
+      if (src !== dst) copyFileSync(src, dst)
 
       delete ts.torrentPath
       ts.torrentFileName = infoHash + '.torrent'
@@ -72,7 +73,7 @@ function migrate_0_7_0 (saved) {
       dst = path.join(config.POSTER_PATH, infoHash + extension)
       // Synchronous FS calls aren't ideal, but probably OK in a migration
       // that only runs once
-      if (src !== dst) cpFile.sync(src, dst)
+      if (src !== dst) copyFileSync(src, dst)
 
       delete ts.posterURL
       ts.posterFileName = infoHash + extension
@@ -156,7 +157,7 @@ function migrate_0_17_2 (saved) {
   // 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
 
-  const cpFile = require('cp-file')
+  const { copyFileSync } = require('fs')
   const rimraf = require('rimraf')
 
   const OLD_NAME = 'The WIRED CD - Rip. Sample. Mash. Share.'
@@ -191,7 +192,7 @@ function migrate_0_17_2 (saved) {
   ts.posterFileName = NEW_HASH + '.jpg'
 
   rimraf.sync(path.join(config.TORRENT_PATH, ts.torrentFileName))
-  cpFile.sync(
+  copyFileSync(
     path.join(config.STATIC_PATH, 'wiredCd.torrent'),
     path.join(config.TORRENT_PATH, NEW_HASH + '.torrent')
   )
@@ -214,3 +215,9 @@ function migrate_0_21_0 (saved) {
     saved.prefs.soundNotifications = true
   }
 }
+
+function migrate_0_21_1 (saved) {
+  if (saved.prefs.externalPlayerPath == null) {
+    saved.prefs.externalPlayerPath = ''
+  }
+}

src/renderer/lib/state.js

@@ -110,9 +110,8 @@ function getDefaultPlayState () {
 }
 
 /* If the saved state file doesn't exist yet, here's what we use instead */
-function setupStateSaved (cb) {
-  const cpFile = require('cp-file')
-  const fs = require('fs')
+function setupStateSaved () {
+  const { copyFileSync, mkdirSync, readFileSync } = require('fs')
   const parseTorrent = require('parse-torrent')
 
   const saved = {
@@ -120,7 +119,7 @@ function setupStateSaved (cb) {
       downloadPath: config.DEFAULT_DOWNLOAD_PATH,
       isFileHandler: false,
       openExternalPlayer: false,
-      externalPlayerPath: null,
+      externalPlayerPath: '',
       startup: false,
       soundNotifications: true,
       autoAddTorrents: false,
@@ -132,31 +131,28 @@ function setupStateSaved (cb) {
     version: config.APP_VERSION /* make sure we can upgrade gracefully later */
   }
 
-  const tasks = []
+  // TODO: Doing several sync calls during first startup is not ideal
+  mkdirSync(config.POSTER_PATH, { recursive: true })
+  mkdirSync(config.TORRENT_PATH, { recursive: true })
 
   config.DEFAULT_TORRENTS.forEach((t, i) => {
     const infoHash = saved.torrents[i].infoHash
-    tasks.push(
-      cpFile(
-        path.join(config.STATIC_PATH, t.posterFileName),
-        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
-      )
+    // TODO: Doing several sync calls during first startup is not ideal
+    copyFileSync(
+      path.join(config.STATIC_PATH, t.posterFileName),
+      path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
     )
-    tasks.push(
-      cpFile(
-        path.join(config.STATIC_PATH, t.torrentFileName),
-        path.join(config.TORRENT_PATH, infoHash + '.torrent')
-      )
+    copyFileSync(
+      path.join(config.STATIC_PATH, t.torrentFileName),
+      path.join(config.TORRENT_PATH, infoHash + '.torrent')
     )
   })
 
-  Promise.all(tasks)
-    .then(() => cb(null, saved))
-    .catch(err => cb(err))
+  return saved
 
   function createTorrentObject (t) {
-    // TODO: Doing several fs.readFileSync calls during first startup is not ideal
-    const torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
+    // TODO: Doing several sync calls during first startup is not ideal
+    const torrent = readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
     const parsedTorrent = parseTorrent(torrent)
 
     return {
@@ -205,10 +201,14 @@ function load (cb) {
   appConfig.read(function (err, saved) {
     if (err || !saved.version) {
       console.log('Missing config file: Creating new one')
-      setupStateSaved(onSavedState)
-    } else {
-      onSavedState(null, saved)
+      try {
+        saved = setupStateSaved()
+      } catch (err) {
+        onSavedState(err)
+        return
+      }
     }
+    onSavedState(null, saved)
   })
 
   function onSavedState (err, saved) {

src/renderer/lib/torrent-player.js

@@ -3,6 +3,7 @@ module.exports = {
   isVideo,
   isAudio,
   isTorrent,
+  isMagnetLink,
   isPlayableTorrentSummary
 }
 
@@ -31,9 +32,15 @@ function isAudio (file) {
 // - a file object where obj.name is ends in .torrent
 // - a string that's a magnet link (magnet://...)
 function isTorrent (file) {
-  const isTorrentFile = getFileExtension(file) === '.torrent'
-  const isMagnet = typeof file === 'string' && /^(stream-)?magnet:/.test(file)
-  return isTorrentFile || isMagnet
+  return isTorrentFile(file) || isMagnetLink(file)
+}
+
+function isTorrentFile (file) {
+  return getFileExtension(file) === '.torrent'
+}
+
+function isMagnetLink (link) {
+  return typeof link === 'string' && /^(stream-)?magnet:/.test(link)
 }
 
 function getFileExtension (file) {

src/renderer/main.js

@@ -360,7 +360,7 @@ function setupIpc () {
   ipcRenderer.on('windowBoundsChanged', onWindowBoundsChanged)
 
   const tc = controllers.torrent()
-  ipcRenderer.on('wt-infohash', (e, ...args) => tc.torrentInfoHash(...args))
+  ipcRenderer.on('wt-parsed', (e, ...args) => tc.torrentParsed(...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())

src/renderer/pages/player-page.js

@@ -1,5 +1,3 @@
-/* global HTMLMediaElement */
-
 const React = require('react')
 const Bitfield = require('bitfield')
 const prettyBytes = require('prettier-bytes')
@@ -56,6 +54,10 @@ function renderMedia (state) {
       mediaElement.pause()
     } else if (!state.playing.isPaused && mediaElement.paused) {
       mediaElement.play()
+        .then(
+          () => dispatch('mediaSuccess'),
+          err => dispatch('mediaError', err.name === 'NotSupportedError' ? 'Codec unsupported' : `${err.name}: ${err.message}`)
+        )
     }
     // When the user clicks or drags on the progress bar, jump to that position
     if (state.playing.jumpToTime != null) {
@@ -127,10 +129,8 @@ function renderMedia (state) {
       onLoadedMetadata={onLoadedMetadata}
       onEnded={onEnded}
       onStalled={dispatcher('mediaStalled')}
-      onError={dispatcher('mediaError')}
       onTimeUpdate={dispatcher('mediaTimeUpdate')}
       onEncrypted={dispatcher('mediaEncrypted')}
-      onCanPlay={onCanPlay}
     >
       {trackTags}
     </MediaTagName>
@@ -168,20 +168,6 @@ function renderMedia (state) {
       if (state.window.isFullScreen) dispatch('toggleFullScreen')
     }
   }
-
-  function onCanPlay (e) {
-    const elem = e.target
-    if (elem.readyState < HTMLMediaElement.HAVE_FUTURE_DATA) return
-    if (state.playing.type === 'video' &&
-      elem.webkitVideoDecodedByteCount === 0) {
-      dispatch('mediaError', 'Video codec unsupported')
-    } else if (elem.webkitAudioDecodedByteCount === 0) {
-      dispatch('mediaError', 'Audio codec unsupported')
-    } else {
-      dispatch('mediaSuccess')
-      elem.play()
-    }
-  }
 }
 
 function renderOverlay (state) {

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

@@ -212,7 +212,9 @@ module.exports = class TorrentList extends React.Component {
         else if (torrentSummary.progress.progress === 1) status = 'Not seeding'
         else status = 'Paused'
       } else if (torrentSummary.status === 'downloading') {
-        status = 'Downloading'
+        if (!torrentSummary.progress) status = ''
+        else if (!torrentSummary.progress.ready) status = 'Verifying'
+        else status = 'Downloading'
       } else if (torrentSummary.status === 'seeding') {
         status = 'Seeding'
       } else { // torrentSummary.status is 'new' or something unexpected
@@ -316,7 +318,7 @@ module.exports = class TorrentList extends React.Component {
         torrentSummary.progress.files[index]) {
       const fileProg = torrentSummary.progress.files[index]
       isDone = fileProg.numPiecesPresent === fileProg.numPieces
-      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+      progress = Math.floor(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
     }
 
     // Second, for media files where we saved our position, show how far we got

src/renderer/webtorrent.js

@@ -147,7 +147,7 @@ function addTorrentEvents (torrent) {
   torrent.on('error', (err) =>
     ipc.send('wt-error', torrent.key, err.message))
   torrent.on('infoHash', () =>
-    ipc.send('wt-infohash', torrent.key, torrent.infoHash))
+    ipc.send('wt-parsed', torrent.key, torrent.infoHash, torrent.magnetURI))
   torrent.on('metadata', torrentMetadata)
   torrent.on('ready', torrentReady)
   torrent.on('done', torrentDone)
@@ -358,11 +358,15 @@ function getAudioMetadata (infoHash, index) {
     : mm.parseStream(file.createReadStream(), file.name, options)
 
   onMetaData
-    .then(() => {
-      console.log(`metadata for file='${file.name}' completed.`)
-    }).catch(function (err) {
-      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-    })
+    .then(
+      () => console.log(`metadata for file='${file.name}' completed.`),
+      err => {
+        console.log(
+          `error getting audio metadata for ${infoHash}:${index}`,
+          err
+        )
+      }
+    )
 }
 
 function selectFiles (torrentOrInfoHash, selections) {

static/linux/postinst

@@ -1,4 +0,0 @@
-#!/bin/sh
-set -e
-chmod +x /opt/webtorrent-desktop/WebTorrent
-ln -s -f /opt/webtorrent-desktop/WebTorrent /usr/bin/webtorrent-desktop

static/linux/prerm

@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-rm /usr/bin/webtorrent-desktop

static/linux/webtorrent-desktop.desktop

@@ -1,29 +0,0 @@
-[Desktop Entry]
-Name=$APP_NAME
-Version=1.0
-GenericName=BitTorrent Client
-X-GNOME-FullName=$APP_NAME
-Comment=Download and share files over BitTorrent
-Type=Application
-Icon=webtorrent-desktop
-Terminal=false
-Path=$APP_PATH
-Exec=$EXEC_PATH %U
-TryExec=$TRY_EXEC_PATH
-StartupNotify=false
-Categories=Network;FileTransfer;P2P;
-MimeType=application/x-bittorrent;x-scheme-handler/magnet;x-scheme-handler/stream-magnet;
-
-Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
-
-[Desktop Action CreateNewTorrent]
-Name=Create New Torrent...
-Exec=$EXEC_PATH -n
-
-[Desktop Action OpenTorrentFile]
-Name=Open Torrent File...
-Exec=$EXEC_PATH -o
-
-[Desktop Action OpenTorrentAddress]
-Name=Open Torrent Address...
-Exec=$EXEC_PATH -u

static/linux/webtorrent-desktop.ejs

@@ -0,0 +1,26 @@
+[Desktop Entry]
+Type=Application
+<% if (version) { %>Version=<%= version %><% } %>
+Name=<%= productName %>
+<% if (genericName) { %>GenericName=<%= genericName %><% } %>
+<% if (description) { %>Comment=<%= description %><% } %>
+Icon=<%= name %>
+<% if (name) { %>Exec=<%= name %> %U<% } %>
+Terminal=false
+Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
+<% if (mimeType && mimeType.length) { %>MimeType=<%= mimeType.join(';') %>;<% } %>
+<% if (categories && categories.length) { %>Categories=<%= categories.join(';') %>;<% } %>
+StartupNotify=true
+<% if (name) { %>StartupWMClass=<%= name %> <% } %>
+
+[Desktop Action CreateNewTorrent]
+Name=Create New Torrent...
+<% if (name) { %>Exec=<%= name %> -n <% } %>
+
+[Desktop Action OpenTorrentFile]
+Name=Open Torrent File...
+<% if (name) { %>Exec=<%= name %> -o <% } %>
+
+[Desktop Action OpenTorrentAddress]
+Name=Open Torrent Address...
+<% if (name) { %>Exec=<%= name %> -u <% } %>

test/setup.js

@@ -1,5 +1,5 @@
 const Application = require('spectron').Application
-const cpFile = require('cp-file')
+const { copyFileSync } = require('fs')
 const fs = require('fs')
 const mkdirp = require('mkdirp')
 const parseTorrent = require('parse-torrent')
@@ -221,7 +221,7 @@ function extractImportantFields (parsedTorrent) {
 
 function copy (pathFrom, pathTo) {
   try {
-    cpFile.sync(pathFrom, pathTo)
+    copyFileSync(pathFrom, pathTo)
   } catch (err) {
     // Windows lets us create files and folders under C:\Windows\Temp,
     // but when you try to `copySync` into one of those folders, you get EPERM

test/test-add-torrent.js

@@ -47,10 +47,8 @@ test('create-torrent', function (t) {
       'wss://tracker.fastcast.nz',
       'wss://tracker.openwebtorrent.com'
     ],
-    comment: undefined,
-    infoHash: '4b087858a32e31a0d313b5f9e0a2e13c08c5403f',
+    infoHash: 'b31a80b3dd807c2fdde4c4da1a0db6123fa35883',
     name: 'tmp.jpg',
-    private: false,
     urlList: []
   }