projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b65e5bb
)
[qqmusic] Eliminate _filter_lrc and use single quotes
author
Sergey M․
<dstftw@gmail.com>
Sat, 26 Sep 2015 14:38:11 +0000
(20:38 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 26 Sep 2015 14:38:11 +0000
(20:38 +0600)
youtube_dl/extractor/qqmusic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/qqmusic.py
b/youtube_dl/extractor/qqmusic.py
index 8ead04606e8ac8f1e334248b47916dcf550cf333..bf6762034e47dc515788b4f1168084a3f4125953 100644
(file)
--- a/
youtube_dl/extractor/qqmusic.py
+++ b/
youtube_dl/extractor/qqmusic.py
@@
-58,11
+58,6
@@
class QQMusicIE(InfoExtractor):
curMs = int(time.time() * 1000) % 1000
return int(round(random.random() * 2147483647) * curMs % 1E10)
curMs = int(time.time() * 1000) % 1000
return int(round(random.random() * 2147483647) * curMs % 1E10)
- def _filter_lrc(self, data):
- lyrics_expr = r'(\[[0-9]{2}:[0-9]{2}\.[0-9]{2,}\][^\n]*|\[[^\]]*\])'
- texts = re.findall(lyrics_expr, data)
- return ''.join(i + "\n" for i in texts)
-
def _real_extract(self, url):
mid = self._match_id(url)
def _real_extract(self, url):
mid = self._match_id(url)
@@
-117,7
+112,9
@@
class QQMusicIE(InfoExtractor):
self._check_formats(formats, mid)
self._sort_formats(formats)
self._check_formats(formats, mid)
self._sort_formats(formats)
- actual_lrc_lyrics = self._filter_lrc(lrc_content)
+ actual_lrc_lyrics = ''.join(
+ line + '\n' for line in re.findall(
+ r'(\[[0-9]{2}:[0-9]{2}\.[0-9]{2,}\][^\n]*|\[[^\]]*\])', lrc_content))
info_dict = {
'id': mid,
info_dict = {
'id': mid,