remove zero fill at the final place

supersede #1583
This commit is contained in:
Jimmy Wärting
2019-08-16 22:27:37 +02:00
parent caceeee238
commit 56f0826928
3 changed files with 8 additions and 15 deletions

5
package-lock.json generated
View File

@@ -10659,11 +10659,6 @@
"fd-slicer": "~1.0.1" "fd-slicer": "~1.0.1"
} }
}, },
"zero-fill": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/zero-fill/-/zero-fill-2.2.3.tgz",
"integrity": "sha1-o97wa6XjmuZEhQu0yirUEStIVek="
},
"zip-stream": { "zip-stream": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",

View File

@@ -47,8 +47,7 @@
"srt-to-vtt": "^1.1.1", "srt-to-vtt": "^1.1.1",
"vlc-command": "^1.0.1", "vlc-command": "^1.0.1",
"webtorrent": "0.x", "webtorrent": "0.x",
"winreg": "^1.2.0", "winreg": "^1.2.0"
"zero-fill": "^2.2.3"
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "^10.0.2", "babel-eslint": "^10.0.2",

View File

@@ -3,7 +3,6 @@
const React = require('react') const React = require('react')
const Bitfield = require('bitfield') const Bitfield = require('bitfield')
const prettyBytes = require('prettier-bytes') const prettyBytes = require('prettier-bytes')
const zeroFill = require('zero-fill')
const TorrentSummary = require('../lib/torrent-summary') const TorrentSummary = require('../lib/torrent-summary')
const Playlist = require('../lib/playlist') const Playlist = require('../lib/playlist')
@@ -758,14 +757,14 @@ function formatTime (time, total) {
return '0:00' return '0:00'
} }
const totalHours = Math.floor(total / 3600) const totalHours = total / 3600 | 0
const totalMinutes = Math.floor(total / 60) const totalMinutes = total / 60 | 0
const hours = Math.floor(time / 3600) const hours = time / 3600 | 0
let minutes = Math.floor(time % 3600 / 60) let minutes = time % 3600 / 60 | 0
if (totalMinutes > 9) { if (totalMinutes > 9 && minutes < 10) {
minutes = zeroFill(2, minutes) minutes = '0' + minutes
} }
const seconds = zeroFill(2, Math.floor(time % 60)) const seconds = `0${time % 60 | 0}`.slice(-2)
return (totalHours > 0 ? hours + ':' : '') + minutes + ':' + seconds return (totalHours > 0 ? hours + ':' : '') + minutes + ':' + seconds
} }