fixed mpd import

This commit is contained in:
Martin Wagner 2022-03-16 23:03:58 +01:00
parent ddbd490de4
commit afb8dc4c0b

View File

@ -20,7 +20,7 @@
import gi 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, MPDError, CommandError
from html.parser import HTMLParser from html.parser import HTMLParser
import urllib.request import urllib.request
import urllib.parse import urllib.parse
@ -777,7 +777,7 @@ class Client(MPDClient):
current_song_file=self.currentsong()["file"] current_song_file=self.currentsong()["file"]
try: try:
self.delete((1,)) # delete all songs, but the first. bad song index possible self.delete((1,)) # delete all songs, but the first. bad song index possible
except MPDBase.CommandError: except CommandError:
pass pass
append() append()
duplicates=self.playlistfind("file", current_song_file) duplicates=self.playlistfind("file", current_song_file)
@ -968,7 +968,7 @@ class Client(MPDClient):
elif "audio" == key: elif "audio" == key:
self.emitter.emit("audio", None) self.emitter.emit("audio", None)
self._last_status=status self._last_status=status
except (MPDBase.ConnectionError, ConnectionResetError) as e: except (MPDError, ConnectionResetError) as e:
self.disconnect() self.disconnect()
self._last_status={} self._last_status={}
self.emitter.emit("disconnected") self.emitter.emit("disconnected")
@ -2605,7 +2605,7 @@ class PlaylistView(TreeView):
else: # delete else: # delete
self._client.delete(path) # bad song index possible self._client.delete(path) # bad song index possible
self._playlist_version=int(self._client.status()["playlist"]) self._playlist_version=int(self._client.status()["playlist"])
except MPDBase.CommandError as e: except CommandError as e:
self._playlist_version=None self._playlist_version=None
self._client.emitter.emit("playlist", int(self._client.status()["playlist"])) self._client.emitter.emit("playlist", int(self._client.status()["playlist"]))
raise e # propagate exception raise e # propagate exception