From: Sergey M․ Date: Sat, 26 Sep 2015 14:38:11 +0000 (+0600) Subject: [qqmusic] Eliminate _filter_lrc and use single quotes X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=961c5cbf172da49b26c09f806b0871719578e0e5;p=youtube-dl [qqmusic] Eliminate _filter_lrc and use single quotes --- diff --git a/youtube_dl/extractor/qqmusic.py b/youtube_dl/extractor/qqmusic.py index 8ead04606..bf6762034 100644 --- 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) - 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) @@ -117,7 +112,9 @@ class QQMusicIE(InfoExtractor): 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,