diff --git a/youtube/shared.css b/youtube/shared.css
index f99baa1..151111d 100644
--- a/youtube/shared.css
+++ b/youtube/shared.css
@@ -227,11 +227,15 @@ address{
grid-column: 1 / span 2;
grid-row: 6;
}
+ .full-item .music-list{
+ grid-row:7;
+ grid-column: 1 / span 2;
+ }
.full-item .comments{
- grid-row: 7;
+ grid-row: 8;
}
.full-item .more-comments{
- grid-row: 8;
+ grid-row: 9;
}
.medium-item-box{
diff --git a/youtube/watch.py b/youtube/watch.py
index c669f5e..cfe827b 100644
--- a/youtube/watch.py
+++ b/youtube/watch.py
@@ -296,6 +296,10 @@ def extract_info(downloader, *args, **kwargs):
except YoutubeError as e:
return str(e)
+music_list_table_row = Template('''
+ $attribute |
+ $value |
+''')
def get_watch_page(query_string):
id = urllib.parse.parse_qs(query_string)['v'][0]
downloader = YoutubeDL(params={'youtube_include_dash_manifest':False})
@@ -343,7 +347,32 @@ def get_watch_page(query_string):
else:
related_videos_html = ''
+ music_list = info['music_list']
+ if len(music_list) == 0:
+ music_list_html = ''
+ else:
+ music_list_html = '''
+
+ Music
+
+ Artist |
+ Title |
+ Album |
+
+'''
+ for track in music_list:
+ music_list_html += '''\n'''
+ for attribute in ('artist', 'title', 'album'):
+ try:
+ value = track[attribute]
+ except KeyError:
+ music_list_html += ''' | '''
+ else:
+ music_list_html += '''''' + html.escape(value) + ''' | '''
+ music_list_html += '''
\n'''
+ music_list_html += '''
\n'''
+
download_options = ''
for format in info['formats']:
@@ -371,5 +400,6 @@ def get_watch_page(query_string):
related = related_videos_html,
comments = comments_html,
more_comments_button = more_comments_button,
+ music_list = music_list_html,
)
return page
\ No newline at end of file
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index c120cfb..39e4ca5 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -10,6 +10,7 @@ import random
import re
import time
import traceback
+import html
from .common import InfoExtractor, SearchInfoExtractor
from ..jsinterp import JSInterpreter
@@ -1479,6 +1480,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
})
return chapters
+ ul_tag_pattern = re.compile(r'(?ul)')
+ music_info_pattern = re.compile(r'\s*(Song|Music|Artist|Album)\s*
\s*\s*- (?:]*>)?([^<]*)(?:)?
')
def _real_extract(self, url):
url, smuggled_data = unsmuggle_url(url, {})
@@ -1528,6 +1531,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
def extract_view_count(v_info):
return int_or_none(try_get(v_info, lambda x: x['view_count'][0]))
+ # Related videos
related_vid_info = self._search_regex(r"""'RELATED_PLAYER_ARGS':\s*(\{.*?\})""", video_webpage, "related_player_args", default='')
if related_vid_info == '':
@@ -1540,6 +1544,44 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
related_vids = (compat_parse_qs(related_item) for related_item in related_vid_info.split(","))
related_vids = [{key : value[0] for key,value in vid.items()} for vid in related_vids]
+ # Music list
+ # Test case: https://www.youtube.com/watch?v=jbkZdRglnKY
+ music_list = []
+ metadata_start = video_webpage.find('