Initial attachments support

Author: complexlogic

examples/matroskareader.cpp

@@ -2,40 +2,42 @@
 #include "matroskafile.h"
 #include "matroskatag.h"
 #include "matroskasimpletag.h"
+#include "matroskaattachments.h"
+#include "matroskaattachedfile.h"
 #include "tstring.h"
 #include "tutils.h"
 #include "tbytevector.h"
 #define GREEN_TEXT(s) "" s ""
-#define PRINT_PRETTY(label, value) printf("" GREEN_TEXT(label) ": %s\n", value)
+#define PRINT_PRETTY(label, value) printf("  " GREEN_TEXT(label) ": %s\n", value)
 
 int main(int argc, char *argv[])
 {
-  if (argc != 2) {
+  if(argc != 2) {
     printf("Usage: matroskareader FILE\n");
     return 1;
   }
   TagLib::Matroska::File file(argv[1]);
-  if (!file.isValid()) {
+  if(!file.isValid()) {
     printf("File is not valid\n");
     return 1;
   }
   auto tag = dynamic_cast<TagLib::Matroska::Tag*>(file.tag());
-  if (!tag) {
+  if(!tag) {
     printf("File has no tag\n");
     return 0;
   }
 
   const TagLib::Matroska::SimpleTagsList &list = tag->simpleTagsList();
-  printf("Found %i tags:\n\n", list.size());
+  printf("Found %u tag(s):\n", list.size());
 
-  for (TagLib::Matroska::SimpleTag *t : list) {
+  for(TagLib::Matroska::SimpleTag *t : list) {
     PRINT_PRETTY("Tag Name", t->name().toCString(true));
 
     TagLib::Matroska::SimpleTagString *tString = nullptr;
     TagLib::Matroska::SimpleTagBinary *tBinary = nullptr;
-    if ((tString = dynamic_cast<TagLib::Matroska::SimpleTagString*>(t)))
+    if((tString = dynamic_cast<TagLib::Matroska::SimpleTagString*>(t)))
       PRINT_PRETTY("Tag Value", tString->value().toCString(true));
-    else if ((tBinary = dynamic_cast<TagLib::Matroska::SimpleTagBinary*>(t)))
+    else if((tBinary = dynamic_cast<TagLib::Matroska::SimpleTagBinary*>(t)))
       PRINT_PRETTY("Tag Value", 
         TagLib::Utils::formatString("Binary with size %i", tBinary->value().size()).toCString(false)
       );
@@ -50,5 +52,26 @@ int main(int argc, char *argv[])
     printf("\n");
   }
 
+  TagLib::Matroska::Attachments *attachments = file.attachments();
+  if(attachments) {
+    const TagLib::Matroska::Attachments::AttachedFileList &list = attachments->attachedFileList();
+    printf("Found %u attachment(s)\n", list.size());
+    for(auto attachedFile : list) {
+      PRINT_PRETTY("Filename", attachedFile->fileName().toCString(true));
+      const TagLib::String &description = attachedFile->description();
+      PRINT_PRETTY("Description", !description.isEmpty() ? description.toCString(true) : "None");
+      const TagLib::String &mediaType = attachedFile->mediaType();
+      PRINT_PRETTY("Media Type", !mediaType.isEmpty() ? mediaType.toCString(false) : "None");
+      PRINT_PRETTY("Data Size",
+        TagLib::Utils::formatString("%u byte(s)",attachedFile->data().size()).toCString(false)
+      );
+      PRINT_PRETTY("UID",
+        TagLib::Utils::formatString("%llu",attachedFile->uid()).toCString(false)
+      );
+    }
+  }
+  else
+    printf("File has no attachments\n");
+
   return 0;
 }

examples/matroskawriter.cpp

@@ -2,17 +2,20 @@
 #include "matroskafile.h"
 #include "matroskatag.h"
 #include "matroskasimpletag.h"
+#include "matroskaattachments.h"
+#include "matroskaattachedfile.h"
+#include "tfilestream.h"
 #include "tstring.h"
 #include "tutils.h"
 
 int main(int argc, char *argv[])
 {
-  if (argc != 2) {
-    printf("Usage: matroskawriter FILE\n");
+  if(argc != 3) {
+    printf("Usage: matroskawriter FILE ARTWORK\n");
     return 1;
   }
   TagLib::Matroska::File file(argv[1]);
-  if (!file.isValid()) {
+  if(!file.isValid()) {
     printf("File is not valid\n");
     return 1;
   }
@@ -31,6 +34,19 @@ int main(int argc, char *argv[])
   simpleTag->setTargetTypeValue(TagLib::Matroska::SimpleTag::TargetTypeValue::Album);
   simpleTag->setValue("Test Value 2");
   tag->addSimpleTag(simpleTag);
+  tag->setTitle("Test title");
+  tag->setArtist("Test artist");
+  tag->setYear(1969);
+
+  TagLib::FileStream image(argv[2]);
+  auto data = image.readBlock(image.length());
+  auto attachments = file.attachments(true);
+  auto attachedFile = new TagLib::Matroska::AttachedFile();
+  attachedFile->setFileName("cover.jpg");
+  attachedFile->setMediaType("image/jpeg");
+  attachedFile->setData(data);
+  //attachedFile->setUID(5081000385627515072ull);
+  attachments->addAttachedFile(attachedFile);
 
   file.save();
 

taglib/CMakeLists.txt

@@ -92,9 +92,12 @@ set(tag_PUBLIC_HDRS
   toolkit/tpropertymap.h
   toolkit/tdebuglistener.h
   toolkit/tversionnumber.h
+  matroska/matroskaattachedfile.h
+  matroska/matroskaattachments.h
   matroska/matroskafile.h
   matroska/matroskatag.h
   matroska/matroskasimpletag.h
+  matroska/matroskaelement.h
   mpeg/mpegfile.h
   mpeg/mpegproperties.h
   mpeg/mpegheader.h
@@ -227,8 +230,10 @@ if(WITH_SHORTEN)
 endif()
 
 set(tag_PRIVATE_HDRS
+  matroska/ebml/ebmlbinaryelement.h
   matroska/ebml/ebmlelement.h
   matroska/ebml/ebmlmasterelement.h
+  matroska/ebml/ebmlmkattachments.h
   matroska/ebml/ebmlmksegment.h
   matroska/ebml/ebmlmktags.h
   matroska/ebml/ebmlstringelement.h
@@ -239,14 +244,19 @@ set(tag_PRIVATE_HDRS
 set(tag_HDRS ${tag_PUBLIC_HDRS} ${tag_PRIVATE_HDRS})
 
 set(matroska_SRCS
+  matroska/matroskaattachedfile.cpp
+  matroska/matroskaattachments.cpp
+  matroska/matroskaelement.cpp
   matroska/matroskafile.cpp
   matroska/matroskasimpletag.cpp
   matroska/matroskatag.cpp
 )
 
 set(ebml_SRCS
+  matroska/ebml/ebmlbinaryelement.cpp
   matroska/ebml/ebmlelement.cpp
   matroska/ebml/ebmlmasterelement.cpp
+  matroska/ebml/ebmlmkattachments.cpp
   matroska/ebml/ebmlmksegment.cpp
   matroska/ebml/ebmlmktags.cpp
   matroska/ebml/ebmlstringelement.cpp

taglib/matroska/ebml/ebmlbinaryelement.cpp

@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#include "ebmlbinaryelement.h"
+#include "tfile.h"
+#include "tbytevector.h"
+#include "tdebug.h"
+#include <string>
+
+using namespace TagLib;
+
+bool EBML::BinaryElement::read(TagLib::File &file)
+{
+  value = file.readBlock(dataSize);
+  if(value.size() != dataSize) {
+    debug("Failed to read binary element");
+    return false;
+  }
+  return true;
+}
+
+ByteVector EBML::BinaryElement::render()
+{
+  ByteVector buffer = renderId();
+  dataSize = value.size();
+  buffer.append(renderVINT(dataSize, 0));
+  buffer.append(value);
+  return buffer;
+}

taglib/matroska/ebml/ebmlbinaryelement.h

@@ -0,0 +1,54 @@
+/***************************************************************************
+ *   This library is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU Lesser General Public License version   *
+ *   2.1 as published by the Free Software Foundation.                     *
+ *                                                                         *
+ *   This library is distributed in the hope that it will be useful, but   *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   Lesser General Public License for more details.                       *
+ *                                                                         *
+ *   You should have received a copy of the GNU Lesser General Public      *
+ *   License along with this library; if not, write to the Free Software   *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
+ *   02110-1301  USA                                                       *
+ *                                                                         *
+ *   Alternatively, this file is available under the Mozilla Public        *
+ *   License Version 1.1.  You may obtain a copy of the License at         *
+ *   http://www.mozilla.org/MPL/                                           *
+ ***************************************************************************/
+
+#ifndef TAGLIB_EBMLBINARYELEMENT_H
+#define TAGLIB_EBMLBINARYELEMENT_H
+#ifndef DO_NOT_DOCUMENT
+
+#include <cstdint>
+#include "ebmlelement.h"
+#include "ebmlutils.h"
+#include "tbytevector.h"
+
+namespace TagLib {
+  class File;
+  namespace EBML {
+    class BinaryElement : public Element
+    {
+    public:
+      BinaryElement(Id id, int sizeLength, offset_t dataSize)
+      : Element(id, sizeLength, dataSize)
+      {}
+      BinaryElement(Id id)
+      : Element(id, 0, 0)
+      {}
+      const ByteVector& getValue() const { return value; }
+      void setValue(const ByteVector &value) { this->value = value; }
+      bool read(File &file) override;
+      ByteVector render() override;
+
+    private:
+      ByteVector value;
+    };
+  }
+}
+
+#endif
+#endif

taglib/matroska/ebml/ebmlelement.cpp

@@ -20,8 +20,10 @@
 
 #include "ebmlelement.h"
 #include "ebmlmasterelement.h"
+#include "ebmlbinaryelement.h"
 #include "ebmlmksegment.h"
 #include "ebmlmktags.h"
+#include "ebmlmkattachments.h"
 #include "ebmlstringelement.h"
 #include "ebmluintelement.h"
 #include "ebmlutils.h"
@@ -36,15 +38,16 @@ using namespace TagLib;
 EBML::Element* EBML::Element::factory(File &file)
 {
   // Get the element ID
+  offset_t offset = file.tell();
   Id id = readId(file);
-  if (!id) {
+  if(!id) {
     debug("Failed to parse EMBL ElementID");
     return nullptr;
   }
 
   // Get the size length and data length
   const auto& [sizeLength, dataSize] = readVINT<offset_t>(file);
-  if (!sizeLength)
+  if(!sizeLength)
     return nullptr;
 
   // Return the subclass
@@ -53,26 +56,37 @@ EBML::Element* EBML::Element::factory(File &file)
       return new Element(id, sizeLength, dataSize);
 
     case ElementIDs::MkSegment:
-      return new MkSegment(sizeLength, dataSize);
+      return new MkSegment(sizeLength, dataSize, offset);
 
     case ElementIDs::MkTags:
-      return new MkTags(sizeLength, dataSize);
+      return new MkTags(sizeLength, dataSize, offset);
+
+    case ElementIDs::MkAttachments:
+      return new MkAttachments(sizeLength, dataSize, offset);
 
     case ElementIDs::MkTag:
     case ElementIDs::MkTagTargets:
     case ElementIDs::MkSimpleTag:
-      return new MasterElement(id, sizeLength, dataSize);
+    case ElementIDs::MkAttachedFile:
+      return new MasterElement(id, sizeLength, dataSize, offset);
 
     case ElementIDs::MkTagName:
     case ElementIDs::MkTagString:
+    case ElementIDs::MkAttachedFileName:
+    case ElementIDs::MkAttachedFileDescription:
       return new UTF8StringElement(id, sizeLength, dataSize);
 
     case ElementIDs::MkTagLanguage:
+    case ElementIDs::MkAttachedFileMediaType:
       return new Latin1StringElement(id, sizeLength, dataSize);
 
     case ElementIDs::MkTagTargetTypeValue:
+    case ElementIDs::MkAttachedFileUID:
       return new UIntElement(id, sizeLength, dataSize);
 
+    case ElementIDs::MkAttachedFileData:
+      return new BinaryElement(id, sizeLength, dataSize);
+
     default:
       return new Element(id, sizeLength, dataSize);
   }
@@ -83,16 +97,16 @@ EBML::Element* EBML::Element::factory(File &file)
 EBML::Element::Id EBML::Element::readId(File &file)
 {
   auto buffer = file.readBlock(1);
-  if (buffer.size() != 1) {
+  if(buffer.size() != 1) {
     debug("Failed to read VINT size");
     return 0;
   }
   unsigned int nb_bytes = VINTSizeLength<4>(*buffer.begin());
-  if (!nb_bytes)
+  if(!nb_bytes)
     return 0;
-  if (nb_bytes > 1)
+  if(nb_bytes > 1)
     buffer.append(file.readBlock(nb_bytes - 1));
-  if (buffer.size() != nb_bytes) {
+  if(buffer.size() != nb_bytes) {
     debug("Failed to read VINT data");
     return 0;
   }