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

small review of try, except

Browse Source
This commit is contained in:
Martin Wagner 2020-07-15 22:39:26 +02:00
parent fc06d84a5b
commit 58b563c1d8
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/mpdevil.py
View File

@ -1623,7 +1623,7 @@ class AlbumIconView(Gtk.IconView):
else: else:
GLib.idle_add(self.emit, "done") GLib.idle_add(self.emit, "done")
return return
except: except MPDBase.ConnectionError:
GLib.idle_add(self.emit, "done") GLib.idle_add(self.emit, "done")
return return
# display albums # display albums
@ -1872,7 +1872,7 @@ class Browser(Gtk.Paned):
def search_started(self): def search_started(self):
return self.search.started() return self.search.started()
def back_to_album(self, *args): def back_to_album(self, *args): # TODO
try: # since this can still be running when the connection is lost, various exceptions can occur try: # since this can still be running when the connection is lost, various exceptions can occur
song=ClientHelper.song_to_first_str_dict(self.client.wrapped_call("currentsong")) song=ClientHelper.song_to_first_str_dict(self.client.wrapped_call("currentsong"))
try: try:
@ -3449,10 +3449,14 @@ class MainWindow(Gtk.ApplicationWindow):
self.client.start() # connect client self.client.start() # connect client
def on_song_changed(self, *args): def on_song_changed(self, *args):
try: song=self.client.wrapped_call("currentsong")
song=self.client.wrapped_call("currentsong") if song == {}:
if song == {}: if self.use_csd:
raise ValueError("Song out of range") self.header_bar.set_title("mpdevil")
self.header_bar.set_subtitle("")
else:
self.set_title("mpdevil")
else:
song=ClientHelper.extend_song_for_display(ClientHelper.song_to_str_dict(song)) song=ClientHelper.extend_song_for_display(ClientHelper.song_to_str_dict(song))
if song["date"] != "": if song["date"] != "":
date=" ("+song["date"]+")" date=" ("+song["date"]+")"
@ -3469,12 +3473,6 @@ class MainWindow(Gtk.ApplicationWindow):
pixbuf=Cover(lib_path=self.settings.get_value("paths")[self.settings.get_int("active-profile")], song_file=song["file"]).get_pixbuf(400) pixbuf=Cover(lib_path=self.settings.get_value("paths")[self.settings.get_int("active-profile")], song_file=song["file"]).get_pixbuf(400)
notify.set_image_from_pixbuf(pixbuf) notify.set_image_from_pixbuf(pixbuf)
notify.show() notify.show()
except:
if self.use_csd:
self.header_bar.set_title("mpdevil")
self.header_bar.set_subtitle("")
else:
self.set_title("mpdevil")
def on_reconnected(self, *args): def on_reconnected(self, *args):
self.dbus_service.acquire_name() self.dbus_service.acquire_name()