Skip to content
This repository has been archived by the owner on Dec 3, 2023. It is now read-only.

Commit

Permalink
hms and raw duration
Browse files Browse the repository at this point in the history
  • Loading branch information
przemyslawpluta committed Sep 29, 2017
1 parent 3634c67 commit eb0e9de
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
3 changes: 2 additions & 1 deletion example/info.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ytdl.getInfo(url, function(err, info) {
console.log('description:', info.description);
console.log('filename:', info._filename);
console.log('duration:', info.duration);
console.log('duration_hms:', info.duration_hms);
console.log('raw duration:', info._duration_raw);
console.log('duration hms:', info._duration_hms);
console.log('format_id:', info.format_id);
});
3 changes: 2 additions & 1 deletion lib/youtube-dl.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ function parseInfo(data) {
}
});

info.duration_hms = (info.duration) ? hms.fromS(info.duration, 'hh:mm:ss') : info.duration;
info._duration_raw = info.duration;
info._duration_hms = (info.duration) ? hms.fromS(info.duration, 'hh:mm:ss') : info.duration;
info.duration = (info.duration) ? util.formatDuration(info.duration) : info.duration;

return info;
Expand Down
15 changes: 10 additions & 5 deletions test/getInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ vows.describe('getInfo').addBatch({
'This is also the original I find it hilarious that there are copycat videos!');
assert.equal(info._filename, 'lol-90AiXO1pAiA.mp4');
assert.equal(info.format, '18 - 480x360 (medium)');
assert.equal(info.duration_hms, '00:00:11');
assert.equal(info._duration_raw, 11);
assert.equal(info._duration_hms, '00:00:11');
assert.equal(info.duration, '11');
assert.equal(info.width, 480);
assert.equal(info.height, 360);
Expand Down Expand Up @@ -112,7 +113,8 @@ vows.describe('getInfo').addBatch({
assert.equal(info._filename,
'OWEN - good friends, bad habits-6586873.mp4');
assert.equal(info.format, 'http-360p - 480x272');
assert.equal(info.duration_hms, '00:03:55');
assert.equal(info._duration_raw, 235);
assert.equal(info._duration_hms, '00:03:55');
assert.equal(info.duration, '3:55');
}
},
Expand Down Expand Up @@ -142,7 +144,8 @@ vows.describe('getInfo').addBatch({
assert.equal(info[0]._filename,
'OWEN - good friends, bad habits-6586873.mp4');
assert.equal(info[0].format, 'http-360p - 480x272');
assert.equal(info[0].duration_hms, '00:03:55');
assert.equal(info[0]._duration_raw, 235);
assert.equal(info[0]._duration_hms, '00:03:55');
assert.equal(info[0].duration, '3:55');
assert.equal(info[1].id, '90AiXO1pAiA');
assert.equal(info[1].format_id, '43');
Expand All @@ -155,7 +158,8 @@ vows.describe('getInfo').addBatch({
'This is also the original I find it hilarious that there are copycat videos!');
assert.equal(info[1]._filename, 'lol-90AiXO1pAiA.webm');
assert.equal(info[1].format, '43 - 640x360 (medium)');
assert.equal(info[1].duration_hms, '00:00:11');
assert.equal(info[1]._duration_raw, 11);
assert.equal(info[1]._duration_hms, '00:00:11');
assert.equal(info[1].duration, '11');
assert.equal(info[1].width, 640);
assert.equal(info[1].height, 360);
Expand All @@ -169,7 +173,8 @@ vows.describe('getInfo').addBatch({
assert.equal(info[2]._filename, 'Worlds 2017 Play-In - Rampage vs. 1907 Fenerbahçe Espor-RelentlessOptimisticPterodactylRitzMitz.mp4');
assert.equal(info[2].format, '1080 - 1080p');
assert.equal(info[2].height, 1080);
assert.equal(info[2].duration_hms, undefined);
assert.equal(info[2]._duration_raw, undefined);
assert.equal(info[2]._duration_hms, undefined);
assert.equal(info[2].duration, undefined);
assert.isArray(info[2].formats);
}
Expand Down

0 comments on commit eb0e9de

Please sign in to comment.