add MetadataPicture, fill it with decoded PICTURE props

Author: whoozle

mtp/metadata/Metadata.cpp

@@ -1,4 +1,5 @@
 #include <mtp/metadata/Metadata.h>
+#include <mtp/log.h>
 
 #ifdef HAVE_TAGLIB
 #	include <fileref.h>
@@ -34,6 +35,28 @@ namespace mtp
 		meta->Genre 	= tag->genre().to8Bit(true);
 		meta->Year 		= tag->year();
 		meta->Track		= tag->track();
+
+		for(auto & props : tag->complexProperties("PICTURE"))
+		{
+			auto &picture = meta->Picture;
+			for(auto &kv : props)
+			{
+				auto &name = kv.first;
+				auto &value = kv.second;
+				if (name == "data") {
+					auto data = value.toByteVector();
+					picture.Data.assign(data.begin(), data.end());
+				} else if (name == "pictureType") {
+					picture.Type = value.toString().to8Bit(true);
+				} else if (name == "mimeType") {
+					picture.MimeType = value.toString().to8Bit(true);
+				} else if (name == "description") {
+					picture.Description = value.toString().to8Bit(true);
+				} else {
+					mtp::debug("unhandled PICTURE property ", name.toCString(true));
+				}
+			}
+		}
 		return meta;
 	}
 

mtp/metadata/Metadata.h

@@ -2,6 +2,7 @@
 #define AFTL_MTP_METADATA_METADATA_H
 
 #include <mtp/types.h>
+#include <mtp/ByteArray.h>
 #include <memory>
 #include <string>
 
@@ -10,6 +11,14 @@ namespace mtp
 	struct Metadata;
 	DECLARE_PTR(Metadata);
 
+	struct MetadataPicture
+	{
+		std::string     Type;
+		std::string		MimeType;
+		std::string		Description;
+		mtp::ByteArray	Data;
+	};
+
 	struct Metadata
 	{
 		std::string 	Title;
@@ -18,6 +27,7 @@ namespace mtp
 		std::string 	Genre;
 		unsigned		Year;
 		unsigned		Track;
+		MetadataPicture Picture;
 
 		static MetadataPtr Read(const std::string & path);
 	};