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

restrict tagtypes where possible

Browse Source
This commit is contained in:
Martin Wagner 2021-08-03 20:05:07 +02:00
parent 19c436fc07
commit 7a42fc9042
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/mpdevil
View File

@ -779,7 +779,7 @@ class Client(MPDClient):
return None return None
def get_albums(self, artist, genre): def get_albums(self, artist, genre):
self.tagtypes("clear") self.restrict_tagtypes()
albums=[] albums=[]
artist_type=self._settings.get_artist_type() artist_type=self._settings.get_artist_type()
if genre is None: if genre is None:
@ -838,6 +838,13 @@ class Client(MPDClient):
else: else:
self.previous() self.previous()
def restrict_tagtypes(self, *tags):
self.command_list_ok_begin()
self.tagtypes("clear")
for tag in tags:
self.tagtypes("enable", tag)
self.command_list_end()
def _main_loop(self, *args): def _main_loop(self, *args):
try: try:
status=self.status() status=self.status()
@ -1775,7 +1782,9 @@ class AlbumPopover(Gtk.Popover):
genre_filter=() genre_filter=()
else: else:
genre_filter=("genre", genre) genre_filter=("genre", genre)
self._client.restrict_tagtypes("track", "title", "artist")
songs=self._client.find("album", album, "date", date, self._settings.get_artist_type(), album_artist, *genre_filter) songs=self._client.find("album", album, "date", date, self._settings.get_artist_type(), album_artist, *genre_filter)
self._client.tagtypes("all")
for s in songs: for s in songs:
song=ClientHelper.song_to_list_dict(ClientHelper.pepare_song_for_display(s)) song=ClientHelper.song_to_list_dict(ClientHelper.pepare_song_for_display(s))
track=song["track"][0] track=song["track"][0]
@ -1972,6 +1981,7 @@ class SearchWindow(Gtk.Box):
search_tag=self._tag_combo_box.get_active_text() search_tag=self._tag_combo_box.get_active_text()
search_text=self.search_entry.get_text() search_text=self.search_entry.get_text()
stripe_size=100 stripe_size=100
self._client.restrict_tagtypes("track", "title", "artist", "album")
try: # client cloud meanwhile disconnect try: # client cloud meanwhile disconnect
songs=self._client.search(search_tag, search_text, "window", f"0:{stripe_size}") songs=self._client.search(search_tag, search_text, "window", f"0:{stripe_size}")
except MPDBase.ConnectionError: except MPDBase.ConnectionError:
@ -2006,6 +2016,7 @@ class SearchWindow(Gtk.Box):
self._done_callback() self._done_callback()
return return
stripe_start+=stripe_size stripe_start+=stripe_size
self._client.tagtypes("all")
if hits > 0: if hits > 0:
self._action_bar.set_sensitive(True) self._action_bar.set_sensitive(True)
self._done_callback() self._done_callback()
@ -3013,11 +3024,13 @@ class PlaylistWindow(Gtk.Overlay):
self._store.handler_block(self._row_deleted) self._store.handler_block(self._row_deleted)
self._song_popover.popdown() self._song_popover.popdown()
self._unselect() self._unselect()
self._client.restrict_tagtypes("track", "disc", "title", "artist", "album", "date", "genre")
songs=[] songs=[]
if self._playlist_version is not None: if self._playlist_version is not None:
songs=self._client.plchanges(self._playlist_version) songs=self._client.plchanges(self._playlist_version)
else: else:
songs=self._client.playlistinfo() songs=self._client.playlistinfo()
self._client.tagtypes("all")
if songs != []: if songs != []:
self._treeview.freeze_child_notify() self._treeview.freeze_child_notify()
self._set_playlist_info("") self._set_playlist_info("")