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

fixed race condition

Browse Source
This commit is contained in:
Martin Wagner 2020-08-15 11:56:44 +02:00
parent c4122a8846
commit 211cf2ee9f
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/mpdevil.py
View File

@ -804,8 +804,6 @@ class MpdEventEmitter(GObject.Object):
class Client(MPDClient): class Client(MPDClient):
def __init__(self, settings): def __init__(self, settings):
MPDClient.__init__(self) MPDClient.__init__(self)
self.settings=settings
self.settings.connect("changed::active-profile", self.on_settings_changed)
# adding vars # adding vars
self.settings=settings self.settings=settings
@ -814,6 +812,9 @@ class Client(MPDClient):
self.current_file=None self.current_file=None
#connect
self.settings.connect("changed::active-profile", self.on_settings_changed)
def wrapped_call(self, name, *args): def wrapped_call(self, name, *args):
try: try:
func=getattr(self, name) func=getattr(self, name)
@ -823,6 +824,7 @@ class Client(MPDClient):
def start(self): def start(self):
if self.disconnected_loop(): if self.disconnected_loop():
self.emitter.emit("disconnected")
self.disconnected_timeout_id=GLib.timeout_add(1000, self.disconnected_loop) self.disconnected_timeout_id=GLib.timeout_add(1000, self.disconnected_loop)
def connected(self): def connected(self):
@ -905,7 +907,6 @@ class Client(MPDClient):
self.emitter.emit(key, True) self.emitter.emit(key, True)
else: else:
self.emitter.emit(key, False) self.emitter.emit(key, False)
diff=set(self.last_status)-set(status) diff=set(self.last_status)-set(status)
if "songid" in diff: if "songid" in diff:
self.emitter.emit("current_song_changed") self.emitter.emit("current_song_changed")
@ -913,9 +914,8 @@ class Client(MPDClient):
self.emitter.emit("volume_changed", 0) self.emitter.emit("volume_changed", 0)
if "updating_db" in diff: if "updating_db" in diff:
self.emitter.emit("update") self.emitter.emit("update")
self.last_status=status self.last_status=status
except: # (MPDBase.ConnectionError, ConnectionResetError) as e: except (MPDBase.ConnectionError, ConnectionResetError) as e:
self.disconnect() self.disconnect()
self.last_status={} self.last_status={}
self.emitter.emit("disconnected") self.emitter.emit("disconnected")
@ -1517,7 +1517,7 @@ class AlbumIconView(Gtk.IconView):
self.client=client self.client=client
self.genre_select=genre_select self.genre_select=genre_select
self.window=window self.window=window
self.stop_flag=True self.stop_flag=False
self.button_event=(None, None) self.button_event=(None, None)
# cover, display_label, display_label_artist, tooltip(titles), album, year, artist # cover, display_label, display_label_artist, tooltip(titles), album, year, artist
@ -1541,7 +1541,7 @@ class AlbumIconView(Gtk.IconView):
@GObject.Signal @GObject.Signal
def done(self): def done(self):
self.stop_flag=True self.stop_flag=False
def clear(self): def clear(self):
self.store.clear() self.store.clear()
@ -1566,7 +1566,6 @@ class AlbumIconView(Gtk.IconView):
return False # stop after one run return False # stop after one run
def populate(self, artists): def populate(self, artists):
self.stop_flag=False
GLib.idle_add(self.store.clear) GLib.idle_add(self.store.clear)
# show artist names if all albums are shown # show artist names if all albums are shown
if len(artists) > 1: if len(artists) > 1:
@ -1743,17 +1742,15 @@ class AlbumView(FocusFrame):
self.iconview.stop_flag=True self.iconview.stop_flag=True
self.pending.append(self.clear) self.pending.append(self.clear)
def refresh(self, artists): def refresh(self, artists=[]):
if not artists == []:
self.artists=artists self.artists=artists
if self.done: if self.done:
self.done=False self.done=False
self.populate()
elif not self.populate in self.pending:
self.iconview.stop_flag=True
self.pending.append(self.populate)
def populate(self):
self.iconview.populate(self.artists) self.iconview.populate(self.artists)
elif not self.refresh in self.pending:
self.iconview.stop_flag=True
self.pending.append(self.refresh)
def scroll_to_selected_album(self): def scroll_to_selected_album(self):
if self.done: if self.done: