[gnome-music/wip/mschraal/core] coremodel: Rename search_source to search_wrapper
- From: Marinus Schraal <mschraal src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/wip/mschraal/core] coremodel: Rename search_source to search_wrapper
- Date: Sat, 13 Jul 2019 22:19:36 +0000 (UTC)
commit bcbc94cf152021e20b7e70f1d69aff77de1df4db
Author: Marinus Schraal <mschraal gnome org>
Date: Fri Jul 12 20:59:23 2019 +0200
coremodel: Rename search_source to search_wrapper
gnomemusic/coregrilo.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gnomemusic/coregrilo.py b/gnomemusic/coregrilo.py
index b71542a8..7ca7a9e8 100644
--- a/gnomemusic/coregrilo.py
+++ b/gnomemusic/coregrilo.py
@@ -26,7 +26,7 @@ class CoreGrilo(GObject.GObject):
self._coremodel = coremodel
self._coreselection = coreselection
- self._search_sources = {}
+ self._search_wrappers = {}
self._wrappers = {}
Grl.init(None)
@@ -59,10 +59,10 @@ class CoreGrilo(GObject.GObject):
# source, self._coremodel, self._coreselection, self)
# self._wrappers.append(new_wrapper)
print("wrapper", new_wrapper)
- elif (source.supported_operations() & Grl.SupportedOps.SEARCH
+ elif (source.props.source_id not in self._search_wrappers.keys()
and source.get_supported_media() & Grl.MediaType.AUDIO
- and source.props.source_id not in self._search_sources.keys()):
- self._search_sources[source.props.source_id] = GrlSearchWrapper(
+ and source.supported_operations() & Grl.SupportedOps.SEARCH):
+ self._search_wrappers[source.props.source_id] = GrlSearchWrapper(
source, self._coremodel, self._coreselection, self)
print("search source", source)
@@ -71,7 +71,7 @@ class CoreGrilo(GObject.GObject):
print("removed,", source.props.source_id)
# FIXME: Only removes search sources atm.
- self._search_sources.pop(source.props.source_id, None)
+ self._search_wrappers.pop(source.props.source_id, None)
def get_artist_albums(self, artist, filter_model):
for wrapper in self._wrappers.values():
@@ -117,5 +117,5 @@ class CoreGrilo(GObject.GObject):
def search(self, text):
for wrapper in self._wrappers.values():
wrapper.search(text)
- for wrapper in self._search_sources.values():
+ for wrapper in self._search_wrappers.values():
wrapper.search(text)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]