Skip to content

Commit e3260b2

Browse files
committed
Use padStart and slice to more properly format the data
Added comment by Justin Frankel on the meaning of H and C
1 parent c19d3ef commit e3260b2

File tree

1 file changed

+17
-11
lines changed

1 file changed

+17
-11
lines changed

packages/webamp/js/reducers/tracks.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,29 @@ export interface TracksState {
77
}
88

99
function massageKhz(khz: number) {
10-
let finalKhz: String = ' 0';
10+
let finalKhz: String = " 0";
1111
let khzNum: number = Math.round(khz / 1000);
12-
if (khzNum != null) finalKhz = String(khzNum);
12+
1313
if (khzNum <= 100) finalKhz = String(khzNum);
14-
if (khzNum <= 10) finalKhz = ' '+String(khzNum).substring(0,1);
15-
if (khzNum >= 100) finalKhz = String(khzNum).substring(1,3);
14+
if (khzNum <= 10) finalKhz = String(khzNum).slice(0, 1).padStart(2, " ");
15+
if (khzNum >= 100) finalKhz = String(khzNum).slice(1, 3);
1616
return finalKhz;
1717
}
1818

1919
function massageKbps(kbps: number) {
20-
let finalKbps: String = ' 0';
21-
let bitrateNum = String(Math.round(kbps / 1000));
22-
if (bitrateNum != null) finalKbps = String(bitrateNum);
23-
if (bitrateNum <= 100) finalKbps = ' '+String(bitrateNum);
24-
if (bitrateNum <= 10) finalKbps = ' '+String(bitrateNum);
25-
if (bitrateNum >= 1000) finalKbps = String(bitrateNum).substring(0,2)+'H'; // if you asked me what this meant
26-
if (bitrateNum >= 10000) finalKbps = ' '+String(bitrateNum).substring(0,1)+'C'; // i wouldnt know what to tell you
20+
let finalKbps: String = " 0";
21+
let bitrateNum: number = Math.round(kbps / 1000);
22+
23+
finalKbps = String(bitrateNum); // present as is
24+
if (bitrateNum <= 100) finalKbps = String(bitrateNum).padStart(3, " ");
25+
if (bitrateNum <= 10) finalKbps = String(bitrateNum).padStart(3, " ");
26+
// from Justin Frankel directly:
27+
// IIRC H was for "hundred" and "C" was thousand,
28+
// though why it was for thousand I have no idea lol, maybe it was a mistake...
29+
if (bitrateNum >= 1000) finalKbps = String(bitrateNum).slice(0, 2) + "H";
30+
if (bitrateNum >= 10000)
31+
finalKbps = String(bitrateNum).slice(0, 1).padStart(2, " ") + "C";
32+
console.log(finalKbps);
2733
return finalKbps;
2834
}
2935

0 commit comments

Comments
 (0)