Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-09 10:05:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:beetbox/beets

Browse source
This commit is contained in:
Adrian Sampson 2016-04-25 19:50:29 -07:00
commit 698203eb84
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
beetsplug/lyrics.py
View file

@ -334,8 +334,8 @@ class LyricsWiki(SymbolsReplaced):
# Get the HTML fragment inside the appropriate HTML element and then
# extract the text from it.
html_frag = extract_text_in(unescape(html), u"<div class='lyricbox'>")
lyrics = scrape_lyrics_from_html(html_frag)
html_frag = extract_text_in(html, u"<div class='lyricbox'>")
lyrics = _scrape_strip_cruft(html_frag, True)
if lyrics and 'Unfortunately, we are not licensed' not in lyrics:
return lyrics

5
docs/reference/cli.rst
View file

@ -435,7 +435,10 @@ later on you will want to re-generate the script.
zsh
```
If you use zsh, take a look at the included `completion script`_.
If you use zsh, take a look at the included `completion script`_. The script
should be placed in a directory that is part of your ``fpath``, and `not`
sourced in your ``.zshrc``. Running ``echo $fpath`` will give you a list of
valid directories.
Another approach is to use zsh's bash completion compatibility. This snippet
defines some bash-specific functions to make this work without errors::