Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-12-02 05:07:55 +01:00
Code Issues Releases Wiki Activity

Clean up of code before pull request.

Browse Source
This commit is contained in:
nindogo 2019-04-18 16:27:19 +03:00
parent c5fd4cd5be
commit db23d51896
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/extractor/porntrex.py
View File

@ -2,7 +2,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
import json
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
@ -15,13 +14,14 @@ class PornTrexIE(InfoExtractor):
_NETRC_MACHINE = 'porntrex' _NETRC_MACHINE = 'porntrex'
_VALID_URL = r'https?://(?:www\.)?porntrex\.com/video/(?P<id>[0-9]+)/' _VALID_URL = r'https?://(?:www\.)?porntrex\.com/video/(?P<id>[0-9]+)/'
_TEST = { _TEST = {
'url': 'https://www.porntrex.com/video/519351/be-ariyana-adin-breaking-and-entering-this-pussy', 'url': 'https://www.porntrex.com/video/350451/naomi-woods-the-list',
'info_dict': { 'info_dict': {
'id': '519351', 'id': '350451',
'ext': 'mp4', 'ext': 'mp4',
'title': 'BE - Ariyana Adin - Breaking And Entering This Pussy', 'title': 'Naomi Woods - The List in 4k',
'uploader': 'brand95', 'uploader': 'delman',
'description': 'BE - Ariyana Adin - Breaking And Entering This Pussy', 'description': 'Naomi Woods The List',
'url': 'https://www.porntrex.com/get_file/7/5223e8c2d6a378f22eccc8fd8e881746005ebc9d40/350000/350451/350451_2160p.mp4'
} }
} }
@ -82,19 +82,8 @@ class PornTrexIE(InfoExtractor):
'ext': url2[x].split('.')[-1], 'ext': url2[x].split('.')[-1],
'protocol': url2[x].split(':')[0], 'protocol': url2[x].split(':')[0],
}) })
self._sort_formats(formats) self._sort_formats(formats)
flashvars_regex = re.compile(
r'flashvars.*?(\{.*?\})',
flags=re.DOTALL
)
flashvars = json.loads(
re.findall(flashvars_regex, webpage)[0]
)
print(flashvars)
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
@ -130,7 +119,7 @@ class PornTrexPlayListIE(InfoExtractor):
entries = [] entries = []
for this_url in all_urls: for this_url in all_urls:
entries.append({'_type': 'url', entries.append({'_type': 'url',
'id': 'PornTrex', 'id': this_url.split('/')[4],
'url': this_url, 'url': this_url,
}) })