Changes - SailfishOS Open Build Service

Changes of Revision 14

[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/CMakeLists.txt
@@ -1,5 +1,5 @@ project(kfilemetadata) -set(PROJECT_VERSION "5.6.0") +set(PROJECT_VERSION "5.9.90") cmake_minimum_required(VERSION 2.8.12) @@ -17,7 +17,7 @@ include(ECMGenerateHeaders) set(KF5_VERSION "5.0.0") -set(REQUIRED_QT_VERSION "5.2.0") +set(REQUIRED_QT_VERSION "5.4.0") ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KFILEMETADATA @@ -33,7 +33,7 @@ URL "http://poppler.freedesktop.org" TYPE OPTIONAL PURPOSE "Support for PDF files") -find_package(Taglib) +find_package(Taglib 1.9) set_package_properties(Taglib PROPERTIES DESCRIPTION "Id3 tag reader" URL "http://developer.kde.org/~wheeler/taglib.html" TYPE OPTIONAL PURPOSE "Support for music metadata") @@ -58,6 +58,8 @@ # URL "https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" # TYPE OPTIONAL PURPOSE "Support for mobi metadata") +add_definitions(-DTRANSLATION_DOMAIN=\"kfilemetadata\") + add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) @@ -67,7 +69,6 @@ # Config files set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5FileMetaData") -add_definitions(-DTRANSLATION_DOMAIN=\"kfilemetadata\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) endif()
[-] [+]	Deleted	kfilemetadata-5.6.0.tar.xz/COPYING-CMAKE-SCRIPTS ^
@@ -1,22 +0,0 @@ -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/autotests/CMakeLists.txt ^
@@ -82,3 +82,16 @@ LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${EXIV2_LIBRARIES} ) endif() + +# +# TagLib +# +if(TAGLIB_FOUND) + include_directories(${TAGLIB_INCLUDES}) + + kde_enable_exceptions() + ecm_add_test(taglibextractortest.cpp ../src/extractors/taglibextractor.cpp + TEST_NAME "taglibextractortest" + LINK_LIBRARIES Qt5::Test KF5::FileMetaData ${TAGLIB_LIBRARIES} + ) +endif()
	Added	kfilemetadata-5.6.0.tar.xz/autotests/samplefiles/test.opus ^
