aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Pöschel <github@basicmaster.de>2017-01-25 20:44:03 +0100
committerSergey M․ <dstftw@gmail.com>2017-01-26 22:53:16 +0700
commitc19ef77c3138ecf1ce5c988de2d94031f58b4f69 (patch)
treef52524b41422f5237617791557191bf7a6a72639
parentb3277115a192b88df34692e42f62f39bd4a65bac (diff)
[jamendo] Extract full title
-rw-r--r--youtube_dl/extractor/jamendo.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dl/extractor/jamendo.py
index 51d19e67d..3db07e79f 100644
--- a/youtube_dl/extractor/jamendo.py
+++ b/youtube_dl/extractor/jamendo.py
@@ -16,7 +16,7 @@ class JamendoIE(InfoExtractor):
'id': '196219',
'display_id': 'stories-from-emona-i',
'ext': 'flac',
- 'title': 'Stories from Emona I',
+ 'title': 'Maya Filipič - Stories from Emona I',
'thumbnail': r're:^https?://.*\.jpg'
}
}
@@ -28,7 +28,7 @@ class JamendoIE(InfoExtractor):
webpage = self._download_webpage(url, display_id)
- title = self._html_search_meta('name', webpage, 'title')
+ title = self._search_regex(r'<title>(.*?)\ \|\ Jamendo\ Music\ .*</title>', webpage, 'title')
formats = [{
'url': 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
@@ -62,21 +62,21 @@ class JamendoAlbumIE(InfoExtractor):
'url': 'https://www.jamendo.com/album/121486/duck-on-cover',
'info_dict': {
'id': '121486',
- 'title': 'Duck On Cover'
+ 'title': 'Shearer - Duck On Cover'
},
'playlist': [{
'md5': 'e1a2fcb42bda30dfac990212924149a8',
'info_dict': {
'id': '1032333',
'ext': 'flac',
- 'title': 'Warmachine'
+ 'title': 'Shearer - Warmachine'
}
}, {
'md5': '1f358d7b2f98edfe90fd55dac0799d50',
'info_dict': {
'id': '1032330',
'ext': 'flac',
- 'title': 'Without Your Ghost'
+ 'title': 'Shearer - Without Your Ghost'
}
}],
'params': {
@@ -90,7 +90,7 @@ class JamendoAlbumIE(InfoExtractor):
webpage = self._download_webpage(url, mobj.group('display_id'))
- title = self._html_search_meta('name', webpage, 'title')
+ title = self._search_regex(r'<title>(.*?)\ \|\ Jamendo\ Music\ .*</title>', webpage, 'title')
entries = [
self.url_result(