1
0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-13 08:09:59 +08:00

Update adobepass.py

Adding providers.  I can only test with Dish and right now I'm getting:
[debug] System config: []
[debug] User config: []
[debug] Command-line args: ['--ap-mso', 'Dish', '--ap-username', 'PRIVATE', '--ap-password', 'PRIVATE', 'http://www.fox.com/watch/770377795715/7833489408', '--write-sub', '--convert-subs', 'srt', '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]', '-o', 'C:\\Users\\Greg\\Videos\\%(series)s\\%(season_number)sx%(episode_number)s %(title)s.%(ext)s', '-v', '--get-filename']
[debug] Encodings: locale cp1252, fs utf-8, out cp1252, pref cp1252
[debug] youtube-dl version 2016.12.22
[debug] Python version 3.6.0 - Windows-10-10.0.14393-SP0
[debug] exe versions: ffmpeg 3.2.2, ffprobe 3.2.2, rtmpdump 2.3
[debug] Proxy map: {}
ERROR: Unable to extract post url; please report this issue on https://yt-dl.org/bug . Make sure you are using the latest version; see  https://yt-dl.org/update  on how to update. Be sure to call youtube-dl with the --verbose flag and include its complete output.
Traceback (most recent call last):
  File "C:\Python36\lib\youtube-dl\youtube_dl\YoutubeDL.py", line 694, in extract_info
    ie_result = ie.extract(url)
  File "C:\Python36\lib\youtube-dl\youtube_dl\extractor\common.py", line 359, in extract
    return self._real_extract(url)
  File "C:\Python36\lib\youtube-dl\youtube_dl\extractor\fox.py", line 48, in _real_extract
    query['auth'] = self._extract_mvpd_auth(url, video_id, 'fbc-fox', resource)
  File "C:\Python36\lib\youtube-dl\youtube_dl\extractor\adobepass.py", line 1437, in _extract_mvpd_auth
    mso_info.get('password_field', 'password'): password,
  File "C:\Python36\lib\youtube-dl\youtube_dl\extractor\adobepass.py", line 1343, in post_form
    post_url = self._html_search_regex(r'<form[^>]+action=(["\'])(?P<url>.+?)\1', form_page, 'post url', group='url')
  File "C:\Python36\lib\youtube-dl\youtube_dl\extractor\common.py", line 671, in _html_search_regex
    res = self._search_regex(pattern, string, name, default, fatal, flags, group)
  File "C:\Python36\lib\youtube-dl\youtube_dl\extractor\common.py", line 662, in _search_regex
    raise RegexNotFoundError('Unable to extract %s' % _name)
youtube_dl.utils.RegexNotFoundError: Unable to extract post url; please report this issue on https://yt-dl.org/bug . Make sure you are using the latest version; see  https://yt-dl.org/update  on how to update. Be sure to call youtube-dl with the --verbose flag and include its complete output.
This commit is contained in:
gkoelln 2017-01-13 12:06:09 -06:00 committed by GitHub
parent 1f393a3241
commit b74f9dbfc3

View File

@ -16,21 +16,6 @@ from ..utils import (
MSO_INFO = {
'DTV': {
'name': 'DIRECTV',
'username_field': 'username',
'password_field': 'password',
},
'Rogers': {
'name': 'Rogers',
'username_field': 'UserName',
'password_field': 'UserPassword',
},
'Comcast_SSO': {
'name': 'Comcast XFINITY',
'username_field': 'user',
'password_field': 'passwd',
},
'thr030': {
'name': '3 Rivers Communications'
},
@ -100,6 +85,11 @@ MSO_INFO = {
'astound': {
'name': 'Astound (now Wave)'
},
'ATT': {
'name': 'AT\&T U-Verse',
'username_field': 'userid',
'password_field': 'password',
},
'dix030': {
'name': 'ATC Broadband'
},
@ -253,6 +243,11 @@ MSO_INFO = {
'cha050': {
'name': 'Chariton Valley Communication Corporation, Inc.'
},
'Charter_Direct': {
'name': 'Charter',
'username_field': 'IDToken1',
'password_field': 'IDToken2',
},
'cha060': {
'name': 'Chatmoss Cablevision'
},
@ -325,6 +320,11 @@ MSO_INFO = {
'col080': {
'name': 'Columbus Telephone'
},
'Comcast_SSO': {
'name': 'Comcast XFINITY',
'username_field': 'user',
'password_field': 'passwd',
},
'nor105': {
'name': 'Communications 1 Cablevision, Inc.'
},
@ -400,6 +400,12 @@ MSO_INFO = {
'ind060-dc': {
'name': 'Direct Communications'
},
'DTV': {
'name': 'DIRECTV',
},
'Dish': {
'name': 'Dish'
},
'doy010': {
'name': 'Doylestown Cable TV'
},
@ -979,6 +985,11 @@ MSO_INFO = {
'rockportcable': {
'name': 'Rock Port Cablevision'
},
'Rogers': {
'name': 'Rogers',
'username_field': 'UserName',
'password_field': 'UserPassword',
},
'rsf010': {
'name': 'RS Fiber'
},
@ -1096,6 +1107,11 @@ MSO_INFO = {
'thr020': {
'name': 'Three River'
},
'TWC': {
'name': 'Time Warner Cable',
'username_field': 'Ecom_User_ID',
'password_field': 'Ecom_Password',
},
'cab140': {
'name': 'Town & Country Technologies'
},
@ -1171,6 +1187,11 @@ MSO_INFO = {
'sul015': {
'name': 'Venture Communications Cooperative, Inc.'
},
'verizon': {
'name': 'Verizon FiOS',
'username_field': 'IDToken1',
'password_field': 'IDToken2',
},
'ver025': {
'name': 'Vernon Communications Co-op'
},
@ -1410,6 +1431,7 @@ class AdobePassIE(InfoExtractor):
# Normal, non-Comcast flow
provider_login_page_res = post_form(
provider_redirect_page_res, 'Downloading Provider Login Page')
mvpd_confirm_page_res = post_form(provider_login_page_res, 'Logging in', {
mso_info.get('username_field', 'username'): username,
mso_info.get('password_field', 'password'): password,