pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-01-22 03:10:11 +09:00
Code Issues Projects Releases Wiki Activity

[torrins] fixed regex et al.

Browse Source
This commit is contained in:
Aniruddh Joshi 2018-03-26 21:35:23 +05:30
parent 8d5b553ed1
commit 995cb53e40
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/extractor/torrins.py
View File

@ -16,7 +16,7 @@ class TorrinsIE(InfoExtractor):
IE_NAME = 'torrins'
_VALID_URL = r'''(?x)
https?://
www\.torrins\.com/(?:guitar|piano|bass)-lessons/(?:song-lessons|style-genre)/[^/]+/(?P<id>[^/]+)/(?P<lesson_id>[^(\.)]+)\.html
www\.torrins\.com/(?:guitar|piano|bass)-lessons/(?:song-lessons|style-genre)/[^/]+/(?P<id>[^/]+)/[^\.]+\.html
'''
_LOGIN_URL = 'https://www.torrins.com/services/user/sign-in'
_ORIGIN_URL = 'https://www.torrins.com'
@ -26,7 +26,6 @@ class TorrinsIE(InfoExtractor):
'url': 'https://www.torrins.com/guitar-lessons/song-lessons/english-songs/another-brick-in-the-wall/song-demo.html',
'info_dict': {
'id': 'another-brick-in-the-wall',
'lesson_id': 'song-demo',
'ext': 'mp4',
'title': 'Another Brick in the Wall Guitar - Song Demo',
'description': 'md5:c0d51f6f21ef4ec65f091055a5eef876',
@ -38,12 +37,12 @@ class TorrinsIE(InfoExtractor):
def _handle_error(self, response):
if not isinstance(response, dict):
return
error = response.get('error')
error = response['error']
if error:
error_str = 'Torrins returned error #%s: %s' % (error.get('code'), error.get('message'))
error_data = error.get('data')
error_str = 'Torrins returned error #%s: %s' % (error['code'], error.get['message'])
error_data = error['data']
if error_data:
error_str += ' - %s' % error_data.get('formErrors')
error_str += ' - %s' % error_data['formErrors']
raise ExtractorError(error_str, expected=True)
def _download_webpage(self, *args, **kwargs):
@ -59,9 +58,6 @@ class TorrinsIE(InfoExtractor):
if username is None:
return
self._download_webpage(
self._LOGIN_URL, None, 'Downloading login popup')
def is_logged(reason):
webpage = self._download_webpage(self._ORIGIN_URL, None, reason)
@ -99,13 +95,10 @@ class TorrinsIE(InfoExtractor):
webpage = self._download_webpage(url, course_id)
title = self._og_search_title(webpage)
video_json = self._html_search_regex(r"<div id=\"video\" idata='(.+?)'", webpage, 'video formats')
video_json = self._parse_json(video_json, course_id)
title = video_json['title']
title = video_json.get('title') or self._og_search_title(webpage)
video_id = video_json['id']
formats = [