R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into porntrex

Browse Source
This commit is contained in:
nindogo 2019-04-26 13:37:26 +03:00
commit 90dc52080c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/extractor/reddit.py
View File

@ -7,6 +7,7 @@ from ..utils import (
ExtractorError, ExtractorError,
int_or_none, int_or_none,
float_or_none, float_or_none,
url_or_none,
) )
@ -119,7 +120,7 @@ class RedditRIE(InfoExtractor):
'_type': 'url_transparent', '_type': 'url_transparent',
'url': video_url, 'url': video_url,
'title': data.get('title'), 'title': data.get('title'),
'thumbnail': data.get('thumbnail'), 'thumbnail': url_or_none(data.get('thumbnail')),
'timestamp': float_or_none(data.get('created_utc')), 'timestamp': float_or_none(data.get('created_utc')),
'uploader': data.get('author'), 'uploader': data.get('author'),
'like_count': int_or_none(data.get('ups')), 'like_count': int_or_none(data.get('ups')),

2
youtube_dl/extractor/twitcasting.py
View File

@ -14,7 +14,7 @@ class TwitCastingIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '2357609', 'id': '2357609',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Recorded Live #2357609', 'title': 'Live #2357609',
'uploader_id': 'ivetesangalo', 'uploader_id': 'ivetesangalo',
'description': "Moi! I'm live on TwitCasting from my iPhone.", 'description': "Moi! I'm live on TwitCasting from my iPhone.",
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.jpg$',