mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

outsourced lyrics fetching

Browse Source
This commit is contained in:
Martin Wagner
2020-09-23 12:01:10 +02:00
parent 0bc5a7d46a
commit 48d54779a5
3 changed files with 134 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
bin/mpdevil
View File

@ -23,8 +23,6 @@ gi.require_version('Gtk', '3.0')
gi.require_version('Notify', '0.7')
from gi.repository import Gtk, Gio, Gdk, GdkPixbuf, Pango, GObject, GLib, Notify
from mpd import MPDClient, base as MPDBase
import requests
from bs4 import BeautifulSoup, Comment
import threading
import locale
import gettext
@ -34,6 +32,7 @@ import datetime
import os
import sys
import re
from mpdevil.lyrics import LyricsHelper
# MPRIS modules
import dbus
@ -2420,6 +2419,7 @@ class LyricsWindow(FocusFrame):
self._settings=settings
self._client=client
self._displayed_song_file=None
self._lyrics_helper=LyricsHelper(debug=False)
# text view
self._text_view=Gtk.TextView(
@ -2466,7 +2466,9 @@ class LyricsWindow(FocusFrame):
def _display_lyrics(self, current_song):
GLib.idle_add(self._text_buffer.set_text, _("searching..."), -1)
text=self._get_lyrics(current_song["artist"], current_song["title"])
text=self._lyrics_helper.get_lyrics(current_song["artist"], current_song["title"])
if text is None:
text=_("lyrics not found")
GLib.idle_add(self._text_buffer.set_text, text, -1)
def _refresh(self, *args):
@ -2482,73 +2484,6 @@ class LyricsWindow(FocusFrame):
)
update_thread.start()
def _get_lyrics_lyriki(self, singer, song):
# print("lyriki")
replaces=((' ', '_'),('.', '_'),('@', '_'),(',', '_'),(';', '_'),('&', '_'),('\\', '_'),('/', '_'),('"', '_'))
for char1, char2 in replaces:
singer.replace(char1, char2)
song.replace(char1, char2)
r=requests.get('http://www.lyriki.com/{0}:{1}'.format(singer,song))
s=BeautifulSoup(r.text)
lyrics=s.p
if lyrics is None:
raise ValueError("Not found")
elif str(lyrics).startswith("<p>There is currently no text in this page."):
raise ValueError("Not found")
output=str(lyrics)[3:-4].replace('\n','').replace('<br/>','\n')
return output
def _get_lyrics_songlyrics(self, singer, song):
# print("songlyrics")
replaces=((' ', '-'),('.', '-'),('_', '-'),('@', '-'),(',', '-'),(';', '-'),('&', '-'),('\\', '-'),('/', '-'),('"', '-'))
for char1, char2 in replaces:
singer.replace(char1, char2)
song.replace(char1, char2)
r=requests.get('https://www.songlyrics.com/{0}/{1}-lyrics/'.format(singer,song))
s=BeautifulSoup(r.text)
lyrics=s.find(id="songLyricsDiv")
if lyrics is None:
raise ValueError("Not found")
elif str(lyrics)[58:-4].startswith("Sorry, we have no"):
raise ValueError("Not found")
output=str(lyrics)[58:-4].replace('\n','').replace('\r','').replace(' /', '').replace('<br/>','\n')
return output
def _get_lyrics_letras(self, singer, song):
# print("letras")
replaces=((' ', '+'),('.', '_'),('@', '_'),(',', '_'),(';', '_'),('&', '_'),('\\', '_'),('/', '_'),('"', '_'))
for char1, char2 in replaces:
singer.replace(char1, char2)
song.replace(char1, char2)
r=requests.get('https://www.letras.mus.br/winamp.php?musica={1}&artista={0}'.format(singer,song))
s=BeautifulSoup(r.text)
s=s.find(id="letra-cnt")
if s is None:
raise ValueError("Not found")
pragraphs=[i for i in s.children][2:-1] # remove unneded pragraphs
lyrics=""
for p in pragraphs:
for line in p.stripped_strings:
lyrics+=line+'\n'
lyrics+='\n'
output=lyrics[:-2] # omit last two newlines
if output != "": # assume song is instrumental when lyrics are empty
return output
else:
return "Instrumental"
def _get_lyrics(self, singer, song):
# print("fetching lyrics for '"+singer+"' - '"+song+"'")
providers=[self._get_lyrics_letras, self._get_lyrics_lyriki, self._get_lyrics_songlyrics]
text=_("lyrics not found")
for provider in providers:
try:
text=provider(singer, song)
break
except ValueError:
pass
return text
def _on_disconnected(self, *args):
self._displayed_song_file=None
self._text_buffer.set_text("", -1)