projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[extractor/common] Add _download_xml_handle
[youtube-dl]
/
youtube_dl
/
extractor
/
fxnetworks.py
diff --git
a/youtube_dl/extractor/fxnetworks.py
b/youtube_dl/extractor/fxnetworks.py
index 629897317be5fbe316639856cec73662c1f8149c..37549fb01ccfc05fb4a642f948ee70227588f6e0 100644
(file)
--- a/
youtube_dl/extractor/fxnetworks.py
+++ b/
youtube_dl/extractor/fxnetworks.py
@@
-3,27
+3,31
@@
from __future__ import unicode_literals
from .adobepass import AdobePassIE
from ..utils import (
from .adobepass import AdobePassIE
from ..utils import (
- update_url_query,
extract_attributes,
extract_attributes,
+ int_or_none,
parse_age_limit,
smuggle_url,
parse_age_limit,
smuggle_url,
+ update_url_query,
)
class FXNetworksIE(AdobePassIE):
_VALID_URL = r'https?://(?:www\.)?(?:fxnetworks|simpsonsworld)\.com/video/(?P<id>\d+)'
_TESTS = [{
)
class FXNetworksIE(AdobePassIE):
_VALID_URL = r'https?://(?:www\.)?(?:fxnetworks|simpsonsworld)\.com/video/(?P<id>\d+)'
_TESTS = [{
- 'url': 'http://www.fxnetworks.com/video/
719841347694
',
- 'md5': '
1447d4722e42ebca19e5232ab93abb22
',
+ 'url': 'http://www.fxnetworks.com/video/
1032565827847
',
+ 'md5': '
8d99b97b4aa7a202f55b6ed47ea7e703
',
'info_dict': {
'info_dict': {
- 'id': '
719841347694
',
+ 'id': '
dRzwHC_MMqIv
',
'ext': 'mp4',
'ext': 'mp4',
- 'title': '
Vanpage
',
- 'description': '
F*ck settling down. You\'re the Worst returns for an all new season August 31st on FXX
.',
+ 'title': '
First Look: Better Things - Season 2
',
+ 'description': '
Because real life is like a fart. Watch this FIRST LOOK to see what inspired the new season of Better Things
.',
'age_limit': 14,
'uploader': 'NEWA-FNG-FX',
'age_limit': 14,
'uploader': 'NEWA-FNG-FX',
- 'upload_date': '20160706',
- 'timestamp': 1467844741,
+ 'upload_date': '20170825',
+ 'timestamp': 1503686274,
+ 'episode_number': 0,
+ 'season_number': 2,
+ 'series': 'Better Things',
},
'add_ie': ['ThePlatform'],
}, {
},
'add_ie': ['ThePlatform'],
}, {
@@
-64,6
+68,9
@@
class FXNetworksIE(AdobePassIE):
'id': video_id,
'title': title,
'url': smuggle_url(update_url_query(release_url, query), {'force_smil_url': True}),
'id': video_id,
'title': title,
'url': smuggle_url(update_url_query(release_url, query), {'force_smil_url': True}),
+ 'series': video_data.get('data-show-title'),
+ 'episode_number': int_or_none(video_data.get('data-episode')),
+ 'season_number': int_or_none(video_data.get('data-season')),
'thumbnail': video_data.get('data-large-thumb'),
'age_limit': parse_age_limit(rating),
'ie_key': 'ThePlatform',
'thumbnail': video_data.get('data-large-thumb'),
'age_limit': parse_age_limit(rating),
'ie_key': 'ThePlatform',