diff --git a/lib/youtube-dl.js b/lib/youtube-dl.js index 640c96e..2b9ee25 100644 --- a/lib/youtube-dl.js +++ b/lib/youtube-dl.js @@ -130,7 +130,7 @@ function filterData(data) { } -var resolutionRegex = /([0-9]+ - [0-9]+x[0-9]+)/; +var resolutionRegex = /([0-9]+ - ([0-9]+x[0-9]+|\d+p))/; /** * Gets info from a video. @@ -181,7 +181,7 @@ ytdl.getInfo = function(url, args, options, callback) { }; -var formatsRegex = /^(\d+)\s+([a-z0-9]+)\s+(\d+x\d+|d+p|audio only)/; +var formatsRegex = /^(\d+)\s+([a-z0-9]+)\s+(\d+x\d+|\d+p|audio only)/; /** * @param {String} url diff --git a/test/getFormat.js b/test/getFormat.js index 9aca554..9673a9b 100644 --- a/test/getFormat.js +++ b/test/getFormat.js @@ -7,6 +7,13 @@ var video = 'http://www.youtube.com/watch?v=0k2Zzkw_-0I'; var expected = [ { id: '0k2Zzkw_-0I', itag: 171, filetype: 'webm', resolution: 'audio only' }, { id: '0k2Zzkw_-0I', itag: 140, filetype: 'm4a', resolution: 'audio only' }, + { id: '0k2Zzkw_-0I', itag: 160, filetype: 'mp4', resolution: '144p' }, + { id: '0k2Zzkw_-0I', itag: 242, filetype: 'webm', resolution: '240p' }, + { id: '0k2Zzkw_-0I', itag: 133, filetype: 'mp4', resolution: '240p' }, + { id: '0k2Zzkw_-0I', itag: 243, filetype: 'webm', resolution: '360p' }, + { id: '0k2Zzkw_-0I', itag: 134, filetype: 'mp4', resolution: '360p' }, + { id: '0k2Zzkw_-0I', itag: 244, filetype: 'webm', resolution: '480p' }, + { id: '0k2Zzkw_-0I', itag: 135, filetype: 'mp4', resolution: '480p' }, { id: '0k2Zzkw_-0I', itag: 17, filetype: '3gp', resolution: '176x144' }, { id: '0k2Zzkw_-0I', itag: 36, filetype: '3gp', resolution: '320x240' }, { id: '0k2Zzkw_-0I', itag: 5, filetype: 'flv', resolution: '400x240' },