Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-06 08:39:17 +01:00
Code Issues Projects Releases Wiki Activity

now returns correctly-capitalized tagtypes from "list", so gmpc's browsers work

Browse source 
--HG--
extra : convert_revision : svn%3A41726ec3-264d-0410-9c23-a9f1637257cc/trunk%40223
This commit is contained in:
adrian.sampson 2009-05-12 07:36:56 +00:00
parent 7aa8254ad9
commit dadc6b8b12
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
beets/player/bpd.py
View file

@ -930,16 +930,16 @@ class Server(BaseServer):
# Searching. # Searching.
tagtype_map = { tagtype_map = {
'artist': 'artist', 'Artist': 'artist',
'album': 'album', 'Album': 'album',
'title': 'title', 'Title': 'title',
'track': 'track', 'Track': 'track',
# Name? # Name?
'genre': 'genre', 'Genre': 'genre',
'date': 'year', 'Date': 'year',
'composer': 'composer', 'Composer': 'composer',
# Performer? # Performer?
'disc': 'disc', 'Disc': 'disc',
'filename': 'path', # Suspect. 'filename': 'path', # Suspect.
} }
@ -950,25 +950,28 @@ class Server(BaseServer):
for tag in self.tagtype_map: for tag in self.tagtype_map:
conn.send('tagtype: ' + tag) conn.send('tagtype: ' + tag)
def _tagtype_to_key(self, tag): def _tagtype_lookup(self, tag):
"""Uses `tagtype_map` to look up the beets column name for an """Uses `tagtype_map` to look up the beets column name for an
MPD tagtype (or throw an appropriate exception). MPD tagtype (or throw an appropriate exception). Returns both
the canonical name of the MPD tagtype and the beets column
name.
""" """
try: for test_tag, key in self.tagtype_map.items():
return self.tagtype_map[tag.lower()] # Match case-insensitively.
except KeyError: if test_tag.lower() == tag.lower():
return test_tag, key
raise BPDError(ERROR_UNKNOWN, 'no such tagtype') raise BPDError(ERROR_UNKNOWN, 'no such tagtype')
def cmd_search(self, conn, tag, value): def cmd_search(self, conn, tag, value):
"""Perform a substring match in a specific column.""" """Perform a substring match in a specific column."""
key = self._tagtype_to_key(tag) _, key = self._tagtype_lookup(tag)
query = beets.library.SubstringQuery(key, value) query = beets.library.SubstringQuery(key, value)
for item in self.lib.get(query): for item in self.lib.get(query):
conn.send(*self._item_info(item)) conn.send(*self._item_info(item))
def cmd_find(self, conn, tag, value): def cmd_find(self, conn, tag, value):
"""Perform an exact match in a specific column.""" """Perform an exact match in a specific column."""
key = self._tagtype_to_key(tag) _, key = self._tagtype_lookup(tag)
query = beets.library.MatchQuery(key, value) query = beets.library.MatchQuery(key, value)
for item in self.lib.get(query): for item in self.lib.get(query):
conn.send(*self._item_info(item)) conn.send(*self._item_info(item))
@ -977,9 +980,9 @@ class Server(BaseServer):
"""List distinct metadata values for show_tag, possibly """List distinct metadata values for show_tag, possibly
filtered by matching match_tag to match_term. filtered by matching match_tag to match_term.
""" """
show_key = self._tagtype_to_key(show_tag) show_tag_canon, show_key = self._tagtype_lookup(show_tag)
if match_tag and match_term: if match_tag and match_term:
match_key = self._tagtype_to_key(match_tag) _, match_key = self._tagtype_lookup(match_tag)
query = beets.library.MatchQuery(match_key, match_term) query = beets.library.MatchQuery(match_key, match_term)
else: else:
query = beets.library.TrueQuery() query = beets.library.TrueQuery()
@ -991,13 +994,13 @@ class Server(BaseServer):
c.execute(statement, subvals) c.execute(statement, subvals)
for row in c: for row in c:
conn.send(show_tag + ': ' + unicode(row[0])) conn.send(show_tag_canon + ': ' + unicode(row[0]))
def cmd_count(self, conn, tag, value): def cmd_count(self, conn, tag, value):
"""Returns the number and total time of songs matching the """Returns the number and total time of songs matching the
tag/value query. tag/value query.
""" """
key = self._tagtype_to_key(tag) _, key = self._tagtype_lookup(tag)
query = beets.library.MatchQuery(key, value) query = beets.library.MatchQuery(key, value)
songs, playtime = query.count(self.lib) songs, playtime = query.count(self.lib)
conn.send('songs: ' + str(songs), conn.send('songs: ' + str(songs),