From ccdeeadc4918c1882815b3272ad226cc8d8bc495 Mon Sep 17 00:00:00 2001
From: Mort Yao <mort.yao@gmail.com>
Date: Thu, 20 Dec 2012 03:30:52 +0100
Subject: [PATCH] YouTube: quick dirty fix to #45

---
 CHANGELOG.txt                 |  7 +++++++
 you_get/downloader/youtube.py | 11 +++++++++--
 you_get/version.py            |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8d57588d..ddb2fb9a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+0.3dev-20121220
+---------------
+
+*Date: 2012-12-20*
+
+* YouTube: quick dirty fix to `#45 <https://github.com/soimort/you-get/issues/45>`_.
+
 0.3dev-20121219
 ---------------
 
diff --git a/you_get/downloader/youtube.py b/you_get/downloader/youtube.py
index 43afd370..794e27cc 100644
--- a/you_get/downloader/youtube.py
+++ b/you_get/downloader/youtube.py
@@ -30,12 +30,19 @@ def youtube_download_by_id(id, title = None, output_dir = '.', merge = True, inf
         '17',
         '13',
     ]:
-        fmt = r1(r'itag=' + itag + r'\\u0026([^,]+),', html)
+        fmt = r1(r'url=([^,]+)\\u0026itag=' + itag + ",", html)
         if fmt:
-            url = r1(r'url=([^\\]+)\\u0026', fmt)
+            url = r1(r'([^\\]+)\\u0026', fmt)
+            if not url:
+                continue
+            
             url = unicodize(url)
             url = parse.unquote(url)
+            
             sig = r1(r'sig=([^\\]+)\\u0026', fmt)
+            if not sig:
+                continue
+            
             url = url + '&signature=' + sig
             break
     try:
diff --git a/you_get/version.py b/you_get/version.py
index ac5b81b9..be2465d0 100644
--- a/you_get/version.py
+++ b/you_get/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
-__version__ = '0.3dev-20121219'
-__date__ = '2012-12-19'
+__version__ = '0.3dev-20121220'
+__date__ = '2012-12-20'