heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error when getting no content in channel response

Browse Source
This commit is contained in:
James Taylor 2018-07-03 18:06:53 -07:00
parent c6dad90d05
commit dcdf02737a
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ __pycache__/
*.py[cod] *.py[cod]
*$py.class *$py.class
youtube_dl/ youtube_dl/
debug/
banned_addresses.txt banned_addresses.txt
youtube/common_old.py youtube/common_old.py
youtube/common_older.py youtube/common_older.py

1
playlist_debug
View File

File diff suppressed because one or more lines are too long

1
playlist_debug_metadata
View File

File diff suppressed because one or more lines are too long

14
youtube/channel.py
View File

@ -80,6 +80,8 @@ def get_channel_tab(channel_id, page="1", sort=3, tab='videos', view=1):
content = common.fetch_url(url, headers_1) content = common.fetch_url(url, headers_1)
print("Finished recieving channel tab response") print("Finished recieving channel tab response")
'''with open('debug/channel_debug', 'wb') as f:
f.write(content)'''
info = json.loads(content) info = json.loads(content)
return info return info
@ -131,8 +133,8 @@ def get_number_of_videos(channel_id):
url = 'https://m.youtube.com/playlist?list=' + playlist_id + '&ajax=1&disable_polymer=true' url = 'https://m.youtube.com/playlist?list=' + playlist_id + '&ajax=1&disable_polymer=true'
print("Getting number of videos") print("Getting number of videos")
response = common.fetch_url(url, common.mobile_ua + headers_1) response = common.fetch_url(url, common.mobile_ua + headers_1)
with open('playlist_debug_metadata', 'wb') as f: '''with open('debug/playlist_debug_metadata', 'wb') as f:
f.write(response) f.write(response)'''
response = response.decode('utf-8') response = response.decode('utf-8')
print("Got response for number of videos") print("Got response for number of videos")
return int(re.search(r'"num_videos_text":\s*{(?:"item_type":\s*"formatted_string",)?\s*"runs":\s*\[{"text":\s*"([\d,]*) videos"', response).group(1).replace(',','')) return int(re.search(r'"num_videos_text":\s*{(?:"item_type":\s*"formatted_string",)?\s*"runs":\s*\[{"text":\s*"([\d,]*) videos"', response).group(1).replace(',',''))
@ -153,7 +155,13 @@ def channel_videos_html(polymer_json, current_page=1, number_of_videos = 1000, c
try: try:
items = polymer_json[1]['response']['continuationContents']['gridContinuation']['items'] items = polymer_json[1]['response']['continuationContents']['gridContinuation']['items']
except KeyError: except KeyError:
items = polymer_json[1]['response']['contents']['twoColumnBrowseResultsRenderer']['tabs'][1]['tabRenderer']['content']['sectionListRenderer']['contents'][0]['itemSectionRenderer']['contents'][0]['gridRenderer']['items'] response = polymer_json[1]['response']
try:
contents = response['contents']
except KeyError:
items = []
else:
items = contents['twoColumnBrowseResultsRenderer']['tabs'][1]['tabRenderer']['content']['sectionListRenderer']['contents'][0]['itemSectionRenderer']['contents'][0]['gridRenderer']['items']
items_html = '' items_html = ''
for video in items: for video in items:
items_html += grid_video_item_html(grid_video_item_info(video['gridVideoRenderer'], microformat['title'])) items_html += grid_video_item_html(grid_video_item_info(video['gridVideoRenderer'], microformat['title']))

4
youtube/playlist.py
View File

@ -132,8 +132,8 @@ def get_videos_ajax(playlist_id, page):
} }
print("Sending playlist ajax request") print("Sending playlist ajax request")
content = common.fetch_url(url, headers) content = common.fetch_url(url, headers)
with open('playlist_debug', 'wb') as f: '''with open('debug/playlist_debug', 'wb') as f:
f.write(content) f.write(content)'''
content = content[4:] content = content[4:]
print("Finished recieving playlist response") print("Finished recieving playlist response")