aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohny Mo Swag <johnymo@me.com>2013-03-07 16:27:21 -0800
committerJohny Mo Swag <johnymo@me.com>2013-03-07 16:27:21 -0800
commit64c78d50ccf05f34e27b652530fc8b702aa54122 (patch)
tree0f7e9c2346803dd1678d1c4fb3ae79e276b4487f
parentb3bcca0844cc8197cbb5e1e8127b1b8164304940 (diff)
working - worldstarhiphop IE
Support for WorldStarHipHop
-rw-r--r--.gitignore2
-rwxr-xr-xyoutube_dl/InfoExtractors.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 77469b8a7..328fed8bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ youtube-dl.tar.gz
cover/
updates_key.pem
*.egg-info
+
+*.flv
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 178b0beed..f69bad4f3 100755
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -3655,7 +3655,7 @@ class UstreamIE(InfoExtractor):
return [info]
class WorldStarHipHopIE(InfoExtractor):
- _VALID_URL = r"""(http://(?:www|m).worldstar(?:candy|hiphop)\.com.*)"""
+ _VALID_URL = r'http://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)'
IE_NAME = u'WorldStarHipHop'
def _real_extract(self, url):
@@ -3686,8 +3686,6 @@ class WorldStarHipHopIE(InfoExtractor):
title = 'World Start Hip Hop - %s' % time.ctime()
_thumbnail = r"""rel="image_src" href="(.*)" />"""
-
- print title
mobj = re.search(_thumbnail, webpage_src)
# Getting thumbnail and if not thumbnail sets correct title for WSHH candy video.
@@ -3700,7 +3698,11 @@ class WorldStarHipHopIE(InfoExtractor):
title = mobj.group(1)
thumbnail = None
+ m = re.match(self._VALID_URL, url)
+ video_id = m.group('id')
+
results = [{
+ 'id': video_id,
'url' : video_url,
'title' : title,
'thumbnail' : thumbnail,