aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpukkandan <pukkandan@gmail.com>2020-11-23 12:09:03 +0530
committerpukkandan <pukkandan@gmail.com>2020-11-23 23:48:39 +0530
commita93f71ee5e1f8e68bacf7492e52e398578a98d50 (patch)
tree2d75b228268c21f3f097ed07a37034689d5130d9
parent036fcf3aa1fbd484c6629ab754eae715d21439a5 (diff)
downloadhypervideo-pre-a93f71ee5e1f8e68bacf7492e52e398578a98d50.tar.lz
hypervideo-pre-a93f71ee5e1f8e68bacf7492e52e398578a98d50.tar.xz
hypervideo-pre-a93f71ee5e1f8e68bacf7492e52e398578a98d50.zip
Minor fixes
-rw-r--r--youtube_dlc/extractor/youtube.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/youtube_dlc/extractor/youtube.py b/youtube_dlc/extractor/youtube.py
index 6fb18558d..0f15b0189 100644
--- a/youtube_dlc/extractor/youtube.py
+++ b/youtube_dlc/extractor/youtube.py
@@ -64,7 +64,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
_TFA_URL = 'https://accounts.google.com/_/signin/challenge?hl=en&TL={0}'
_RESERVED_NAMES = (
- r'course|embed|playlist|watch|w|results|storefront|'
+ r'course|embed|channel|c|user|playlist|watch|w|results|storefront|'
r'shared|index|account|reporthistory|t/terms|about|upload|signin|logout|'
r'feed/(watch_later|history|subscriptions|library|trending|recommended)')
@@ -3066,7 +3066,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
if parent_renderer:
for entry in extract_entries(parent_renderer):
yield entry
-
continuation = continuation_list[0]
headers = {
@@ -3213,8 +3212,6 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
url = compat_urlparse.urlunparse(
compat_urlparse.urlparse(url)._replace(netloc='www.youtube.com'))
is_home = re.match(r'(?P<pre>%s)(?P<post>/?(?![^#?]).*$)' % self._VALID_URL, url)
- if is_home:
- self._downloader.to_screen('%s\n%s' % (is_home, is_home.group('not_channel')))
if is_home is not None and is_home.group('not_channel') is None:
self._downloader.report_warning(
'A channel/user page was given. All the channel\'s videos will be downloaded. '
@@ -3232,7 +3229,7 @@ class YoutubeTabIE(YoutubeBaseInfoExtractor):
self.to_screen('Downloading playlist %s - add --no-playlist to just download video %s' % (playlist_id, video_id))
webpage = self._download_webpage(url, item_id)
identity_token = self._search_regex(
- r'\bID_TOKEN["\']\s*:\s/l*["\'](.+?)["\']', webpage,
+ r'\bID_TOKEN["\']\s*:\s*["\'](.+?)["\']', webpage,
'identity token', default=None)
data = self._extract_yt_initial_data(item_id, webpage)
tabs = try_get(