Extract generic ALBUMARTIST tag

gerbera · May 2, 2017 · 0f280a2 · 0f280a2
1 parent cac07c7
commit 0f280a2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/metadata/taglib_handler.cc b/src/metadata/taglib_handler.cc
@@ -33,6 +33,7 @@
 #ifdef HAVE_TAGLIB
 
 
+#include <taglib/tpropertymap.h>
 #include <taglib/attachedpictureframe.h>
 #include <taglib/aifffile.h>
 #include <taglib/apefile.h>
@@ -60,7 +61,7 @@ TagLibHandler::TagLibHandler() : MetadataHandler()
 {
 }
 
-static void addField(metadata_fields_t field, const TagLib::Tag* tag, Ref<CdsItem> item)
+static void addField(metadata_fields_t field, const TagLib::File& file, const TagLib::Tag* tag, Ref<CdsItem> item)
 {
     if (tag == nullptr)
         return;
@@ -71,6 +72,7 @@ static void addField(metadata_fields_t field, const TagLib::Tag* tag, Ref<CdsIte
     Ref<StringConverter> sc = StringConverter::i2i(); // sure is sure
 
     TagLib::String val;
+    TagLib::StringList list;
     String value;
     unsigned int i;
 
@@ -108,6 +110,16 @@ static void addField(metadata_fields_t field, const TagLib::Tag* tag, Ref<CdsIte
         } else
             return;
         break;
+    case M_ALBUMARTIST:
+        // we have to use file.properties() instead of tag->properties()
+        // because the latter returns incomplete properties
+        // https://mail.kde.org/pipermail/taglib-devel/2015-May/002729.html
+        list = file.properties()["ALBUMARTIST"];
+        if (!list.isEmpty())
+            val = list[0];
+        else
+            return;
+        break;
     default:
         return;
     }
@@ -131,7 +143,7 @@ void TagLibHandler::populateGenericTags(Ref<CdsItem> item, const TagLib::File& f
     const TagLib::Tag* tag = file.tag();
 
     for (int i = 0; i < M_MAX; i++)
-        addField((metadata_fields_t)i, tag, item);
+        addField((metadata_fields_t)i, file, tag, item);
 
     int temp;
 

diff --git a/src/metadata_handler.cc b/src/metadata_handler.cc
@@ -71,6 +71,7 @@ mt_key MT_KEYS[] = {
     { "M_RATING", "upnp:rating"},
     { "M_ACTOR", "upnp:actor"},
     { "M_PRODUCER", "upnp:producer"},
+    { "M_ALBUMARTIST", "upnp:artist@role[AlbumArtist]"},
 };
 
 res_key RES_KEYS[] = {

diff --git a/src/metadata_handler.h b/src/metadata_handler.h
@@ -93,6 +93,7 @@ typedef enum
     M_RATING,
     M_ACTOR,
     M_PRODUCER,
+    M_ALBUMARTIST,
 
     M_MAX
 } metadata_fields_t; 

diff --git a/src/mxml/element.cc b/src/mxml/element.cc
@@ -355,7 +355,22 @@ void Element::setText(String str, enum mxml_value_type type)
 
 void Element::appendTextChild(String name, String text, enum mxml_value_type type)
 {
+    String attr;
+    String val;
+    int i, j;
+
+    // name@attr[val] => <name attr="val">
+    if (((i = name.index('@')) > 0)
+        && ((j = name.index(i + 1, '[')) > 0)
+        && (name[name.length() - 1] == ']'))
+    {
+        attr = name.substring(i + 1, j - i - 1);
+        val = name.substring(j + 1, name.length() - j - 2);
+        name = name.substring(0, i);
+    }
     Ref<Element> el = Ref<Element>(new Element(name));
+    if (attr.length() && val.length())
+        el->addAttribute(attr, val, type);
     el->setText(text, type);
     appendElementChild(el);
 }