Merge lp:~michihenning/thumbnailer/zesty-test-suppression into lp:thumbnailer

[Michi Henning]

Added zesty to list of distros for which we suppress Qt-related tests.
Fixed code to work with taglib 1.11, which breaks the behavior of the taglib 1.9 API.

Added zesty to list of distros for which we suppress Qt-related tests.

[James Henstridge (jamesh)]

Looks good, although we'll need to find a real solution soon as we begin to rely more on Xenial.

review: Approve

[Michi Henning (michihenning)]

Re-approving. The only change since James's approval is the merged changelog and that the builders have reverted back to leveldb 1.18.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-09-26 00:50:50 +0000
+++ CMakeLists.txt	2016-11-14 01:06:24 +0000
@@ -88,10 +88,8 @@
 if (${skip-dbus-tests})
     execute_process(COMMAND lsb_release -s -c OUTPUT_VARIABLE distro OUTPUT_STRIP_TRAILING_WHITESPACE)
     execute_process(COMMAND uname -m OUTPUT_VARIABLE arch OUTPUT_STRIP_TRAILING_WHITESPACE)
-    message("DISTRO: ${distro}")
-    message("ARCH:   ${arch}")
     if (
-            (${distro} STREQUAL "xenial" OR ${distro} STREQUAL "yakkety")
+            (${distro} STREQUAL "xenial" OR ${distro} STREQUAL "yakkety" OR ${distro} STREQUAL "zesty")
             AND
             (${arch} STREQUAL "aarch64" OR ${arch} STREQUAL "ppc" OR ${arch} STREQUAL "ppc64le")
        )
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-11-14 00:40:33 +0000
+++ debian/changelog	2016-11-14 01:06:24 +0000
@@ -1,3 +1,11 @@
+thumbnailer (2.4+16.10.20160926.2-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Added zesty to list of distros for which we suppress Qt tests.
+  * Fixed code to work with taglib 1.11, which breaks the behavior
+    of the taglib 1.9 API.
+
+ -- Michi Henning <[e-mail]>  Mon, 14 Nov 2016 10:42:27 +1000
+
 thumbnailer (2.4+16.10.20160926.2-0ubuntu2) zesty; urgency=high
 
   * No change rebuild against boost1.62.
 
=== modified file 'src/local_album_art.cpp'
--- src/local_album_art.cpp	2016-02-24 06:56:01 +0000
+++ src/local_album_art.cpp	2016-11-14 01:06:24 +0000
@@ -18,7 +18,12 @@
 
 #include <internal/local_album_art.h>
 
+#include <taglib/taglib.h>
+
+#if TAGLIB_MAJOR_VERSION == 1 && TAGLIB_MINOR_VERSION <= 9
+#define TAGLIB_1_9 1
 #include <QByteArray>
+#endif
 
 #include <taglib/attachedpictureframe.h>
 #include <taglib/fileref.h>
@@ -179,6 +184,11 @@
     return dynamic_cast<TagLib::Ogg::XiphComment*>(fileref_.tag());
 }
 
+namespace
+{
+
+#if TAGLIB_1_9
+
 // Decode base_64 string into a QByteArray
 
 QByteArray decode_b64(TagLib::String const& base_64)
@@ -210,6 +220,8 @@
     return unique_ptr<TagLib::FLAC::Picture>(new TagLib::FLAC::Picture(byte_vector));
 }
 
+#endif
+
 // Helper function to pull cover (or other) art from a TagLib::FLAC::Picture.
 // Returns true if an image was extracted and that image is the front cover.
 // Otherwise, returns false and the art string is either set to some other
@@ -246,6 +258,8 @@
     return false;
 }
 
+}  // namespace
+
 string OggExtractor::get_album_art() const
 {
     string art;
@@ -253,6 +267,8 @@
     auto const xc = get_xiph_comment();
     if (xc)
     {
+#if TAGLIB_1_9
+        // taglib 1.11 added a new API, and broke the behavior of the existing one.
         auto const& map = xc->fieldListMap();
         auto it = map.find("METADATA_BLOCK_PICTURE");
         if (it != map.end())
@@ -276,6 +292,16 @@
                 art = decode_b64(it->second.front()).toStdString();
             }
         }
+#else
+        auto piclist = xc->pictureList();
+        for (auto const& pic : piclist)
+        {
+            if (extract_flac_art(pic, art))
+            {
+                break;
+            }
+        }
+#endif
     }
 
     return art;