support non-youtube (speificially vimeo) videos. fixes #39

lib/youtube-dl.js

@@ -76,23 +76,21 @@ function call(video, args1, args2, options, callback) {
  var args = args1.concat(util.parseOpts(args2));
  options = options || {};
 
- // Parse url.
- var details = url.parse(video, true);
- var query = details.query;
-
- // Get possible IDs.
- var id = query.v || '';
-
- // Check for long and short youtube video url.
- if (!id && isYouTubeRegex.test(video)) {
- // Get possible IDs for youtu.be from urladdr.
- id = details.pathname.slice(1).replace(/^v\//, '');
- }
-
- if (id === 'playlist') {
- args.push(video);
+ if (isYouTubeRegex.test(video)) {
+ // Get possible IDs.
+ var details = url.parse(video, true);
+ var id = details.query.v || '';
+ if (id) {
+ args.push('http://www.youtube.com/watch?v=' + id);
+ } else {
+ // Get possible IDs for youtu.be from urladdr.
+ id = details.pathname.slice(1).replace(/^v\//, '');
+ if (id === 'playlist') {
+ args.push(video);
+ }
+ }
  } else {
- args.push('http://www.youtube.com/watch?v=' + id);
+ args.push(video);
  }
 
  var opt = [file, args];
@@ -153,7 +151,7 @@ function filterData(data) {
 }
 
 
-var resolutionRegex = /([0-9]+ - ([0-9]+x[0-9]+|\d+p))/;
+var resolutionRegex = /( - ([0-9]+x[0-9]+|\d+p))/;
 
 /**
  * Gets info from a video.

test/getInfo.js

@@ -1,36 +1,52 @@
 var vows = require('vows');
 var ytdl = require('..');
 var assert = require('assert');
-var video = 'http://www.youtube.com/watch?v=90AiXO1pAiA';
 
 
-var expected = {
- title: 'lol',
- id: '90AiXO1pAiA',
- thumbnail: 'https://i1.ytimg.com/vi/90AiXO1pAiA/hqdefault.jpg',
- description: 'Ridley High School\'s real American Bad ASS,A true Delco Savage. Filmed in 2003 before Youtube was invented. This is also the original I find it hilarious that there are copycat videos!',
- filename: 'lol-90AiXO1pAiA.mp4',
- itag: '18',
- resolution: '640x360'
-};
-
 vows.describe('getInfo').addBatch({
- 'from a video': {
+ 'from a youtube video': {
  'topic': function() {
+ var video = 'http://www.youtube.com/watch?v=90AiXO1pAiA';
  ytdl.getInfo(video, ['-f', '18/22/37/38'], this.callback);
  },
 
  'info returned': function(err, info) {
  assert.isNull(err);
  assert.isObject(info);
- assert.equal(info.id, expected.id);
- assert.equal(info.itag, expected.itag);
- assert.equal(info.title, expected.title);
+ assert.equal(info.id, '90AiXO1pAiA');
+ assert.equal(info.itag, '18');
+ assert.equal(info.title, 'lol');
+ assert.isString(info.url);
+ assert.isString(info.thumbnail);
+ assert.equal(info.description,
+ 'Ridley High School\'s real American Bad ASS,A true Delco Savage. ' +
+ 'Filmed in 2003 before Youtube was invented. ' +
+ 'This is also the original I find it hilarious that there ' +
+ 'are copycat videos!');
+ assert.equal(info.filename, 'lol-90AiXO1pAiA.mp4');
+ assert.equal(info.resolution, '640x360');
+ }
+ },
+ 'from a vimeo video': {
+ 'topic': function() {
+ var video = 'https://vimeo.com/6586873';
+ ytdl.getInfo(video, this.callback);
+ },
+
+ 'info returned': function(err, info) {
+ assert.isNull(err);
+ assert.isObject(info);
+ assert.equal(info.id, '6586873');
+ assert.equal(info.title, 'OWEN - good friends, bad habits');
  assert.isString(info.url);
  assert.isString(info.thumbnail);
- assert.equal(info.description, expected.description);
- assert.equal(info.filename, expected.filename);
- assert.equal(info.resolution, expected.resolution);
+ assert.equal(info.description,
+ 'Video for the song "Good Friends, Bad Habits" from the album ' +
+ 'New Leaves. Directed by Joe Wigdahl. Purchase the album here: ' +
+ 'hobbledehoyrecords.com/store');
+ assert.equal(info.filename,
+ 'OWEN - good friends, bad habits-6586873.mp4');
+ assert.equal(info.resolution, '480x272');
  }
  }
 }).export(module);