yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 02:09:37 +02:00
Code Issues Releases Wiki Activity

More robust duration parsing

Browse source
This commit is contained in:
Chocobozzz 2022-06-14 08:47:26 +02:00
parent 65ba19ace9
commit c371016de2
No known key found for this signature in database
GPG key ID: 583A612D890159BE
2 changed files with 68 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

37
server/helpers/core-utils.ts
View file

@ -56,6 +56,7 @@ const timeTable = {
export function parseDurationToMs (duration: number | string): number {
if (duration === null) return null
if (typeof duration === 'number') return duration
if (!isNaN(+duration)) return +duration
if (typeof duration === 'string') {
const split = duration.match(/^([\d.,]+)\s?(\w+)$/)
@ -76,6 +77,7 @@ export function parseDurationToMs (duration: number | string): number {
export function parseBytes (value: string | number): number {
if (typeof value === 'number') return value
if (!isNaN(+value)) return +value
const tgm = /^(\d+)\s*TB\s*(\d+)\s*GB\s*(\d+)\s*MB$/
const tg = /^(\d+)\s*TB\s*(\d+)\s*GB$/
@ -85,40 +87,55 @@ export function parseBytes (value: string | number): number {
const g = /^(\d+)\s*GB$/
const m = /^(\d+)\s*MB$/
const b = /^(\d+)\s*B$/
let match
let match: RegExpMatchArray
if (value.match(tgm)) {
match = value.match(tgm)
return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
parseInt(match[2], 10) * 1024 * 1024 * 1024 +
parseInt(match[3], 10) * 1024 * 1024
} else if (value.match(tg)) {
}
if (value.match(tg)) {
match = value.match(tg)
return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
parseInt(match[2], 10) * 1024 * 1024 * 1024
} else if (value.match(tm)) {
}
if (value.match(tm)) {
match = value.match(tm)
return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024 +
parseInt(match[2], 10) * 1024 * 1024
} else if (value.match(gm)) {
}
if (value.match(gm)) {
match = value.match(gm)
return parseInt(match[1], 10) * 1024 * 1024 * 1024 +
parseInt(match[2], 10) * 1024 * 1024
} else if (value.match(t)) {
}
if (value.match(t)) {
match = value.match(t)
return parseInt(match[1], 10) * 1024 * 1024 * 1024 * 1024
} else if (value.match(g)) {
}
if (value.match(g)) {
match = value.match(g)
return parseInt(match[1], 10) * 1024 * 1024 * 1024
} else if (value.match(m)) {
}
if (value.match(m)) {
match = value.match(m)
return parseInt(match[1], 10) * 1024 * 1024
} else if (value.match(b)) {
}
if (value.match(b)) {
match = value.match(b)
return parseInt(match[1], 10) * 1024
} else {
return parseInt(value, 10)
}
return parseInt(value, 10)
}
// ---------------------------------------------------------------------------