diff options
| author | Tom-Oliver Heidel <github@tom-oliver.eu> | 2020-11-30 02:51:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 02:51:41 +0100 |
| commit | b662fc8d2033c615ffbdd3b51123b446c03255e8 (patch) | |
| tree | 3d32dc25a663f4e61fc28860acda67c7a425cb7a /youtube_dlc/extractor/xtube.py | |
| parent | 8924ddc3eec4c03c6776673d0d5e823dc5445549 (diff) | |
| parent | 929576bb9e4aa31f0516f1437d2ae762afdd9f2c (diff) | |
| download | hypervideo-pre-b662fc8d2033c615ffbdd3b51123b446c03255e8.tar.lz hypervideo-pre-b662fc8d2033c615ffbdd3b51123b446c03255e8.tar.xz hypervideo-pre-b662fc8d2033c615ffbdd3b51123b446c03255e8.zip | |
Merge branch 'master' into gedi
Diffstat (limited to 'youtube_dlc/extractor/xtube.py')
| -rw-r--r-- | youtube_dlc/extractor/xtube.py | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/youtube_dlc/extractor/xtube.py b/youtube_dlc/extractor/xtube.py index 01b253dcb..98d2adb99 100644 --- a/youtube_dlc/extractor/xtube.py +++ b/youtube_dlc/extractor/xtube.py @@ -39,22 +39,6 @@ class XTubeIE(InfoExtractor): 'age_limit': 18, } }, { - # FLV videos with duplicated formats - 'url': 'http://www.xtube.com/video-watch/A-Super-Run-Part-1-YT-9299752', - 'md5': 'a406963eb349dd43692ec54631efd88b', - 'info_dict': { - 'id': '9299752', - 'display_id': 'A-Super-Run-Part-1-YT', - 'ext': 'flv', - 'title': 'A Super Run - Part 1 (YT)', - 'description': 'md5:4cc3af1aa1b0413289babc88f0d4f616', - 'uploader': 'tshirtguy59', - 'duration': 579, - 'view_count': int, - 'comment_count': int, - 'age_limit': 18, - }, - }, { # new URL schema 'url': 'http://www.xtube.com/video-watch/strange-erotica-625837', 'only_matching': True, @@ -90,7 +74,7 @@ class XTubeIE(InfoExtractor): title, thumbnail, duration = [None] * 3 config = self._parse_json(self._search_regex( - r'playerConf\s*=\s*({.+?})\s*,\s*\n', webpage, 'config', + r'playerConf\s*=\s*({.+?})\s*,\s*(?:\n|loaderConf)', webpage, 'config', default='{}'), video_id, transform_source=js_to_json, fatal=False) if config: config = config.get('mainRoll') |