Merge branch 'master' into fix_codec_unsupported_detection
This commit is contained in:
1
.github/FUNDING.yml
vendored
1
.github/FUNDING.yml
vendored
@@ -1,2 +1 @@
|
||||
github: feross
|
||||
custom: https://paypal.me/borewit
|
||||
|
||||
@@ -142,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.)
|
||||
@@ -164,7 +165,6 @@ 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):
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user