projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c935c0
)
[pinkbike] used proper conversion methods
author
Mister Hat
<misterhat144@gmail.com>
Sun, 24 May 2015 21:45:10 +0000
(16:45 -0500)
committer
Mister Hat
<misterhat144@gmail.com>
Sun, 24 May 2015 21:45:10 +0000
(16:45 -0500)
youtube_dl/extractor/pinkbike.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/pinkbike.py
b/youtube_dl/extractor/pinkbike.py
index 66605ddbea6a790fb93223b357cb7c60023e7146..45c0b13775cd0a676d29504726043e2048ad9898 100644
(file)
--- 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
import re
from .common import InfoExtractor
+from ..utils import (
+ int_or_none,
+ remove_end,
+ remove_start
+)
class PinkbikeIE(InfoExtractor):
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')
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 = 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')
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)
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,
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,
'thumbnail': self._html_search_meta('og:image', webpage, 'thumbnail'),
'uploader_id': uploader_id,
'upload_date': upload_date,