X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fmeta.py;h=5c439c5742df959d36f17b9488d1f0fd357db178;hb=f614be482ffd50db26939583fd43e8708c175b95;hp=2d78f2f67269cfedfb2898a2aa3f3e1e025bc21d;hpb=70bf86ca3f65a550436cdc70326cb8601f24e5a6;p=mpd-sima.git

diff --git a/sima/lib/meta.py b/sima/lib/meta.py
index 2d78f2f..5c439c5 100644
--- a/sima/lib/meta.py
+++ b/sima/lib/meta.py
@@ -21,6 +21,8 @@
 Defines some object to handle audio file metadata
 """
 
+import collections.abc  # python >= 3.3
+import logging
 import re
 
 UUID_RE = r'^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}$'
@@ -59,14 +61,19 @@ class Meta:
         self.__name = None #TODO: should be immutable
         self.__mbid = None
         self.__aliases = set()
+        self.log = logging.getLogger(__name__)
         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'))
+            try:
+                is_uuid4(kwargs.get('mbid'))
+                self.__mbid = kwargs.pop('mbid').lower()
+            except WrongUUID4:
+                self.log.warning('Wrong mbid {}:{}'.format(self.__name,
+                                                         kwargs.get('mbid')))
             # mbid immutable as hash rests on
-            self.__mbid = kwargs.pop('mbid')
         self.__dict__.update(**kwargs)
 
     def __repr__(self):
@@ -82,11 +89,12 @@ class Meta:
         """
         #if hasattr(other, 'mbid'):  # better isinstance?
         if isinstance(other, Meta) and self.mbid and other.mbid:
-            if self.mbid and other.mbid:
-                return self.mbid == other.mbid
-        else:
-            return (other.__str__() == self.__str__() or
-                    other.__str__() in self.__aliases)
+            return self.mbid == other.mbid
+        elif isinstance(other, Meta):
+            return bool(self.names & other.names)
+        elif getattr(other, '__str__', None):
+            # is other.__str__() in self.__name or self.__aliases
+            return other.__str__() in self.names
         return False
 
     def __hash__(self):
@@ -96,10 +104,11 @@ class Meta:
 
     def add_alias(self, other):
         if getattr(other, '__str__', None):
-            if callable(other.__str__):
+            if callable(other.__str__) and other.__str__() != self.name:
                 self.__aliases |= {other.__str__()}
         elif isinstance(other, Meta):
-            self.__aliases |= other.__aliases
+            if other.name != self.name:
+                self.__aliases |= other.__aliases
         else:
             raise MetaException('No __str__ method found in {!r}'.format(other))
 
@@ -140,7 +149,7 @@ class Artist(Meta):
             >>> artobj0 = Artist(**trk)
             >>> artobj1 = Artist(name='Tool')
         """
-        name = kwargs.get('artist', name)
+        name = kwargs.get('artist', name).split(', ')[0]
         mbid = kwargs.get('musicbrainz_artistid', mbid)
         if (kwargs.get('albumartist', False) and
                 kwargs.get('albumartist') != 'Various Artists'):
@@ -150,5 +159,29 @@ class Artist(Meta):
             mbid = kwargs.get('musicbrainz_albumartistid').split(', ')[0]
         super().__init__(name=name, mbid=mbid)
 
+class MetaContainer(collections.abc.Set):
+
+    def __init__(self, iterable):
+        self.elements = lst = []
+        for value in iterable:
+            if value not in lst:
+                lst.append(value)
+            else:
+                for inlst in lst:
+                    if value == inlst:
+                        inlst.add_alias(value)
+
+    def __iter__(self):
+        return iter(self.elements)
+
+    def __contains__(self, value):
+        return value in self.elements
+
+    def __len__(self):
+        return len(self.elements)
+
+    def __repr__(self):
+        return repr(self.elements)
+
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab