mirror of
https://github.com/ytdl-org/youtube-dl
synced 2025-03-17 05:22:22 +09:00
Conflicts:
youtube_dl/InfoExtractors.py
This commit is contained in:
parent
c56102dd16
commit
fa71aa397a
@ -4494,12 +4494,26 @@ class HypemIE(InfoExtractor):
|
||||
data = {'ax':1 ,
|
||||
'ts': time.time()
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
id = mobj.group(1)
|
||||
data_encoded = compat_urllib_parse.urlencode(data)
|
||||
complete_url = url + "?"+data_encoded
|
||||
request = compat_urllib_request.Request(complete_url)
|
||||
response,urlh = self._download_webpage_handle(request, id, u'Downloading webpage with the url')
|
||||
cookie = urlh.headers.get('Set-Cookie', '')
|
||||
=======
|
||||
data_encoded = compat_urllib_parse.urlencode(data)
|
||||
complete_url = url + "?"+data_encoded
|
||||
request = compat_urllib_request.Request(complete_url)
|
||||
response = compat_urllib_request.urlopen(request)
|
||||
#save our cookie
|
||||
cookie = response.headers.get('Set-Cookie')
|
||||
encoding = response.headers.get('Content-Type')
|
||||
encoding = (encoding.split(';')[1]).split('=')[1]
|
||||
#grab the HTML
|
||||
html = response.read().decode(encoding)
|
||||
response.close()
|
||||
>>>>>>> remotes/origin/HEAD
|
||||
track_list = []
|
||||
list_data = re.search(r'<script type="application/json" id="displayList-data">\n (.*) </script>',response)
|
||||
html_tracks = list_data.group(1)
|
||||
|
Loading…
Reference in New Issue
Block a user