From 7198063d96003050eccb0ea59cc938f0388c0606 Mon Sep 17 00:00:00 2001
From: Mister Hat <misterhat144@gmail.com>
Date: Sun, 24 May 2015 15:26:59 -0500
Subject: [PATCH 1/3] [pinkbike] new extractor
---
youtube_dl/extractor/__init__.py | 1 +
youtube_dl/extractor/pinkbike.py | 78 ++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+)
create mode 100644 youtube_dl/extractor/pinkbike.py
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py
index 79bcd91066..80bec39da1 100644
--- a/youtube_dl/extractor/__init__.py
+++ b/youtube_dl/extractor/__init__.py
@@ -394,6 +394,7 @@ from .pbs import PBSIE
from .philharmoniedeparis import PhilharmonieDeParisIE
from .phoenix import PhoenixIE
from .photobucket import PhotobucketIE
+from .pinkbike import PinkbikeIE
from .planetaplay import PlanetaPlayIE
from .pladform import PladformIE
from .played import PlayedIE
diff --git a/youtube_dl/extractor/pinkbike.py b/youtube_dl/extractor/pinkbike.py
new file mode 100644
index 0000000000..4a15c1835b
--- /dev/null
+++ b/youtube_dl/extractor/pinkbike.py
@@ -0,0 +1,78 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+
+
+class PinkbikeIE(InfoExtractor):
+ _VALID_URL = r'https?://(?:www\.)?pinkbike\.com/video/(?P<id>[0-9]+)'
+ _TESTS = [{
+ 'url': 'http://www.pinkbike.com/video/402811/',
+ 'md5': '4814b8ca7651034cd87e3361d5c2155a',
+ 'info_dict': {
+ 'id': '402811',
+ 'ext': 'mp4',
+ 'title': 'Brandon Semenuk - RAW 100',
+ 'thumbnail': 're:^https?://.*\.jpg$',
+ 'location': 'Victoria, British Columbia, Canada',
+ 'uploader_id': 'revelco',
+ 'upload_date': '20150406',
+ 'description': 'Official release: www.redbull.ca/rupertwalker',
+ 'duration': '100'
+ }
+ }, {
+ 'url': 'http://www.pinkbike.com/video/406629/',
+ 'md5': 'c7a3e19a2bd5cde5a1cda6b2b46caa74',
+ 'info_dict': {
+ 'id': '406629',
+ 'ext': 'mp4',
+ 'title': 'Chromag: Reece Wallace in Utah',
+ 'thumbnail': 're:^https?://.*\.jpg$',
+ 'location': 'Whistler, British Columbia, Canada',
+ 'uploader_id': 'Chromagbikes',
+ 'upload_date': '20150505',
+ 'description': 'Reece Wallace shredding Virgin, Utah. Video by Virtu Media.',
+ 'duration': '180'
+ }
+ }]
+
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(url, video_id)
+
+ title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
+ title = title[:-len(' Video - Pinkbike')]
+
+ description = self._html_search_meta('description', webpage, 'description')
+ description = description[len(title + '. '):]
+
+ uploader_id = self._html_search_regex(r'un:\s*"(.*?)"', webpage, 'uploader_id')
+
+ upload_date = self._html_search_regex(
+ r'class="fullTime"\s*title="([0-9]{4}(?:-[0-9]{2}){2})"',
+ webpage, 'upload_date')
+ upload_date = upload_date.replace('-', '')
+
+ location = self._html_search_regex(
+ r'<dt>Location</dt>\n?\s*<dd>\n?(.*?)\s*<img',
+ webpage, 'location')
+
+ formats = re.findall(
+ r'<source data-quality=\\"([0-9]+)p\\" src=\\"(.*?)\\">',
+ webpage)
+
+ formats = [{'url': fmt[1], 'height': fmt[0]} for fmt in formats]
+
+ return {
+ 'id': video_id,
+ 'title': title,
+ 'description': description,
+ 'duration': self._html_search_meta('video:duration', webpage, 'duration'),
+ 'thumbnail': self._html_search_meta('og:image', webpage, 'thumbnail'),
+ 'uploader_id': uploader_id,
+ 'upload_date': upload_date,
+ 'location': location,
+ 'formats': formats
+ }
From 2c935c0c7224a3332ff9f0fd83e8c074cfbe2c9d Mon Sep 17 00:00:00 2001
From: Mister Hat <misterhat144@gmail.com>
Date: Sun, 24 May 2015 16:30:03 -0500
Subject: [PATCH 2/3] [pinkbike] converted duration to int
---
youtube_dl/extractor/pinkbike.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/pinkbike.py b/youtube_dl/extractor/pinkbike.py
index 4a15c1835b..66605ddbea 100644
--- a/youtube_dl/extractor/pinkbike.py
+++ b/youtube_dl/extractor/pinkbike.py
@@ -20,7 +20,7 @@ class PinkbikeIE(InfoExtractor):
'uploader_id': 'revelco',
'upload_date': '20150406',
'description': 'Official release: www.redbull.ca/rupertwalker',
- 'duration': '100'
+ 'duration': 100
}
}, {
'url': 'http://www.pinkbike.com/video/406629/',
@@ -34,7 +34,7 @@ class PinkbikeIE(InfoExtractor):
'uploader_id': 'Chromagbikes',
'upload_date': '20150505',
'description': 'Reece Wallace shredding Virgin, Utah. Video by Virtu Media.',
- 'duration': '180'
+ 'duration': 180
}
}]
@@ -69,7 +69,7 @@ class PinkbikeIE(InfoExtractor):
'id': video_id,
'title': title,
'description': description,
- 'duration': self._html_search_meta('video:duration', webpage, 'duration'),
+ 'duration': int(self._html_search_meta('video:duration', webpage, 'duration')),
'thumbnail': self._html_search_meta('og:image', webpage, 'thumbnail'),
'uploader_id': uploader_id,
'upload_date': upload_date,
From 680f9744c4e010ad5111c7711c58c341d5ba24dd Mon Sep 17 00:00:00 2001
From: Mister Hat <misterhat144@gmail.com>
Date: Sun, 24 May 2015 16:45:10 -0500
Subject: [PATCH 3/3] [pinkbike] used proper conversion methods
---
youtube_dl/extractor/pinkbike.py | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/youtube_dl/extractor/pinkbike.py b/youtube_dl/extractor/pinkbike.py
index 66605ddbea..45c0b13775 100644
--- a/youtube_dl/extractor/pinkbike.py
+++ b/youtube_dl/extractor/pinkbike.py
@@ -4,6 +4,11 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
+from ..utils import (
+ int_or_none,
+ remove_end,
+ remove_start
+)
class PinkbikeIE(InfoExtractor):
@@ -43,10 +48,13 @@ class PinkbikeIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
title = self._html_search_regex(r'<title>(.*?)</title>', webpage, 'title')
- title = title[:-len(' Video - Pinkbike')]
+ title = remove_end(title, ' Video - Pinkbike')
description = self._html_search_meta('description', webpage, 'description')
- description = description[len(title + '. '):]
+ description = remove_start(description, title + '. ')
+
+ duration = int_or_none(self._html_search_meta(
+ 'video:duration', webpage, 'duration'))
uploader_id = self._html_search_regex(r'un:\s*"(.*?)"', webpage, 'uploader_id')
@@ -63,13 +71,13 @@ class PinkbikeIE(InfoExtractor):
r'<source data-quality=\\"([0-9]+)p\\" src=\\"(.*?)\\">',
webpage)
- formats = [{'url': fmt[1], 'height': fmt[0]} for fmt in formats]
+ formats = [{'url': fmt[1], 'height': int_or_none(fmt[0])} for fmt in formats]
return {
'id': video_id,
'title': title,
'description': description,
- 'duration': int(self._html_search_meta('video:duration', webpage, 'duration')),
+ 'duration': duration,
'thumbnail': self._html_search_meta('og:image', webpage, 'thumbnail'),
'uploader_id': uploader_id,
'upload_date': upload_date,