[-] [+]	Added	kfilemetadata-5.6.0.tar.xz/autotests/taglibextractortest.cpp ^
@@ -0,0 +1,60 @@ +/* + * TagLibExtractor tests. + * + * Copyright (C) 2015 Juan Palacios <jpalaciosdev@gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * 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 + * + */ + +#include "taglibextractortest.h" +#include "simpleextractionresult.h" +#include "indexerextractortestsconfig.h" +#include "extractors/taglibextractor.h" + +#include <QDebug> +#include <QTest> +#include <QDir> + +using namespace KFileMetaData; + +QString TagLibExtractorTest::testFilePath(const QString& fileName) const +{ + return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName; +} + +void TagLibExtractorTest::test() +{ + QScopedPointer<ExtractorPlugin> plugin(new TagLibExtractor(this)); + + SimpleExtractionResult result(testFilePath("test.opus"), "audio/opus"); + plugin->extract(&result); + + QCOMPARE(result.types().size(), 1); + QCOMPARE(result.types().first(), Type::Audio); + + QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("Title"))); + QCOMPARE(result.properties().value(Property::Artist), QVariant(QStringLiteral("Artist"))); + QCOMPARE(result.properties().value(Property::Album), QVariant(QStringLiteral("Test"))); + QCOMPARE(result.properties().value(Property::AlbumArtist), QVariant(QStringLiteral("Album Artist"))); + QCOMPARE(result.properties().value(Property::Genre), QVariant(QStringLiteral("Genre"))); + QCOMPARE(result.properties().value(Property::Comment), QVariant(QStringLiteral("Comment"))); + QCOMPARE(result.properties().value(Property::Composer), QVariant(QStringLiteral("Composer"))); + QCOMPARE(result.properties().value(Property::TrackNumber).toInt(), 1); + QCOMPARE(result.properties().value(Property::ReleaseYear).toInt(), 2015); + QCOMPARE(result.properties().value(Property::Channels).toInt(), 1); +} + +QTEST_MAIN(TagLibExtractorTest)
[-] [+]	Added	kfilemetadata-5.6.0.tar.xz/autotests/taglibextractortest.h ^
@@ -0,0 +1,37 @@ +/* + * TagLibExtractor tests. + * + * Copyright (C) 2015 Juan Palacios <jpalaciosdev@gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * 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 + * + */ + +#ifndef TAGLIBEXTRACTORTEST_H +#define TAGLIBEXTRACTORTEST_H + +#include <QObject> + +class TagLibExtractorTest : public QObject +{ + Q_OBJECT +private: + QString testFilePath(const QString& fileName) const; + +private Q_SLOTS: + void test(); +}; + +#endif // TAGLIBEXTRACTORTEST_H
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/cmake/FindEPub.cmake ^
@@ -8,8 +8,29 @@ # Copyright (c) 2008, Pino Toscano, <pino@kde.org> # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. if (EPUB_INCLUDE_DIR AND EPUB_LIBRARIES)
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/cmake/FindExiv2.cmake ^
@@ -19,8 +19,29 @@ # Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org> # Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com> # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. # Support EXIV2_MIN_VERSION for compatibility: if(NOT Exiv2_FIND_VERSION)
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/cmake/FindFFmpeg.cmake ^
@@ -25,8 +25,29 @@ # Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org> # Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz> # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. include(FindPackageHandleStandardArgs)
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/cmake/FindLibraryWithDebug.cmake ^
@@ -6,8 +6,30 @@ # it has to be the second and third argument # Copyright (c) 2007, Christian Ehrlicher, <ch.ehrlicher@gmx.de> -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname)
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/cmake/FindPopplerQt5.cmake ^
@@ -12,8 +12,29 @@ # Copyright (c) 2006, Wilfried Huss, <wilfried.huss@gmx.at> # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. find_package(PkgConfig)
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/cmake/FindTaglib.cmake ^
@@ -2,13 +2,34 @@ # Once done this will define # # TAGLIB_FOUND - system has the taglib library -# TAGLIB_CFLAGS - the taglib cflags +# TAGLIB_INCLUDES - the taglib includes # TAGLIB_LIBRARIES - The libraries needed to use taglib # Copyright (c) 2006, Laurent Montel, <montel@kde.org> # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the University nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. if(NOT TAGLIB_MIN_VERSION) set(TAGLIB_MIN_VERSION "1.4") @@ -29,21 +50,15 @@ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) - if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - set(TAGLIB_FOUND FALSE) - else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) - - if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - set(TAGLIB_FOUND TRUE) - message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}") - endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - string(REGEX REPLACE " -I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") - endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) + + exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) + string(REGEX REPLACE " -I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Taglib FOUND_VAR TAGLIB_FOUND + REQUIRED_VARS TAGLIB_LIBRARIES TAGLIB_INCLUDES + VERSION_VAR TAGLIB_VERSION) mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) else(TAGLIBCONFIG_EXECUTABLE) @@ -68,18 +83,7 @@ ${LIB_INSTALL_DIR} ) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) endif(TAGLIBCONFIG_EXECUTABLE) - - -if(TAGLIB_FOUND) - if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) - message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") - endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) -else(TAGLIB_FOUND) - if(Taglib_FIND_REQUIRED) - message(FATAL_ERROR "Could not find Taglib") - endif(Taglib_FIND_REQUIRED) -endif(TAGLIB_FOUND) -
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/src/extractors/taglibextractor.cpp ^
@@ -32,6 +32,7 @@ #include <taglib.h> #include <tag.h> #include <vorbisfile.h> +#include <opusfile.h> #include <xiphcomment.h> #include <QDateTime> @@ -46,7 +47,7 @@ QStringList TagLibExtractor::mimetypes() const { QStringList types; - // MP3 FLAC, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files. + // MP3, FLAC, Vorbis, Opus, MPC, Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files. // MP3 types << QStringLiteral("audio/mpeg"); types << QStringLiteral("audio/mpeg3"); types << QStringLiteral("audio/x-mpeg"); @@ -57,9 +58,12 @@ // MPC types << QStringLiteral("audio/x-musepack"); - //OGG + // Vorbis types << QStringLiteral("audio/ogg"); types << QStringLiteral("audio/x-vorbis+ogg"); + // Opus + types << QStringLiteral("audio/opus"); types << QStringLiteral("audio/x-opus+ogg"); + // WAV types << QStringLiteral("audio/wav"); @@ -155,53 +159,78 @@ } } - // Handling multiple tags in FLAC files. - if (mimeType == "audio/flac") { - TagLib::FLAC::File flacFile(fileUrl.toUtf8().data(), true); - if (flacFile.xiphComment() && !flacFile.xiphComment()->isEmpty()) { - TagLib::Ogg::FieldListMap lstFLAC = flacFile.xiphComment()->fieldListMap(); - TagLib::Ogg::FieldListMap::ConstIterator itFLAC; + // Handling multiple tags in Ogg containers. + { + TagLib::Ogg::FieldListMap lstOgg; + + // FLAC files. + if (mimeType == "audio/flac") { + TagLib::FLAC::File flacFile(fileUrl.toUtf8().data(), true); + if (flacFile.xiphComment() && !flacFile.xiphComment()->isEmpty()) { + lstOgg = flacFile.xiphComment()->fieldListMap(); + } + } + + // Vorbis files. + if (mimeType == "audio/ogg" \|\| mimeType == "audio/x-vorbis+ogg") { + TagLib::Ogg::Vorbis::File oggFile(fileUrl.toUtf8().data(), true); + if (oggFile.tag() && !oggFile.tag()->isEmpty()) { + lstOgg = oggFile.tag()->fieldListMap(); + } + } + + // Opus files. + if (mimeType == "audio/opus" \|\| mimeType == "audio/x-opus+ogg") { + TagLib::Ogg::Opus::File opusFile(fileUrl.toUtf8().data(), true); + if (opusFile.tag() && !opusFile.tag()->isEmpty()) { + lstOgg = opusFile.tag()->fieldListMap(); + } + } + + // Handling OGG container tags. + if (!lstOgg.isEmpty()) { + TagLib::Ogg::FieldListMap::ConstIterator itOgg; // Artist. - itFLAC = lstFLAC.find("ARTIST"); - if (itFLAC != lstFLAC.end()) { + itOgg = lstOgg.find("ARTIST"); + if (itOgg != lstOgg.end()) { if (!artists.isEmpty()) { artists += ", "; } - artists += (itFLAC).second.toString(", "); + artists += (itOgg).second.toString(", "); } // Album Artist. - itFLAC = lstFLAC.find("ALBUMARTIST"); - if (itFLAC != lstFLAC.end()) { + itOgg = lstOgg.find("ALBUMARTIST"); + if (itOgg != lstOgg.end()) { if (!albumArtists.isEmpty()) { albumArtists += ", "; } - albumArtists += (itFLAC).second.toString(", "); + albumArtists += (itOgg).second.toString(", "); } // Composer. - itFLAC = lstFLAC.find("COMPOSER"); - if (itFLAC != lstFLAC.end()) { + itOgg = lstOgg.find("COMPOSER"); + if (itOgg != lstOgg.end()) { if (!composers.isEmpty()) { composers += ", "; } - composers += (itFLAC).second.toString(", "); + composers += (itOgg).second.toString(", "); } // Lyricist. - itFLAC = lstFLAC.find("LYRICIST"); - if (itFLAC != lstFLAC.end()) { + itOgg = lstOgg.find("LYRICIST"); + if (itOgg != lstOgg.end()) { if (!lyricists.isEmpty()) { lyricists += ", "; } - lyricists += (itFLAC).second.toString(", "); + lyricists += (itOgg).second.toString(", "); } // Genre. - itFLAC = lstFLAC.find("GENRE"); - if (itFLAC != lstFLAC.end()) { - genres.append((itFLAC).second); + itOgg = lstOgg.find("GENRE"); + if (itOgg != lstOgg.end()) { + genres.append((itOgg).second); } } } @@ -256,57 +285,6 @@ } } } - - // Handling multiple tags in OGG files. - if (mimeType == "audio/ogg" \|\| mimeType == "audio/x-vorbis+ogg") { - TagLib::Ogg::Vorbis::File oggFile(fileUrl.toUtf8().data(), true); - if (oggFile.tag() && !oggFile.tag()->isEmpty()) { - TagLib::Ogg::FieldListMap lstOGG = oggFile.tag()->fieldListMap(); - TagLib::Ogg::FieldListMap::ConstIterator itOGG; - - // Artist. - itOGG = lstOGG.find("ARTIST"); - if (itOGG != lstOGG.end()) { - if (!artists.isEmpty()) { - artists += ", "; - } - artists += (itOGG).second.toString(", "); - } - - // Album Artist. - itOGG = lstOGG.find("ALBUMARTIST"); - if (itOGG != lstOGG.end()) { - if (!albumArtists.isEmpty()) { - albumArtists += ", "; - } - albumArtists += (itOGG).second.toString(", "); - } - - // Composer. - itOGG = lstOGG.find("COMPOSER"); - if (itOGG != lstOGG.end()) { - if (!composers.isEmpty()) { - composers += ", "; - } - composers += (itOGG).second.toString(", "); - } - - // Lyricist. - itOGG = lstOGG.find("LYRICIST"); - if (itOGG != lstOGG.end()) { - if (!lyricists.isEmpty()) { - lyricists += ", "; - } - lyricists += (itOGG).second.toString(", "); - } - - // Genre. - itOGG = lstOGG.find("GENRE"); - if (itOGG != lstOGG.end()) { - genres.append((*itOGG).second); - } - } - } if (!tags->isEmpty()) { QString title = QString::fromUtf8(tags->title().toCString(true));
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/src/propertyinfo.cpp ^
@@ -24,9 +24,6 @@ #include <KLocalizedString> -// FIXME: vhanda -//static const KCatalogLoader loader("kfilemetadata"); - using namespace KFileMetaData; class PropertyInfo::Private {
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/src/typeinfo.cpp ^
@@ -37,6 +37,11 @@ d->type = type; switch (type) { + case Type::Empty: + d->name = QStringLiteral("empty"); + d->displayName = QString(); + break; + case Type::Archive: d->name = QStringLiteral("Archive"); d->displayName = i18nc("@label", "Archive"); @@ -76,6 +81,11 @@ d->name = QStringLiteral("Video"); d->displayName = i18nc("@label", "Video"); break; + + case Type::Folder: + d->name = QStringLiteral("Folder"); + d->displayName = i18nc("@label", "Folder"); + break; } } @@ -115,3 +125,14 @@ return d->type; } +TypeInfo TypeInfo::fromName(const QString& name) +{ + for (int t = static_cast<int>(Type::FirstType); t <= static_cast<int>(Type::LastType); t++) { + TypeInfo ti(static_cast<Type::Type>(t)); + if (ti.name().compare(name, Qt::CaseInsensitive) == 0) { + return ti; + } + } + + return TypeInfo(Type::Empty); +}
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/src/typeinfo.h ^
@@ -52,6 +52,12 @@ / QString displayName() const; + /* + * Construct a TypeInfo from the internal type name. + * The internal type name is case insensitive + / + static TypeInfo fromName(const QString& name); + private: class Private; Private d;
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/src/types.h ^
@@ -32,12 +32,13 @@ / enum Type { FirstType = 0, + Empty = 0, /* * Any file which contains a compressed collection of other files * eg - tar, zip, rar, gz / - Archive = 0, + Archive, /* * Used to mark any file which just contains audio. Do not use this @@ -79,7 +80,12 @@ / Text, - LastType = Text + /* + * A directory or folder + */ + Folder, + + LastType = Folder }; }
[-] [+]	Changed	kfilemetadata-5.6.0.tar.xz/src/usermetadata.cpp ^
@@ -121,5 +121,5 @@ QString value; k_getxattr(d->filePath, QStringLiteral("user.test"), &value); - return (errno == ENOTSUP); + return (errno != ENOTSUP); }