Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-26 18:43:38 +01:00
Code Issues Projects Releases Wiki Activity

fix unicode encoding for lyrics requests (#350)

Browse source
This commit is contained in:
Adrian Sampson 2012-02-26 12:54:27 -08:00
parent a71961d7df
commit 8d9c324b61
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
beetsplug/lyrics.py
View file

@ -89,6 +89,8 @@ def _lw_encode(s):
s = s.replace("#", "Number_")
s = re.sub(r'[\[\{]', '(', s)
s = re.sub(r'[\]\}]', ')', s)
if isinstance(s, unicode):
s = s.encode('utf8', 'ignore')
return urllib.quote(s)
def fetch_lyricswiki(artist, title):
"""Fetch lyrics from LyricsWiki."""
@ -102,6 +104,8 @@ def fetch_lyricswiki(artist, title):
LYRICSCOM_URL_PATTERN = 'http://www.lyrics.com/%s-lyrics-%s.html'
def _lc_encode(s):
s = re.sub(r'\s+', '-', s)
if isinstance(s, unicode):
s = s.encode('utf8', 'ignore')
return urllib.quote(s)
def fetch_lyricscom(artist, title):
"""Fetch lyrics from Lyrics.com."""
@ -110,8 +114,9 @@ def fetch_lyricscom(artist, title):
lyrics = extract_text(html, '<div id="lyric_space">')
if lyrics:
lyrics, _ = lyrics.split('\n---\nLyrics powered by', 1)
return lyrics
parts = lyrics.split('\n---\nLyrics powered by', 1)
if parts:
return parts[0]
BACKENDS = [fetch_lyricswiki, fetch_lyricscom]
def get_lyrics(artist, title):