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

minor urllib usage fixes

Browse Source
This commit is contained in:
Martin Wagner 2022-03-16 00:21:24 +01:00
parent e64198b95a
commit 13d27b15fa
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mpdevil.py
View File

@ -21,9 +21,10 @@ import gi
gi.require_version("Gtk", "3.0") gi.require_version("Gtk", "3.0")
from gi.repository import Gtk, Gio, Gdk, GdkPixbuf, Pango, GObject, GLib from gi.repository import Gtk, Gio, Gdk, GdkPixbuf, Pango, GObject, GLib
from mpd import MPDClient, base as MPDBase from mpd import MPDClient, base as MPDBase
from urllib import request
from urllib.error import URLError
from html.parser import HTMLParser from html.parser import HTMLParser
import urllib.request
import urllib.parse
import urllib.error
import threading import threading
import functools import functools
import itertools import itertools
@ -2795,12 +2796,10 @@ class LyricsWindow(Gtk.ScrolledWindow):
self._client.emitter.handler_block(self._song_changed) self._client.emitter.handler_block(self._song_changed)
def _get_lyrics(self, title, artist): def _get_lyrics(self, title, artist):
replaces=((" ", "+"),(".", "_"),("@", "_"),(",", "_"),(";", "_"),("&", "_"),("\\", "_"),("/", "_"),('"', "_"),("(", "_"),(")", "_")) title=urllib.parse.quote_plus(title)
for char1, char2 in replaces: artist=urllib.parse.quote_plus(artist)
title=title.replace(char1, char2)
artist=artist.replace(char1, char2)
parser=LetrasParser() parser=LetrasParser()
with request.urlopen(request.quote(f"https://www.letras.mus.br/winamp.php?musica={title}&artista={artist}", safe=':/')) as response: with urllib.request.urlopen(f"https://www.letras.mus.br/winamp.php?musica={title}&artista={artist}") as response:
parser.feed(response.read().decode("utf-8")) parser.feed(response.read().decode("utf-8"))
if not parser.text: if not parser.text:
raise ValueError("Not found") raise ValueError("Not found")
@ -2810,7 +2809,7 @@ class LyricsWindow(Gtk.ScrolledWindow):
idle_add(self._text_buffer.set_text, _("searching…"), -1) idle_add(self._text_buffer.set_text, _("searching…"), -1)
try: try:
text=self._get_lyrics(current_song["title"][0], current_song["artist"][0]) text=self._get_lyrics(current_song["title"][0], current_song["artist"][0])
except URLError: except urllib.error.URLError:
self._displayed_song_file=None self._displayed_song_file=None
text=_("connection error") text=_("connection error")
except ValueError: except ValueError: