X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fmeta.py;h=32bb883dca5dd861a0b1f21b9fec89055edfc3c7;hb=1b5cfb4c9187df891bd840b51c044d72ad0077d5;hp=1c3e511b48ea7faaf8eacef95d9177a0164aaa09;hpb=2eb13c85fe72ade75193b589748920615fbb22d2;p=mpd-sima.git

diff --git a/sima/lib/meta.py b/sima/lib/meta.py
index 1c3e511..32bb883 100644
--- a/sima/lib/meta.py
+++ b/sima/lib/meta.py
@@ -45,10 +45,13 @@ class Meta:
     """
 
     def __init__(self, **kwargs):
-        self.name = None
+        self.__name = None #TODO: should be immutable
         self.__mbid = None
+        self.__aliases = set()
         if 'name' not in kwargs or not kwargs.get('name'):
             raise MetaException('Need a "name" argument')
+        else:
+            self.__name = kwargs.pop('name')
         if 'mbid' in kwargs and kwargs.get('mbid'):
             is_uuid4(kwargs.get('mbid'))
             # mbid immutable as hash rests on
@@ -60,7 +63,7 @@ class Meta:
         return fmt.format(self.__class__.__name__, self)
 
     def __str__(self):
-        return self.name.__str__()
+        return self.__name.__str__()
 
     def __eq__(self, other):
         """
@@ -71,18 +74,40 @@ class Meta:
             if self.mbid and other.mbid:
                 return self.mbid == other.mbid
         else:
-            return other.__str__() == self.__str__()
+            return (other.__str__() == self.__str__() or
+                    other.__str__() in self.__aliases)
         return False
 
     def __hash__(self):
         if self.mbid:
             return hash(self.mbid)
-        return id(self)
+        return hash(self.__name)
+
+    def add_alias(self, other):
+        if getattr(other, '__str__', None):
+            if callable(other.__str__):
+                self.__aliases |= {other.__str__()}
+        elif isinstance(other, Meta):
+            self.__aliases |= other.__aliases
+        else:
+            raise MetaException('No __str__ method found in {!r}'.format(other))
+
+    @property
+    def name(self):
+        return self.__name
 
     @property
     def mbid(self):
         return self.__mbid
 
+    @property
+    def aliases(self):
+        return self.__aliases
+
+    @property
+    def names(self):
+        return self.__aliases | {self.__name,}
+
 
 class Album(Meta):
 
@@ -92,7 +117,7 @@ class Album(Meta):
 
 class Artist(Meta):
 
-    def __init__(self, name=None, **kwargs):
+    def __init__(self, name=None, mbid=None, **kwargs):
         """Artist object built from a mapping dict containing at least an
         "artist" entry:
             >>> trk = {'artist':'Art Name',
@@ -103,9 +128,8 @@ class Artist(Meta):
             >>> artobj0 = Artist(**trk)
             >>> artobj1 = Artist(name='Tool')
         """
-        self.__aliases = set()
         name = kwargs.get('artist', name)
-        mbid = kwargs.get('musicbrainz_artistid', None)
+        mbid = kwargs.get('musicbrainz_artistid', mbid)
         if (kwargs.get('albumartist', False) and
                 kwargs.get('albumartist') != 'Various Artists'):
             name = kwargs.get('albumartist').split(', ')[0]
@@ -114,18 +138,5 @@ class Artist(Meta):
             mbid = kwargs.get('musicbrainz_albumartistid').split(', ')[0]
         super().__init__(name=name, mbid=mbid)
 
-    def add_alias(self, other):
-        if getattr(other, '__str__', None):
-            if callable(other.__str__):
-                self.__aliases |= {other.__str__()}
-        elif isinstance(other, Artist):
-            self.__aliases |= other._Artist__aliases
-        else:
-            raise MetaException('No __str__ method found in {!r}'.format(other))
-
-    @property
-    def names(self):
-        return self.__aliases | {self.name,}
-
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab