Fix - Incorrect youtube video URL

assume other video sites
przemyslawpluta · Feb 12, 2014 · a5eeb09 · a5eeb09
1 parent 28dd461
commit a5eeb09
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/youtube-dl.js b/lib/youtube-dl.js
@@ -44,17 +44,18 @@ exports.download = function(urladdr, dest, args) {
  args.push(urladdr);
 
  // soft check for youtube video
- var isYouToube = urladdr.match(/(youtube|youtu.be)/), details, query, id;
+ var isYouToube = urladdr.match(/(youtube|youtu.be)/),
+ details = url.parse(urladdr, true),
+ query = details.query,
+ id = query.v;
 
  if (isYouToube) {
- details = url.parse(urladdr, true);
- query = details.query;
  pathname = details.pathname.slice(1);
  // Get possible IDs from urladdr.
- id = query.v || pathname;
+ if (!id) { id = pathname; }
  }
 
- if (!isYouToube || !id) {
+ if (!id) {
  throw new TypeError('Incorrect youtube video URL');
  }