projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Add ability to authenticate with cookies
[youtube-dl]
/
youtube_dl
/
extractor
/
ir90tv.py
diff --git
a/youtube_dl/extractor/ir90tv.py
b/youtube_dl/extractor/ir90tv.py
index 880a6e32f6b4b9ea6a683c25238f8953a8355030..d5a3f6fa5dbbf0d962da53df48948af4fa1d7521 100644
(file)
--- a/
youtube_dl/extractor/ir90tv.py
+++ b/
youtube_dl/extractor/ir90tv.py
@@
-2,6
+2,7
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
+from ..utils import remove_start
class Ir90TvIE(InfoExtractor):
class Ir90TvIE(InfoExtractor):
@@
-13,7
+14,7
@@
class Ir90TvIE(InfoExtractor):
'id': '95719',
'ext': 'mp4',
'title': 'شایعات نقل و انتقالات مهم فوتبال اروپا 94/02/18',
'id': '95719',
'ext': 'mp4',
'title': 'شایعات نقل و انتقالات مهم فوتبال اروپا 94/02/18',
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
}
}, {
'url': 'http://www.90tv.ir/video/95719/%D8%B4%D8%A7%DB%8C%D8%B9%D8%A7%D8%AA-%D9%86%D9%82%D9%84-%D9%88-%D8%A7%D9%86%D8%AA%D9%82%D8%A7%D9%84%D8%A7%D8%AA-%D9%85%D9%87%D9%85-%D9%81%D9%88%D8%AA%D8%A8%D8%A7%D9%84-%D8%A7%D8%B1%D9%88%D9%BE%D8%A7-940218',
}
}, {
'url': 'http://www.90tv.ir/video/95719/%D8%B4%D8%A7%DB%8C%D8%B9%D8%A7%D8%AA-%D9%86%D9%82%D9%84-%D9%88-%D8%A7%D9%86%D8%AA%D9%82%D8%A7%D9%84%D8%A7%D8%AA-%D9%85%D9%87%D9%85-%D9%81%D9%88%D8%AA%D8%A8%D8%A7%D9%84-%D8%A7%D8%B1%D9%88%D9%BE%D8%A7-940218',
@@
-24,18
+25,18
@@
class Ir90TvIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- title = self._html_search_regex(
- r'<title>
\n90tv.ir :: (.*?)</title>', webpage, 'title
')
+ title =
remove_start(
self._html_search_regex(
+ r'<title>
([^<]+)</title>', webpage, 'title'), '90tv.ir ::
')
video_url = self._search_regex(
r'<source[^>]+src="([^"]+)"', webpage, 'video url')
video_url = self._search_regex(
r'<source[^>]+src="([^"]+)"', webpage, 'video url')
- thumbnail = self._search_regex(r'poster="([^"]+)"', webpage, 'thumbnail url')
+ thumbnail = self._search_regex(r'poster="([^"]+)"', webpage, 'thumbnail url'
, fatal=False
)
return {
'url': video_url,
'id': video_id,
'title': title,
return {
'url': video_url,
'id': video_id,
'title': title,
- 'video_url'
: video_url,
- 'thumbnail'
: thumbnail,
+ 'video_url': video_url,
+ 'thumbnail': thumbnail,
}
}