Compare commits
35 Commits
demoneaux/
...
v0.18.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5d0692a56 | ||
|
|
2f4fe3e521 | ||
|
|
4937f61199 | ||
|
|
e74b993ecd | ||
|
|
36be5b2556 | ||
|
|
6a3aaba01f | ||
|
|
c50783d058 | ||
|
|
32b251fa58 | ||
|
|
fcf087810e | ||
|
|
0124412d3d | ||
|
|
dd570d9250 | ||
|
|
64add5d68b | ||
|
|
36a43b645e | ||
|
|
e01c0b6f43 | ||
|
|
efc984f1dd | ||
|
|
a046db40d2 | ||
|
|
9068909b4d | ||
|
|
4bb2056bc9 | ||
|
|
ed0f05abc4 | ||
|
|
0c44e10ca7 | ||
|
|
d8c9014471 | ||
|
|
7cf1d96a80 | ||
|
|
ffd9fbda57 | ||
|
|
d8904aaf6e | ||
|
|
de2db211cc | ||
|
|
e8ab172d1b | ||
|
|
32f96c03dd | ||
|
|
5158606740 | ||
|
|
0de80165ed | ||
|
|
dcaa99d2bf | ||
|
|
1a1a4cd5d0 | ||
|
|
4cbad1fccd | ||
|
|
f818564dd1 | ||
|
|
8be690a26e | ||
|
|
8081d42477 |
2
.github/ISSUE_TEMPLATE.md
vendored
2
.github/ISSUE_TEMPLATE.md
vendored
@@ -1,3 +1,5 @@
|
||||
<!-- 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?**
|
||||
|
||||
74
CHANGELOG.md
74
CHANGELOG.md
@@ -1,5 +1,33 @@
|
||||
# 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
|
||||
@@ -99,16 +127,13 @@
|
||||
## 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)
|
||||
@@ -121,13 +146,11 @@
|
||||
- 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)
|
||||
@@ -136,13 +159,11 @@
|
||||
## 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`.
|
||||
@@ -159,7 +180,6 @@
|
||||
- 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)
|
||||
@@ -167,35 +187,29 @@
|
||||
## 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
|
||||
@@ -203,17 +217,14 @@
|
||||
- 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
|
||||
@@ -221,23 +232,19 @@
|
||||
## 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)
|
||||
@@ -247,7 +254,6 @@
|
||||
- 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
|
||||
@@ -258,7 +264,6 @@
|
||||
- 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.
|
||||
@@ -266,7 +271,6 @@
|
||||
## 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.
|
||||
@@ -278,7 +282,6 @@
|
||||
## 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)
|
||||
@@ -288,7 +291,6 @@
|
||||
- Add announcement feature
|
||||
|
||||
### Changed
|
||||
|
||||
- Nicer player UI
|
||||
- Reduce startup jank, improve startup time (#568)
|
||||
- Cleanup unsupported codec detection (#569, #570)
|
||||
@@ -296,7 +298,6 @@
|
||||
- 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
|
||||
@@ -307,23 +308,19 @@
|
||||
## 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)
|
||||
@@ -332,7 +329,6 @@
|
||||
## v0.4.0 - 2016-05-13
|
||||
|
||||
### Added
|
||||
|
||||
- Better Windows support!
|
||||
- Windows 32-bit build.
|
||||
- Windows Portable App build.
|
||||
@@ -355,7 +351,6 @@
|
||||
- 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.
|
||||
@@ -366,7 +361,6 @@
|
||||
- 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)
|
||||
@@ -391,24 +385,20 @@ 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)
|
||||
@@ -416,17 +406,14 @@ 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)
|
||||
@@ -434,14 +421,12 @@ 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
|
||||
@@ -460,7 +445,6 @@ 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
|
||||
@@ -469,12 +453,10 @@ 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
|
||||
|
||||
@@ -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 with which the app is built (without the leading 'v')
|
||||
version: require('electron/package.json').version
|
||||
// The Electron version that the app is built with (without the leading 'v')
|
||||
electronVersion: require('electron/package.json').version
|
||||
}
|
||||
|
||||
const darwin = {
|
||||
|
||||
24
package.json
24
package.json
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "webtorrent-desktop",
|
||||
"description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
|
||||
"version": "0.17.1",
|
||||
"version": "0.18.0",
|
||||
"author": {
|
||||
"name": "WebTorrent, LLC",
|
||||
"email": "feross@webtorrent.io",
|
||||
@@ -24,13 +24,12 @@
|
||||
"deep-equal": "^1.0.1",
|
||||
"dlnacasts": "^0.1.0",
|
||||
"drag-drop": "^2.12.1",
|
||||
"es6-error": "^3.0.1",
|
||||
"es6-error": "^4.0.0",
|
||||
"fn-getter": "^1.0.0",
|
||||
"iso-639-1": "^1.2.1",
|
||||
"languagedetect": "^1.1.1",
|
||||
"location-history": "^1.0.0",
|
||||
"lodash.merge": "^4.6.0",
|
||||
"material-ui": "^0.15.4",
|
||||
"material-ui": "^0.16.0",
|
||||
"mkdirp": "^0.5.1",
|
||||
"musicmetadata": "^2.0.2",
|
||||
"network-address": "^1.1.0",
|
||||
@@ -38,7 +37,7 @@
|
||||
"prettier-bytes": "^1.0.1",
|
||||
"react": "^15.2.1",
|
||||
"react-dom": "^15.2.1",
|
||||
"react-tap-event-plugin": "^1.0.0",
|
||||
"react-tap-event-plugin": "^2.0.1",
|
||||
"rimraf": "^2.5.2",
|
||||
"run-parallel": "^1.1.6",
|
||||
"semver": "^5.1.0",
|
||||
@@ -51,16 +50,16 @@
|
||||
"zero-fill": "^2.2.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"buble": "^0.14.0",
|
||||
"buble": "^0.15.2",
|
||||
"cross-zip": "^2.0.1",
|
||||
"depcheck": "^0.6.4",
|
||||
"electron": "1.4.2",
|
||||
"electron-osx-sign": "^0.3.0",
|
||||
"electron-packager": "^8.0.0",
|
||||
"electron-winstaller": "^2.3.0",
|
||||
"electron": "1.4.15",
|
||||
"electron-osx-sign": "0.4.3",
|
||||
"electron-packager": "~8.5.1",
|
||||
"electron-winstaller": "~2.5.2",
|
||||
"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,6 +89,7 @@
|
||||
"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,lodash.merge,nodemon,gh-release --ignore-dirs=build,dist && node ./bin/extra-lint.js",
|
||||
"test": "standard && depcheck --ignores=buble,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/"
|
||||
|
||||
@@ -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-2016 ' + APP_TEAM,
|
||||
APP_COPYRIGHT: 'Copyright © 2014-2017 ' + APP_TEAM,
|
||||
APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
|
||||
APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
|
||||
APP_NAME: APP_NAME,
|
||||
|
||||
@@ -278,6 +278,19 @@ 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',
|
||||
@@ -355,7 +368,7 @@ function getMenuTemplate () {
|
||||
})
|
||||
|
||||
// Add Window menu (Mac)
|
||||
template.splice(5, 0, {
|
||||
template.splice(6, 0, {
|
||||
role: 'window',
|
||||
submenu: [
|
||||
{
|
||||
|
||||
@@ -32,16 +32,17 @@ 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)
|
||||
minWidth: config.WINDOW_MIN_WIDTH,
|
||||
minHeight: config.WINDOW_MIN_HEIGHT,
|
||||
minWidth: config.WINDOW_MIN_WIDTH,
|
||||
show: false,
|
||||
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
|
||||
})
|
||||
|
||||
@@ -13,6 +13,7 @@ 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,
|
||||
|
||||
@@ -17,7 +17,8 @@ module.exports = class ModalOKCancel extends React.Component {
|
||||
className='control ok'
|
||||
primary
|
||||
label={okText}
|
||||
onClick={onOK} />
|
||||
onClick={onOK}
|
||||
autoFocus />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
const electron = require('electron')
|
||||
|
||||
const ipcRenderer = electron.ipcRenderer
|
||||
|
||||
const {ipcRenderer} = require('electron')
|
||||
const telemetry = require('../lib/telemetry')
|
||||
const Playlist = require('../lib/playlist')
|
||||
|
||||
// Controls local play back: the <video>/<audio> tag and VLC
|
||||
@@ -12,7 +10,7 @@ module.exports = class MediaController {
|
||||
}
|
||||
|
||||
mediaSuccess () {
|
||||
this.state.playing.result = 'success'
|
||||
telemetry.logPlayAttempt('success')
|
||||
}
|
||||
|
||||
mediaStalled () {
|
||||
@@ -22,7 +20,7 @@ module.exports = class MediaController {
|
||||
mediaError (error) {
|
||||
const state = this.state
|
||||
if (state.location.url() === 'player') {
|
||||
state.playing.result = 'error'
|
||||
telemetry.logPlayAttempt('error')
|
||||
state.playing.location = 'error'
|
||||
ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
|
||||
ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
|
||||
@@ -58,7 +56,10 @@ module.exports = class MediaController {
|
||||
const state = this.state
|
||||
state.playing.location = 'external'
|
||||
|
||||
let open = function () {
|
||||
const onServerRunning = function () {
|
||||
state.playing.isReady = true
|
||||
telemetry.logPlayAttempt('external')
|
||||
|
||||
const mediaURL = Playlist.getCurrentLocalURL(state)
|
||||
ipcRenderer.send('openExternalPlayer',
|
||||
state.saved.prefs.externalPlayerPath,
|
||||
@@ -66,8 +67,8 @@ module.exports = class MediaController {
|
||||
state.window.title)
|
||||
}
|
||||
|
||||
if (state.server != null) open()
|
||||
else ipcRenderer.once('wt-server-running', open)
|
||||
if (state.server != null) onServerRunning()
|
||||
else ipcRenderer.once('wt-server-running', onServerRunning)
|
||||
}
|
||||
|
||||
externalPlayerNotFound () {
|
||||
|
||||
@@ -211,6 +211,7 @@ 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')
|
||||
@@ -222,6 +223,8 @@ 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,
|
||||
@@ -232,6 +235,7 @@ module.exports = class PlaybackController {
|
||||
|
||||
function onTorrentReady () {
|
||||
ipcRenderer.send('wt-start-server', torrentSummary.infoHash)
|
||||
ipcRenderer.once('wt-server-running', () => { state.playing.isReady = true })
|
||||
}
|
||||
}
|
||||
|
||||
@@ -320,12 +324,7 @@ module.exports = class PlaybackController {
|
||||
// Save volume (this session only, not in state.saved)
|
||||
state.previousVolume = state.playing.volume
|
||||
|
||||
// Telemetry: track what happens after the user clicks play
|
||||
const result = state.playing.result // 'success' or 'error'
|
||||
if (result === 'success') telemetry.logPlayAttempt('success') // first frame displayed
|
||||
else if (result === 'error') telemetry.logPlayAttempt('error') // codec missing, etc
|
||||
else if (result === undefined) telemetry.logPlayAttempt('abandoned') // user gave up waiting
|
||||
else console.error('Unknown state.playing.result', state.playing.result)
|
||||
if (!state.playing.isReady) telemetry.logPlayAttempt('abandoned') // user gave up waiting
|
||||
|
||||
// Reset the window contents back to the home screen
|
||||
state.playing = State.getDefaultPlayState()
|
||||
|
||||
@@ -128,6 +128,27 @@ 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]
|
||||
@@ -220,7 +241,8 @@ module.exports = class TorrentListController {
|
||||
|
||||
menu.append(new electron.remote.MenuItem({
|
||||
label: 'Save Torrent File As...',
|
||||
click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey)
|
||||
click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey),
|
||||
enabled: torrentSummary.torrentFileName != null
|
||||
}))
|
||||
|
||||
menu.popup(electron.remote.getCurrentWindow())
|
||||
|
||||
@@ -388,7 +388,8 @@ 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)
|
||||
|
||||
@@ -92,6 +92,7 @@ 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 */
|
||||
|
||||
@@ -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. It either worked, timed out, or showed the
|
||||
// 'Play in VLC' codec error
|
||||
// The user pressed play. Did it work, display an error,
|
||||
// open an external player or did user abandon the attempt?
|
||||
function logPlayAttempt (result) {
|
||||
if (!['success', 'timeout', 'error', 'abandoned'].includes(result)) {
|
||||
if (!['success', 'error', 'external', 'abandoned'].includes(result)) {
|
||||
return console.error('Unknown play attempt result', result)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
/**
|
||||
* 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.
|
||||
@@ -12,7 +8,6 @@
|
||||
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)
|
||||
}
|
||||
@@ -230,6 +225,8 @@ 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) =>
|
||||
@@ -475,8 +472,10 @@ function onError (err) {
|
||||
update()
|
||||
}
|
||||
|
||||
const editableHtmlTags = new Set(['input', 'textarea'])
|
||||
|
||||
function onPaste (e) {
|
||||
if (e.target.tagName.toLowerCase() === 'input') return
|
||||
if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
|
||||
controllers.torrentList().addTorrent(electron.clipboard.readText())
|
||||
|
||||
update()
|
||||
|
||||
@@ -275,9 +275,9 @@ function renderLoadingSpinner (state) {
|
||||
<div key='loading' className='media-stalled'>
|
||||
<div key='loading-spinner' className='loading-spinner'> </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>
|
||||
)
|
||||
@@ -599,12 +599,15 @@ function renderLoadingBar (state) {
|
||||
|
||||
const torrentSummary = state.getPlayingTorrentSummary()
|
||||
if (!torrentSummary.progress) {
|
||||
return []
|
||||
return null
|
||||
}
|
||||
|
||||
// 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++) {
|
||||
@@ -626,6 +629,7 @@ function renderLoadingBar (state) {
|
||||
|
||||
return (<div key={i} className='loading-bar-part' style={style} />)
|
||||
})
|
||||
|
||||
return (<div key='loading-bar' className='loading-bar'>{loadingBarElems}</div>)
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 145 KiB After Width: | Height: | Size: 143 KiB |
@@ -38,11 +38,12 @@ test('create-torrent', function (t) {
|
||||
|
||||
const expectedTorrent = {
|
||||
announce: [
|
||||
'udp://exodus.desync.com:6969',
|
||||
'udp://explodie.org: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'
|
||||
|
||||
Reference in New Issue
Block a user