projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
01384d6
)
[bandcamp] Fix id extraction and modernize (Closes #3866)
author
Sergey M․
<dstftw@gmail.com>
Thu, 2 Oct 2014 13:22:46 +0000
(20:22 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 2 Oct 2014 13:22:46 +0000
(20:22 +0700)
youtube_dl/extractor/bandcamp.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/bandcamp.py
b/youtube_dl/extractor/bandcamp.py
index c569aa4d26e8c2f41d8e16bf83cf17c7060fa7b3..c13446665d2fb0e202973a26f5c7499c325719d1 100644
(file)
--- a/
youtube_dl/extractor/bandcamp.py
+++ b/
youtube_dl/extractor/bandcamp.py
@@
-15,13
+15,23
@@
class BandcampIE(InfoExtractor):
_VALID_URL = r'https?://.*?\.bandcamp\.com/track/(?P<title>.*)'
_TESTS = [{
'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
_VALID_URL = r'https?://.*?\.bandcamp\.com/track/(?P<title>.*)'
_TESTS = [{
'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
- 'file': '1812978515.mp3',
'md5': 'c557841d5e50261777a6585648adf439',
'info_dict': {
'md5': 'c557841d5e50261777a6585648adf439',
'info_dict': {
- "title": "youtube-dl \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
- "duration": 9.8485,
+ 'id': '1812978515',
+ 'ext': 'mp3',
+ 'title': "youtube-dl \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
+ 'duration': 9.8485,
},
'_skip': 'There is a limit of 200 free downloads / month for the test song'
},
'_skip': 'There is a limit of 200 free downloads / month for the test song'
+ }, {
+ 'url': 'http://benprunty.bandcamp.com/track/lanius-battle',
+ 'md5': '2b68e5851514c20efdff2afc5603b8b4',
+ 'info_dict': {
+ 'id': '2650410135',
+ 'ext': 'mp3',
+ 'title': 'Lanius (Battle)',
+ 'uploader': 'Ben Prunty Music',
+ },
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-59,9
+69,9
@@
class BandcampIE(InfoExtractor):
raise ExtractorError('No free songs found')
download_link = m_download.group(1)
raise ExtractorError('No free songs found')
download_link = m_download.group(1)
- video_id =
re.search
(
- r'var TralbumData = {
(.*?)id: (?P<id>\d*?)
$',
- webpage,
re.MULTILINE | re.DOTALL).group('id'
)
+ video_id =
self._search_regex
(
+ r'var TralbumData = {
.*?id: (?P<id>\d+),?
$',
+ webpage,
'video id', flags=re.MULTILINE | re.DOTALL
)
download_webpage = self._download_webpage(download_link, video_id, 'Downloading free downloads page')
# We get the dictionary of the track from some javascript code
download_webpage = self._download_webpage(download_link, video_id, 'Downloading free downloads page')
# We get the dictionary of the track from some javascript code