From 55347a7d59ee7e415401b83d3692719f9dd4fe55 Mon Sep 17 00:00:00 2001
From: renu <renu.yarday@compassitesinc.com>
Date: Wed, 22 Jan 2014 11:00:29 +0530
Subject: [PATCH 1/3] identifying multiple assets in a webpage for html5

---
 youtube_dl/extractor/common.py  | 12 ++++++++++++
 youtube_dl/extractor/generic.py |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 582eb4f5b..0c397fa71 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -312,6 +312,18 @@ class InfoExtractor(object):
         if video_id is not None:
             video_info['id'] = video_id
         return video_info
+
+    @staticmethod
+    def video_result(video_url=None, video_id=None, uploader=None, video_title=None):
+        """Returns a url that points to a page that should be processed"""
+        #TODO: ie should be the class used for getting the info
+        video_info = {'_type': 'video',
+                      'url': video_url,
+                      'id': video_id,
+                      'uploader': uploader,
+                       'title': video_title}
+        return video_info
+
     @staticmethod
     def playlist_result(entries, playlist_id=None, playlist_title=None):
         """Returns a playlist"""
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index e446ed326..6796d9d2f 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -348,7 +348,13 @@ class GenericIE(InfoExtractor):
                 mobj = re.search(r'<meta.*?property="og:video".*?content="(.*?)"', webpage)
         if mobj is None:
             # HTML5 video
-            mobj = re.search(r'<video[^<]*(?:>.*?<source.*?)? src="([^"]+)"', webpage, flags=re.DOTALL)
+            matches = re.findall(r'<video[^<]*(?:>.*?<source.*?)? src="([^"]+)"', webpage, flags=re.DOTALL)
+            if matches:
+                urlrs = [self.video_result(unescapeHTML(tuppl), video_id, video_uploader,video_title)
+                for tuppl in matches]
+                return self.playlist_result(
+                    urlrs, playlist_id=video_id, playlist_title=video_title)
+
         if mobj is None:
             raise ExtractorError('Unsupported URL: %s' % url)
 

From 1b1d6191d2e5b8443e11ec941cbea15907278dbe Mon Sep 17 00:00:00 2001
From: renu <renu.yarday@compassitesinc.com>
Date: Wed, 22 Jan 2014 11:03:59 +0530
Subject: [PATCH 2/3] new line

---
 youtube_dl/extractor/generic.py | 2 +-
 youtube_dl/extractor/youtube.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 6796d9d2f..fa14ea6b4 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -379,4 +379,4 @@ class GenericIE(InfoExtractor):
             'url': video_url,
             'uploader': video_uploader,
             'title': video_title,
-        }
\ No newline at end of file
+        }
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 11921968f..248b30ffb 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -1774,4 +1774,4 @@ class YoutubeTruncatedURLIE(InfoExtractor):
             u'like  youtube-dl '
             u'"http://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '
             u' or simply  youtube-dl BaW_jenozKc  .',
-            expected=True)
\ No newline at end of file
+            expected=True)

From 6961c2a4d9981c4df6e67258e4be9da1ba6e34c9 Mon Sep 17 00:00:00 2001
From: renu <renu.yarday@compassitesinc.com>
Date: Wed, 22 Jan 2014 11:07:19 +0530
Subject: [PATCH 3/3] only required changes

---
 .gitignore                     | 1 -
 youtube_dl/extractor/common.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd7d11f26..37b2fa8d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,3 @@ updates_key.pem
 *.part
 test/testdata
 .tox
-/.idea
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 0c397fa71..eaf2140aa 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -316,7 +316,6 @@ class InfoExtractor(object):
     @staticmethod
     def video_result(video_url=None, video_id=None, uploader=None, video_title=None):
         """Returns a url that points to a page that should be processed"""
-        #TODO: ie should be the class used for getting the info
         video_info = {'_type': 'video',
                       'url': video_url,
                       'id': video_id,