Fixed some code style and comment

[mpd-sima.git] / sima / mpdclient.py

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index abc8282ea545e50722ecf0dcfcb4c70d79bdc05a..0c2e0b2223c8b59d59108eda4e3c40c3a5ee7bab 100644 (file)
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -33,7 +33,7 @@ from .utils.leven import levenshtein_ratio
 
 
 class PlayerError(Exception):
-    """Fatal error in poller."""
+    """Fatal error in the player."""
 
 
 # Some decorators
@@ -121,10 +121,16 @@ class MPD(MPDClient):
     """
     needed_cmds = ['status', 'stats', 'add', 'find',
                    'search', 'currentsong', 'ping']
-    needed_mbid_tags = {'Artist', 'Album', 'AlbumArtist',
-                        'Title', 'Track', 'Genre',
-                        'MUSICBRAINZ_ARTISTID', 'MUSICBRAINZ_ALBUMID',
+    needed_tags = {'Artist', 'Album', 'AlbumArtist', 'Title', 'Track'}
+    needed_mbid_tags = {'MUSICBRAINZ_ARTISTID', 'MUSICBRAINZ_ALBUMID',
                         'MUSICBRAINZ_ALBUMARTISTID', 'MUSICBRAINZ_TRACKID'}
+    MPD_supported_tags = {'Artist', 'ArtistSort', 'Album', 'AlbumSort', 'AlbumArtist',
+                          'AlbumArtistSort', 'Title', 'Track', 'Name', 'Genre',
+                          'Date', 'OriginalDate', 'Composer', 'Performer',
+                          'Conductor', 'Work', 'Grouping', 'Disc', 'Label',
+                          'MUSICBRAINZ_ARTISTID', 'MUSICBRAINZ_ALBUMID',
+                          'MUSICBRAINZ_ALBUMARTISTID', 'MUSICBRAINZ_TRACKID',
+                          'MUSICBRAINZ_RELEASETRACKID', 'MUSICBRAINZ_WORKID'}
     database = None
 
     def __init__(self, daemon):
@@ -181,10 +187,18 @@ class MPD(MPDClient):
                 raise PlayerError('Could connect to "%s", '
                                   'but command "%s" not available' %
                                   (host, cmd))
-        # Controls use of MusicBrainzIdentifier
         self.tagtypes('clear')
+        for tag in MPD.needed_tags:
+            self.tagtypes('enable', tag)
+        tt = set(map(str.lower, self.tagtypes()))
+        needed_tags = set(map(str.lower, MPD.needed_tags))
+        if len(needed_tags & tt) != len(MPD.needed_tags):
+            self.log.warning('MPD exposes: %s', tt)
+            self.log.warning('Tags needed: %s', needed_tags)
+            raise PlayerError('Missing mandatory metadata!')
         for tag in MPD.needed_mbid_tags:
             self.tagtypes('enable', tag)
+        # Controls use of MusicBrainzIdentifier
         if self.daemon.config.get('sima', 'musicbrainzid'):
             tt = set(self.tagtypes())
             if len(MPD.needed_mbid_tags & tt) != len(MPD.needed_mbid_tags):
@@ -411,11 +425,11 @@ class MPD(MPDClient):
             if SimaStr(artist.name) == fuzz:
                 found = True
                 artist.add_alias(fuzz)
-                self.log.info('"%s" quite probably matches "%s" (SimaStr)',
-                              fuzz, artist)
+                self.log.debug('"%s" quite probably matches "%s" (SimaStr)',
+                               fuzz, artist)
         if found:
             if artist.aliases:
-                self.log.debug('Found aliases: %s', '/'.join(artist.names))
+                self.log.info('Found aliases: %s', '/'.join(artist.names))
             return artist
         return None