diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index eda6e0d7..7fbfee04 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,204 +1,205 @@
 enable_testing()
 
 configure_file(mediaplaylisttestconfig.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/mediaplaylisttestconfig.h @ONLY)
 
 include_directories(${elisa_CURRENT_BINARY_DIR})
 include_directories(${elisa_BINARY_DIR})
 include_directories(${elisa_BINARY_DIR}/src)
 
 set(databaseInterfaceTest_SOURCES
     databaseinterfacetest.cpp
     databasetestdata.h
 )
 
 ecm_add_test(${databaseInterfaceTest_SOURCES}
     TEST_NAME "databaseInterfaceTest"
     LINK_LIBRARIES
         Qt5::Test elisaLib)
 
 target_include_directories(databaseInterfaceTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(managemediaplayercontrolTest_SOURCES
     managemediaplayercontroltest.cpp
     ../src/elisautils.cpp
 )
 
 ecm_add_test(${managemediaplayercontrolTest_SOURCES}
     TEST_NAME "managemediaplayercontrolTest"
     LINK_LIBRARIES
         Qt5::Test elisaLib
 )
 
 set(manageheaderbarTest_SOURCES
     manageheaderbartest.cpp
     ../src/elisautils.cpp
 )
 
 ecm_add_test(${manageheaderbarTest_SOURCES}
     TEST_NAME "manageheaderbarTest"
     LINK_LIBRARIES
         Qt5::Test elisaLib
 )
 
 target_include_directories(manageheaderbarTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(manageaudioplayerTest_SOURCES
     manageaudioplayertest.cpp
 )
 
 ecm_add_test(${manageaudioplayerTest_SOURCES}
     TEST_NAME "manageaudioplayerTest"
     LINK_LIBRARIES Qt5::Test elisaLib
 )
 
 target_include_directories(manageaudioplayerTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(mediaplaylistTest_SOURCES
     qabstractitemmodeltester.cpp
     mediaplaylisttest.cpp
     ../src/elisautils.cpp
 )
 
 ecm_qt_declare_logging_category(mediaplaylistTest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
 
 ecm_add_test(${mediaplaylistTest_SOURCES}
     TEST_NAME "mediaplaylistTest"
     LINK_LIBRARIES
         Qt5::Test elisaLib Qt5::CorePrivate
 )
 
 target_include_directories(mediaplaylistTest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(trackslistenertest_SOURCES
     trackslistenertest.cpp
     ../src/elisautils.cpp
 )
 
 ecm_add_test(${trackslistenertest_SOURCES}
     TEST_NAME "trackslistenertest"
     LINK_LIBRARIES
         Qt5::Test elisaLib
 )
 
 target_include_directories(trackslistenertest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(allalbumsmodeltest_SOURCES
     qabstractitemmodeltester.cpp
     allalbumsmodeltest.cpp
 )
 
 ecm_qt_declare_logging_category(allalbumsmodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
 
 ecm_add_test(${allalbumsmodeltest_SOURCES}
     TEST_NAME "allalbumsmodeltest"
     LINK_LIBRARIES Qt5::Test elisaLib Qt5::CorePrivate
 )
 
 target_include_directories(allalbumsmodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(albummodeltest_SOURCES
     qabstractitemmodeltester.cpp
     albummodeltest.cpp
 )
 
 ecm_qt_declare_logging_category(albummodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
 
 ecm_add_test(${albummodeltest_SOURCES}
     TEST_NAME "albummodeltest"
     LINK_LIBRARIES
         Qt5::Test elisaLib Qt5::CorePrivate
 )
 
 target_include_directories(albummodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(allartistsmodeltest_SOURCES
     qabstractitemmodeltester.cpp
     allartistsmodeltest.cpp
 )
 
 ecm_qt_declare_logging_category(allartistsmodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
 
 ecm_add_test(${allartistsmodeltest_SOURCES}
     TEST_NAME "allartistsmodeltest"
     LINK_LIBRARIES
         Qt5::Test elisaLib Qt5::CorePrivate
 )
 
 target_include_directories(allartistsmodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(alltracksmodeltest_SOURCES
     qabstractitemmodeltester.cpp
     alltracksmodeltest.cpp
 )
 
 ecm_qt_declare_logging_category(alltracksmodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
 
 ecm_add_test(${alltracksmodeltest_SOURCES}
     TEST_NAME "alltracksmodeltest"
     LINK_LIBRARIES
         Qt5::Test elisaLib Qt5::CorePrivate
 )
 
 target_include_directories(alltracksmodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 set(alltracksproxymodeltest_SOURCES
     qabstractitemmodeltester.cpp
     alltracksproxymodeltest.cpp
 )
 
 ecm_qt_declare_logging_category(alltracksproxymodeltest_SOURCES HEADER elisa_debug.h IDENTIFIER lcModelTest CATEGORY_NAME qt.modeltest)
 
 ecm_add_test(${alltracksproxymodeltest_SOURCES}
     TEST_NAME "alltracksproxymodeltest"
     LINK_LIBRARIES
         Qt5::Test elisaLib Qt5::CorePrivate
 )
 
 target_include_directories(alltracksproxymodeltest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 
 if (KF5FileMetaData_FOUND)
     set(localfilelistingtest_SOURCES
         localfilelistingtest.cpp
     )
 
     ecm_add_test(${localfilelistingtest_SOURCES}
         TEST_NAME "localfilelistingtest"
         LINK_LIBRARIES
             Qt5::Test elisaLib
     )
 
     target_include_directories(localfilelistingtest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 endif()
 
 if (KF5XmlGui_FOUND AND KF5KCMUtils_FOUND)
     set(elisaapplicationtest_SOURCES
         elisaapplicationtest.cpp
+        ../src/elisautils.cpp
     )
 
     ecm_add_test(${elisaapplicationtest_SOURCES}
         TEST_NAME "elisaapplicationtest"
         LINK_LIBRARIES
             Qt5::Test elisaLib
     )
 
     target_include_directories(elisaapplicationtest PRIVATE ${CMAKE_SOURCE_DIR}/src)
 endif()
 
 if (Qt5Quick_FOUND AND Qt5Widgets_FOUND AND NOT WIN32)
     set(elisaqmltests_SOURCES
         elisaqmltests.cpp
         qmltests/tst_GridBrowserDelegate.qml
         qmltests/tst_NavigationActionBar.qml
         qmltests/tst_PlayListEntry.qml
     )
 
     ecm_add_test(${elisaqmltests_SOURCES}
         TEST_NAME "elisaqmltests"
         LINK_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Test Qt5::QuickTest
         GUI)
 
     target_compile_definitions(elisaqmltests PRIVATE QUICK_TEST_SOURCE_DIR="${CMAKE_SOURCE_DIR}/autotests/qmltests")
 
     target_include_directories(elisaqmltests PRIVATE ${CMAKE_SOURCE_DIR}/src)
 endif()
diff --git a/autotests/elisaapplicationtest.cpp b/autotests/elisaapplicationtest.cpp
index f2f6698f..e0bd167d 100644
--- a/autotests/elisaapplicationtest.cpp
+++ b/autotests/elisaapplicationtest.cpp
@@ -1,99 +1,103 @@
 /*
  * Copyright 2015-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "elisaapplication.h"
 
 #include "config-upnp-qt.h"
 
 #include <QObject>
 #include <QUrl>
 #include <QString>
 #include <QDir>
 #include <QFileInfo>
 
 #include <QDebug>
 
 #include <QtTest>
 
 class ElisaApplicationTests: public QObject
 {
     Q_OBJECT
 
 public:
 
     ElisaApplicationTests(QObject *parent = nullptr) : QObject(parent)
     {
     }
 
 private:
 
 private Q_SLOTS:
 
     void initTestCase()
     {
         qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
         qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
         qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
         qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
         qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
+        qRegisterMetaType<ElisaUtils::EntryDataList>("ElisaUtils::EntryDataList");
+        qRegisterMetaType<ElisaUtils::PlayListEntryType>("ElisaUtils::PlayListEntryType");
+        qRegisterMetaType<ElisaUtils::PlayListEnqueueMode>("ElisaUtils::PlayListEnqueueMode");
+        qRegisterMetaType<ElisaUtils::PlayListEnqueueTriggerPlay>("ElisaUtils::PlayListEnqueueTriggerPlay");
     }
 
     void setArgumentsTest()
     {
         ElisaApplication myApp;
 
         QSignalSpy argumentsChangedSpy(&myApp, &ElisaApplication::argumentsChanged);
         QSignalSpy enqueueSpy(&myApp, &ElisaApplication::enqueue);
 
         auto myTestFile = QFileInfo(QStringLiteral(LOCAL_FILE_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/music/test.ogg"));
         auto myDirectory = QDir::current();
         auto relativePath = myDirectory.relativeFilePath(myTestFile.canonicalFilePath());
 
-        myApp.setArguments({relativePath});
+        myApp.setArguments({{0, relativePath}});
 
         QCOMPARE(argumentsChangedSpy.count(), 1);
         QCOMPARE(enqueueSpy.count(), 1);
 
         QCOMPARE(myApp.arguments().count(), 1);
-        QCOMPARE(myApp.arguments().at(0), myTestFile.canonicalFilePath());
+        QCOMPARE(std::get<1>(myApp.arguments().at(0)), myTestFile.canonicalFilePath());
     }
 
     void activateRequestedTest()
     {
         ElisaApplication myApp;
 
         QSignalSpy argumentsChangedSpy(&myApp, &ElisaApplication::argumentsChanged);
         QSignalSpy enqueueSpy(&myApp, &ElisaApplication::enqueue);
 
         auto myTestFile = QFileInfo(QStringLiteral(LOCAL_FILE_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/music/test.ogg"));
         auto myDirectory = QDir::current();
         auto relativePath = myDirectory.relativeFilePath(myTestFile.canonicalFilePath());
 
         myApp.activateRequested({QString(), relativePath}, QDir::currentPath());
 
         QCOMPARE(argumentsChangedSpy.count(), 0);
         QCOMPARE(enqueueSpy.count(), 1);
 
-        QCOMPARE(enqueueSpy.at(0).count(), 1);
-        QCOMPARE(enqueueSpy.at(0).at(0).toString(), myTestFile.canonicalFilePath());
+        QCOMPARE(enqueueSpy.at(0).count(), 4);
+        QCOMPARE(std::get<1>(enqueueSpy.at(0).at(0).value<ElisaUtils::EntryDataList>().at(0)), myTestFile.canonicalFilePath());
     }
 };
 
 QTEST_MAIN(ElisaApplicationTests)
 
 
 #include "elisaapplicationtest.moc"
diff --git a/autotests/manageheaderbartest.cpp b/autotests/manageheaderbartest.cpp
index d2078972..467799aa 100644
--- a/autotests/manageheaderbartest.cpp
+++ b/autotests/manageheaderbartest.cpp
@@ -1,2762 +1,2754 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "manageheaderbartest.h"
 
 #include "manageheaderbar.h"
 #include "mediaplaylist.h"
 #include "databaseinterface.h"
 #include "trackslistener.h"
 
 #include <QHash>
 #include <QString>
 #include <QUrl>
 #include <QVector>
 #include <QVariant>
 #include <QList>
 
 #include <QStringListModel>
 #include <QStandardItemModel>
 #include <QStandardItem>
 
 #include <QtTest>
 
 ManageHeaderBarTest::ManageHeaderBarTest(QObject *parent) : QObject(parent)
 {
 
 }
 
 void ManageHeaderBarTest::initTestCase()
 {
     qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
     qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
     qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
 }
 
 void ManageHeaderBarTest::simpleInitialCase()
 {
     ManageHeaderBar myControl;
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 }
 
 void ManageHeaderBarTest::setCurrentTrackCase()
 {
     QStringListModel myPlayList;
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     QCOMPARE(myPlayList.insertRows(0, 3), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(1, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 }
 
 void ManageHeaderBarTest::setCurrentTrackCaseFromNewAlbum()
 {
     QStringListModel myPlayList;
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     QCOMPARE(myPlayList.insertRows(0, 1), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void ManageHeaderBarTest::completeCase()
 {
     QStandardItemModel myPlayList;
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(ManageHeaderBarTest::ArtistRole));
 
     myControl.setTitleRole(ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(ManageHeaderBarTest::TitleRole));
 
     myControl.setAlbumRole(ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(ManageHeaderBarTest::AlbumRole));
 
     myControl.setImageRole(ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(ManageHeaderBarTest::ImageRole));
 
     myControl.setAlbumIdRole(ManageHeaderBarTest::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(ManageHeaderBarTest::AlbumIdRole));
 
     myControl.setIsValidRole(ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(ManageHeaderBarTest::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.appendRow(new QStandardItem);
     myPlayList.appendRow(new QStandardItem);
     myPlayList.appendRow(new QStandardItem);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(1, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
 
     auto firstItem = myPlayList.item(0, 0);
     firstItem->setData(QUrl::fromUserInput(QStringLiteral("file://0.mp3")), ManageHeaderBarTest::ResourceRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     auto currentItem = myPlayList.item(1, 0);
     currentItem->setData(QStringLiteral("artist1"), ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
 
     currentItem->setData(QStringLiteral("song1"), ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("song1")));
 
     currentItem->setData(QStringLiteral("album1"), ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album1")));
 
     currentItem->setData(QUrl::fromUserInput(QStringLiteral("file://image.png")), ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file://image.png")));
 
     currentItem->setData(qulonglong(12), ManageHeaderBarTest::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.albumId(), 12);
 
     currentItem->setData(true, ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.isValid(), true);
 
     QCOMPARE(myPlayList.removeRow(2), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setCurrentTrack({});
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 2);
     QCOMPARE(titleChangedSpy.count(), 2);
     QCOMPARE(albumChangedSpy.count(), 2);
     QCOMPARE(imageChangedSpy.count(), 2);
     QCOMPARE(albumIdChangedSpy.count(), 2);
     QCOMPARE(isValidChangedSpy.count(), 2);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex());
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.albumId(), 0);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(1, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 3);
     QCOMPARE(titleChangedSpy.count(), 3);
     QCOMPARE(albumChangedSpy.count(), 3);
     QCOMPARE(imageChangedSpy.count(), 3);
     QCOMPARE(albumIdChangedSpy.count(), 3);
     QCOMPARE(isValidChangedSpy.count(), 3);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
     QCOMPARE(myControl.artist().toString(), QStringLiteral("artist1"));
     QCOMPARE(myControl.title().toString(), QStringLiteral("song1"));
     QCOMPARE(myControl.album().toString(), QStringLiteral("album1"));
     QCOMPARE(myControl.image().toString(), QStringLiteral("file://image.png"));
     QCOMPARE(myControl.isValid(), true);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myPlayList.appendRow(new QStandardItem);
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 3);
     QCOMPARE(titleChangedSpy.count(), 3);
     QCOMPARE(albumChangedSpy.count(), 3);
     QCOMPARE(imageChangedSpy.count(), 3);
     QCOMPARE(albumIdChangedSpy.count(), 3);
     QCOMPARE(isValidChangedSpy.count(), 3);
     QCOMPARE(remainingTracksChangedSpy.count(), 3);
 
     QCOMPARE(myControl.remainingTracks(), 1);
 
     auto lastItem = myPlayList.item(2, 0);
     lastItem->setData(QUrl::fromUserInput(QStringLiteral("file://2.mp3")), ManageHeaderBarTest::ResourceRole);
     lastItem->setData(QStringLiteral("artist1"), ManageHeaderBarTest::ArtistRole);
     lastItem->setData(QStringLiteral("song2"), ManageHeaderBarTest::TitleRole);
     lastItem->setData(QStringLiteral("album1"), ManageHeaderBarTest::AlbumRole);
     lastItem->setData(QUrl::fromUserInput(QStringLiteral("file://image.png")), ManageHeaderBarTest::ImageRole);
     lastItem->setData(qulonglong(12), ManageHeaderBarTest::AlbumIdRole);
     lastItem->setData(true, ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 3);
     QCOMPARE(titleChangedSpy.count(), 3);
     QCOMPARE(albumChangedSpy.count(), 3);
     QCOMPARE(imageChangedSpy.count(), 3);
     QCOMPARE(albumIdChangedSpy.count(), 3);
     QCOMPARE(isValidChangedSpy.count(), 3);
     QCOMPARE(remainingTracksChangedSpy.count(), 3);
 
     myControl.setCurrentTrack(myPlayList.index(2, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 3);
     QCOMPARE(titleChangedSpy.count(), 4);
     QCOMPARE(albumChangedSpy.count(), 3);
     QCOMPARE(imageChangedSpy.count(), 3);
     QCOMPARE(albumIdChangedSpy.count(), 3);
     QCOMPARE(isValidChangedSpy.count(), 3);
     QCOMPARE(remainingTracksChangedSpy.count(), 4);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
     QCOMPARE(myControl.title().toString(), QStringLiteral("song2"));
     QCOMPARE(myControl.albumId(), 12);
     QCOMPARE(myControl.remainingTracks(), 0);
 }
 
 void ManageHeaderBarTest::setCurrentTrackAndInvalidCase()
 {
     QStandardItemModel myPlayList;
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(ManageHeaderBarTest::ArtistRole));
 
     myControl.setTitleRole(ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(ManageHeaderBarTest::TitleRole));
 
     myControl.setAlbumRole(ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(ManageHeaderBarTest::AlbumRole));
 
     myControl.setImageRole(ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(ManageHeaderBarTest::ImageRole));
 
     myControl.setAlbumIdRole(ManageHeaderBarTest::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(ManageHeaderBarTest::AlbumIdRole));
 
     myControl.setIsValidRole(ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(ManageHeaderBarTest::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.appendRow(new QStandardItem);
     myPlayList.appendRow(new QStandardItem);
     myPlayList.appendRow(new QStandardItem);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(1, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
 
     auto firstItem = myPlayList.item(0, 0);
     firstItem->setData(QUrl::fromUserInput(QStringLiteral("file://0.mp3")), ManageHeaderBarTest::ResourceRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     auto currentItem = myPlayList.item(1, 0);
     currentItem->setData(QStringLiteral("artist1"), ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
 
     currentItem->setData(QStringLiteral("song1"), ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("song1")));
 
     currentItem->setData(QStringLiteral("album1"), ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album1")));
 
     currentItem->setData(QUrl::fromUserInput(QStringLiteral("file://image.png")), ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file://image.png")));
 
     currentItem->setData(qulonglong(12), ManageHeaderBarTest::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.albumId(), qulonglong(12));
 
     currentItem->setData(true, ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.isValid(), true);
 
     QCOMPARE(myPlayList.removeRow(2), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.remainingTracks(), 0);
 
     QCOMPARE(myPlayList.removeRows(0, 2), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 2);
     QCOMPARE(titleChangedSpy.count(), 2);
     QCOMPARE(albumChangedSpy.count(), 2);
     QCOMPARE(imageChangedSpy.count(), 2);
     QCOMPARE(albumIdChangedSpy.count(), 2);
     QCOMPARE(isValidChangedSpy.count(), 2);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 }
 
 void ManageHeaderBarTest::setCurrentTrackAndRemoveItCase()
 {
     QStandardItemModel myPlayList;
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(ManageHeaderBarTest::ArtistRole));
 
     myControl.setTitleRole(ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(ManageHeaderBarTest::TitleRole));
 
     myControl.setAlbumRole(ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(ManageHeaderBarTest::AlbumRole));
 
     myControl.setImageRole(ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(ManageHeaderBarTest::ImageRole));
 
     myControl.setAlbumIdRole(ManageHeaderBarTest::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(ManageHeaderBarTest::AlbumIdRole));
 
     myControl.setIsValidRole(ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(ManageHeaderBarTest::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.appendRow(new QStandardItem);
     myPlayList.appendRow(new QStandardItem);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     auto firstItem = myPlayList.item(0, 0);
     firstItem->setData(QUrl::fromUserInput(QStringLiteral("file://0.mp3")), ManageHeaderBarTest::ResourceRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QStringLiteral("artist1"), ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QStringLiteral("song1"), ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QStringLiteral("album1"), ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QUrl::fromUserInput(QStringLiteral("file://image.png")), ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(true, ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
     QCOMPARE(myControl.isValid(), true);
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file://image.png")));
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album1")));
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("song1")));
 
     QCOMPARE(myPlayList.removeRow(0), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 2);
     QCOMPARE(titleChangedSpy.count(), 2);
     QCOMPARE(albumChangedSpy.count(), 2);
     QCOMPARE(imageChangedSpy.count(), 2);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 2);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 }
 
 void ManageHeaderBarTest::insertBeforeCurrentTrack()
 {
     QStandardItemModel myPlayList;
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(ManageHeaderBarTest::ArtistRole));
 
     myControl.setTitleRole(ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(ManageHeaderBarTest::TitleRole));
 
     myControl.setAlbumRole(ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(ManageHeaderBarTest::AlbumRole));
 
     myControl.setImageRole(ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(ManageHeaderBarTest::ImageRole));
 
     myControl.setAlbumIdRole(ManageHeaderBarTest::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(ManageHeaderBarTest::AlbumIdRole));
 
     myControl.setIsValidRole(ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(ManageHeaderBarTest::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.appendRow(new QStandardItem);
     myPlayList.appendRow(new QStandardItem);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     auto firstItem = myPlayList.item(0, 0);
     firstItem->setData(QUrl::fromUserInput(QStringLiteral("file://0.mp3")), ManageHeaderBarTest::ResourceRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QStringLiteral("artist1"), ManageHeaderBarTest::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QStringLiteral("song1"), ManageHeaderBarTest::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QStringLiteral("album1"), ManageHeaderBarTest::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(QUrl::fromUserInput(QStringLiteral("file://image.png")), ManageHeaderBarTest::ImageRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     firstItem->setData(true, ManageHeaderBarTest::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
     QCOMPARE(myControl.isValid(), true);
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file://image.png")));
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album1")));
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("song1")));
 
     myPlayList.insertRow(0, new QStandardItem);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 }
 
 void ManageHeaderBarTest::moveCurrentTrack()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(MediaPlayList::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(MediaPlayList::ArtistRole));
 
     myControl.setTitleRole(MediaPlayList::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(MediaPlayList::TitleRole));
 
     myControl.setAlbumRole(MediaPlayList::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(MediaPlayList::AlbumRole));
 
     myControl.setImageRole(MediaPlayList::ImageUrlRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(MediaPlayList::ImageUrlRole));
 
     myControl.setAlbumIdRole(MediaPlayList::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(MediaPlayList::AlbumIdRole));
 
     myControl.setIsValidRole(MediaPlayList::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(MediaPlayList::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
     QCOMPARE(myControl.isValid(), true);
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file:album2")));
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album2")));
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("track1")));
     QCOMPARE(myControl.albumId(), qulonglong(2));
 
     QCOMPARE(myPlayList.moveRow(myControl.currentTrack().parent(), 0, myControl.currentTrack().parent(), 2), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.remainingTracks(), 0);
 }
 
 void ManageHeaderBarTest::moveAnotherTrack()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(MediaPlayList::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(MediaPlayList::ArtistRole));
 
     myControl.setTitleRole(MediaPlayList::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(MediaPlayList::TitleRole));
 
     myControl.setAlbumRole(MediaPlayList::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(MediaPlayList::AlbumRole));
 
     myControl.setImageRole(MediaPlayList::ImageUrlRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(MediaPlayList::ImageUrlRole));
 
     myControl.setAlbumIdRole(MediaPlayList::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(MediaPlayList::AlbumIdRole));
 
     myControl.setIsValidRole(MediaPlayList::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(MediaPlayList::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     auto newFiles = QList<QUrl>();
     const auto &constNewTracks = mNewTracks;
     for (const auto &oneTrack : constNewTracks) {
         newFiles.push_back(oneTrack.resourceURI());
     }
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
     QCOMPARE(myControl.isValid(), true);
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file:album2")));
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album2")));
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("track1")));
     QCOMPARE(myControl.albumId(), qulonglong(2));
 
     QCOMPARE(myPlayList.moveRow(myControl.currentTrack().parent(), 1, myControl.currentTrack().parent(), 0), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 2);
 
     QCOMPARE(myControl.remainingTracks(), 0);
 }
 
 void ManageHeaderBarTest::setCurrentTrackTest()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setArtistRole(MediaPlayList::ArtistRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.artistRole(), static_cast<int>(MediaPlayList::ArtistRole));
 
     myControl.setTitleRole(MediaPlayList::TitleRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.titleRole(), static_cast<int>(MediaPlayList::TitleRole));
 
     myControl.setAlbumRole(MediaPlayList::AlbumRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumRole(), static_cast<int>(MediaPlayList::AlbumRole));
 
     myControl.setImageRole(MediaPlayList::ImageUrlRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.imageRole(), static_cast<int>(MediaPlayList::ImageUrlRole));
 
     myControl.setAlbumIdRole(MediaPlayList::AlbumIdRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(MediaPlayList::AlbumIdRole));
 
     myControl.setIsValidRole(MediaPlayList::IsValidRole);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 0);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.isValidRole(), static_cast<int>(MediaPlayList::IsValidRole));
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     auto newFiles = QList<QUrl>();
     const auto &constNewTracks = mNewTracks;
     for (const auto &oneTrack : constNewTracks) {
         newFiles.push_back(oneTrack.resourceURI());
     }
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
     QCOMPARE(myControl.remainingTracks(), 1);
     QCOMPARE(myControl.isValid(), true);
     QCOMPARE(myControl.image(), QUrl::fromUserInput(QStringLiteral("file:album2")));
     QCOMPARE(myControl.album(), QVariant(QStringLiteral("album2")));
     QCOMPARE(myControl.artist(), QVariant(QStringLiteral("artist1")));
     QCOMPARE(myControl.title(), QVariant(QStringLiteral("track1")));
     QCOMPARE(myControl.albumId(), qulonglong(2));
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 1);
     QCOMPARE(titleRoleChangedSpy.count(), 1);
     QCOMPARE(albumRoleChangedSpy.count(), 1);
     QCOMPARE(imageRoleChangedSpy.count(), 1);
     QCOMPARE(albumIdRoleChangedSpy.count(), 1);
     QCOMPARE(isValidRoleChangedSpy.count(), 1);
     QCOMPARE(artistChangedSpy.count(), 1);
     QCOMPARE(titleChangedSpy.count(), 1);
     QCOMPARE(albumChangedSpy.count(), 1);
     QCOMPARE(imageChangedSpy.count(), 1);
     QCOMPARE(albumIdChangedSpy.count(), 1);
     QCOMPARE(isValidChangedSpy.count(), 1);
     QCOMPARE(remainingTracksChangedSpy.count(), 1);
 }
 
 void ManageHeaderBarTest::setPlayListModelTest()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageHeaderBar myControl;
 
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageHeaderBar::currentTrackChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageHeaderBar::playListModelChanged);
     QSignalSpy artistRoleChangedSpy(&myControl, &ManageHeaderBar::artistRoleChanged);
     QSignalSpy titleRoleChangedSpy(&myControl, &ManageHeaderBar::titleRoleChanged);
     QSignalSpy albumRoleChangedSpy(&myControl, &ManageHeaderBar::albumRoleChanged);
     QSignalSpy imageRoleChangedSpy(&myControl, &ManageHeaderBar::imageRoleChanged);
     QSignalSpy albumIdRoleChangedSpy(&myControl, &ManageHeaderBar::albumIdRoleChanged);
     QSignalSpy isValidRoleChangedSpy(&myControl, &ManageHeaderBar::isValidRoleChanged);
     QSignalSpy artistChangedSpy(&myControl, &ManageHeaderBar::artistChanged);
     QSignalSpy titleChangedSpy(&myControl, &ManageHeaderBar::titleChanged);
     QSignalSpy albumChangedSpy(&myControl, &ManageHeaderBar::albumChanged);
     QSignalSpy imageChangedSpy(&myControl, &ManageHeaderBar::imageChanged);
     QSignalSpy albumIdChangedSpy(&myControl, &ManageHeaderBar::albumIdChanged);
     QSignalSpy isValidChangedSpy(&myControl, &ManageHeaderBar::isValidChanged);
     QSignalSpy remainingTracksChangedSpy(&myControl, &ManageHeaderBar::remainingTracksChanged);
 
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.artistRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.titleRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.imageRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.albumIdRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.isValidRole(), static_cast<int>(Qt::DisplayRole));
     QCOMPARE(myControl.artist().toString().isEmpty(), true);
     QCOMPARE(myControl.title().toString().isEmpty(), true);
     QCOMPARE(myControl.album().toString().isEmpty(), true);
     QCOMPARE(myControl.image().toString().isEmpty(), true);
     QCOMPARE(myControl.isValid(), false);
     QCOMPARE(myControl.remainingTracks(), 0);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myControl.setPlayListModel(nullptr);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 2);
     QCOMPARE(artistRoleChangedSpy.count(), 0);
     QCOMPARE(titleRoleChangedSpy.count(), 0);
     QCOMPARE(albumRoleChangedSpy.count(), 0);
     QCOMPARE(imageRoleChangedSpy.count(), 0);
     QCOMPARE(albumIdRoleChangedSpy.count(), 0);
     QCOMPARE(isValidRoleChangedSpy.count(), 0);
     QCOMPARE(artistChangedSpy.count(), 0);
     QCOMPARE(titleChangedSpy.count(), 0);
     QCOMPARE(albumChangedSpy.count(), 0);
     QCOMPARE(imageChangedSpy.count(), 0);
     QCOMPARE(albumIdChangedSpy.count(), 0);
     QCOMPARE(isValidChangedSpy.count(), 0);
     QCOMPARE(remainingTracksChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), static_cast<QAbstractItemModel*>(nullptr));
 }
 
 QTEST_GUILESS_MAIN(ManageHeaderBarTest)
 
 
 #include "moc_manageheaderbartest.cpp"
diff --git a/autotests/managemediaplayercontroltest.cpp b/autotests/managemediaplayercontroltest.cpp
index f8a41dd7..7b75dd0b 100644
--- a/autotests/managemediaplayercontroltest.cpp
+++ b/autotests/managemediaplayercontroltest.cpp
@@ -1,751 +1,742 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "managemediaplayercontroltest.h"
 
 #include "managemediaplayercontrol.h"
 #include "mediaplaylist.h"
 #include "databaseinterface.h"
 #include "musicaudiotrack.h"
 #include "trackslistener.h"
 
 #include <QHash>
 #include <QString>
 #include <QUrl>
 #include <QVector>
 #include <QVariant>
 #include <QList>
 
 #include <QStringListModel>
 
 #include <QtTest>
 
 ManageMediaPlayerControlTest::ManageMediaPlayerControlTest(QObject *parent) : QObject(parent)
 {
 
 }
 
 void ManageMediaPlayerControlTest::initTestCase()
 {
     qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
     qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
     qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
 }
 
 void ManageMediaPlayerControlTest::simpleInitialCase()
 {
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 }
 
 void ManageMediaPlayerControlTest::addItemInModelCase()
 {
     QStringListModel myPlayList;
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.setStringList({QStringLiteral("tutu")});
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.playControlEnabled(), true);
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myControl.playerPlaying();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.musicPlaying(), true);
 
     QCOMPARE(myPlayList.insertRows(1, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipForwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.insertRows(0, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipBackwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.removeRows(3, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
 
     QCOMPARE(myPlayList.removeRows(0, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
 
     QCOMPARE(myPlayList.removeRows(0, 1, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 2);
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     myControl.playerStopped();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 2);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 2);
 
     QCOMPARE(myControl.musicPlaying(), false);
 }
 
 void ManageMediaPlayerControlTest::addItemInModelCaseV2()
 {
     QStringListModel myPlayList;
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.setStringList({QStringLiteral("tutu")});
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.playControlEnabled(), true);
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myControl.playerPlaying();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.musicPlaying(), true);
 
     QCOMPARE(myPlayList.insertRows(1, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipForwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.insertRows(0, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipBackwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.removeRows(2, 1, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 2);
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.currentTrack().isValid(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
 
     myControl.playerStopped();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 2);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 2);
 
     QCOMPARE(myControl.musicPlaying(), false);
 
     QCOMPARE(myPlayList.removeRows(0, 4, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 2);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 2);
 }
 void ManageMediaPlayerControlTest::nextAndPreviousButtonAndRandomPlay()
 {
     QStringListModel myPlayList;
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myPlayList.setStringList({QStringLiteral("tutu")});
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.playControlEnabled(), true);
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myControl.setRandomOrContinuePlay(true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     myControl.playerPlaying();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.musicPlaying(), true);
     QCOMPARE(myControl.skipForwardControlEnabled(), true);
     QCOMPARE(myControl.skipBackwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.insertRows(1, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myPlayList.insertRows(0, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myPlayList.removeRows(3, 2, {}), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 }
 
 void ManageMediaPlayerControlTest::moveCurrentTrack()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist2"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.playControlEnabled(), true);
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myControl.playerPlaying();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.musicPlaying(), true);
     QCOMPARE(myControl.skipForwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.moveRows({}, 0, 1, {}, 2), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), true);
 }
 
 void ManageMediaPlayerControlTest::moveAnotherTrack()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist2"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.playControlEnabled(), true);
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myControl.playerPlaying();
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.musicPlaying(), true);
     QCOMPARE(myControl.skipForwardControlEnabled(), true);
 
     QCOMPARE(myPlayList.moveRows({}, 1, 1, {}, 0), true);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 2);
     QCOMPARE(musicPlayingChangedSpy.count(), 1);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), true);
 }
 
 void ManageMediaPlayerControlTest::setCurrentTrackTest()
 {
     MediaPlayList myPlayList;
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist2"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myControl.playControlEnabled(), true);
     QCOMPARE(myControl.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myControl.setCurrentTrack(myPlayList.index(0, 0));
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 1);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 }
 
 void ManageMediaPlayerControlTest::setPlayListModelTest()
 {
     QStringListModel myPlayList;
 
     ManageMediaPlayerControl myControl;
 
     QCOMPARE(myControl.playControlEnabled(), false);
     QCOMPARE(myControl.skipBackwardControlEnabled(), false);
     QCOMPARE(myControl.skipForwardControlEnabled(), false);
     QCOMPARE(myControl.musicPlaying(), false);
     QCOMPARE(myControl.playListModel(), static_cast<void*>(nullptr));
     QCOMPARE(myControl.currentTrack().isValid(), false);
 
     QSignalSpy playControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::playControlEnabledChanged);
     QSignalSpy skipBackwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipBackwardControlEnabledChanged);
     QSignalSpy skipForwardControlEnabledChangedSpy(&myControl, &ManageMediaPlayerControl::skipForwardControlEnabledChanged);
     QSignalSpy musicPlayingChangedSpy(&myControl, &ManageMediaPlayerControl::musicPlayingChanged);
     QSignalSpy playListModelChangedSpy(&myControl, &ManageMediaPlayerControl::playListModelChanged);
     QSignalSpy currentTrackChangedSpy(&myControl, &ManageMediaPlayerControl::currentTrackChanged);
 
     myControl.setPlayListModel(&myPlayList);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 1);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), &myPlayList);
 
     myControl.setPlayListModel(nullptr);
 
     QCOMPARE(playControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipBackwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(skipForwardControlEnabledChangedSpy.count(), 0);
     QCOMPARE(musicPlayingChangedSpy.count(), 0);
     QCOMPARE(playListModelChangedSpy.count(), 2);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     QCOMPARE(myControl.playListModel(), static_cast<QAbstractItemModel*>(nullptr));
 }
 
 
 QTEST_GUILESS_MAIN(ManageMediaPlayerControlTest)
 
 
 #include "moc_managemediaplayercontroltest.cpp"
diff --git a/autotests/mediaplaylisttest.cpp b/autotests/mediaplaylisttest.cpp
index 54bc634f..2ea9433d 100644
--- a/autotests/mediaplaylisttest.cpp
+++ b/autotests/mediaplaylisttest.cpp
@@ -1,7199 +1,6593 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "mediaplaylisttest.h"
 #include "mediaplaylisttestconfig.h"
 
 #include "mediaplaylist.h"
 #include "databaseinterface.h"
 #include "musicalbum.h"
 #include "musicaudiotrack.h"
 #include "trackslistener.h"
 #include "qabstractitemmodeltester.h"
 
 #include <QtTest>
 #include <QStandardItemModel>
 #include <QStandardItem>
 #include <QUrl>
 #include <QTime>
 #include <QTemporaryFile>
 
 MediaPlayListTest::MediaPlayListTest(QObject *parent) : QObject(parent)
 {
 }
 
 void MediaPlayListTest::initTestCase()
 {
     qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
     qRegisterMetaType<QHash<QString,QVector<MusicAudioTrack>>>("QHash<QString,QVector<MusicAudioTrack>>");
     qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
     qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
     qRegisterMetaType<ElisaUtils::PlayListEntryType>("PlayListEntryType");
 }
 
 void MediaPlayListTest::simpleInitialCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto newTrackID = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track6"), QStringLiteral("artist1 and artist2"), QStringLiteral("album2"), 6, 1);
     myPlayList.enqueue({newTrackID, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 }
 
 void MediaPlayListTest::enqueueAlbumCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
-    QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
-    QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue(myDatabaseContent.albumFromTitleAndArtist(QStringLiteral("album2"), QStringLiteral("artist1")));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.rowCount(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 7);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 8);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track5"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::TrackNumberRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 9);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track6"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1 and artist2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::TrackNumberRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 10);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
 }
 
 void MediaPlayListTest::clearPlayListCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy tracksCountChangedSpy(&myPlayList, &MediaPlayList::tracksCountChanged);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(tracksCountChangedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(tracksCountChangedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
     QCOMPARE(currentTrackChangedSpy.count(), 0);
 
     myPlayList.enqueue(myDatabaseContent.albumFromTitleAndArtist(QStringLiteral("album2"), QStringLiteral("artist1")));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(tracksCountChangedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
     QCOMPARE(currentTrackChangedSpy.count(), 1);
 
     QCOMPARE(myPlayList.rowCount(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 7);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 8);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track5"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::TrackNumberRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 9);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track6"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1 and artist2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::TrackNumberRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 10);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.clearPlayList();
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(tracksCountChangedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
     QCOMPARE(currentTrackChangedSpy.count(), 2);
 
     QCOMPARE(myPlayList.rowCount(), 0);
 
     QCOMPARE(myPlayList.currentTrack().isValid(), false);
 }
 
 void MediaPlayListTest::enqueueArtistCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue({0, QStringLiteral("artist1")}, ElisaUtils::Artist);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.rowCount(), 1);
 
     QCOMPARE(rowsAboutToBeInsertedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.rowCount(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumIdRole).toULongLong(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 7);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 8);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track5"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::TrackNumberRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 9);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::AlbumIdRole).toULongLong(), 2);
 }
 
 void MediaPlayListTest::removeFirstTrackOfAlbum()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue(myDatabaseContent.albumFromTitleAndArtist(QStringLiteral("album2"), QStringLiteral("artist1")));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.removeRow(0);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testHasHeader()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.removeRows(2, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 5);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 }
 
 void MediaPlayListTest::testHasHeaderWithRestore()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContentHeaderWithRestore"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 1);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     QCOMPARE(newEntryInListSpy.wait(50), false);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 2);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     QCOMPARE(newEntryInListSpy.wait(50), false);
 
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 3);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     QCOMPARE(newEntryInListSpy.wait(50), false);
 
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 4);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 4);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(dataChangedSpy.wait(), true);
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 8);
     QCOMPARE(newTrackByNameInListSpy.count(), 4);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 7);
 }
 
 void MediaPlayListTest::testHasHeaderWithRemove()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     myPlayList.removeRows(2, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 5);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.removeRows(0, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 2);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 2);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 6);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testHasHeaderMoveFirst()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album2"), 4, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     QCOMPARE(myPlayList.moveRows({}, 0, 1, {}, 4), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 1);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     const auto &firstDataChanged = dataChangedSpy[4];
     QCOMPARE(firstDataChanged.count(), 3);
     QCOMPARE(firstDataChanged.at(0).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(firstDataChanged.at(1).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(firstDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     const auto &secondDataChanged = dataChangedSpy[5];
     QCOMPARE(secondDataChanged.count(), 3);
     QCOMPARE(secondDataChanged.at(0).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(secondDataChanged.at(1).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(secondDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testHasHeaderMoveAnother()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album2"), 4, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     QCOMPARE(myPlayList.moveRows({}, 3, 1, {}, 0), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 1);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     const auto &firstDataChanged = dataChangedSpy[4];
     QCOMPARE(firstDataChanged.count(), 3);
     QCOMPARE(firstDataChanged.at(0).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(firstDataChanged.at(1).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(firstDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     const auto &secondDataChanged = dataChangedSpy[5];
     QCOMPARE(secondDataChanged.count(), 3);
     QCOMPARE(secondDataChanged.at(0).toModelIndex(), myPlayList.index(1, 0));
     QCOMPARE(secondDataChanged.at(1).toModelIndex(), myPlayList.index(1, 0));
     QCOMPARE(secondDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testHasHeaderMoveFirstLikeQml()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album2"), 4, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.move(0, 3, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 1);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     const auto &firstDataChanged = dataChangedSpy[4];
     QCOMPARE(firstDataChanged.count(), 3);
     QCOMPARE(firstDataChanged.at(0).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(firstDataChanged.at(1).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(firstDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     const auto &secondDataChanged = dataChangedSpy[5];
     QCOMPARE(secondDataChanged.count(), 3);
     QCOMPARE(secondDataChanged.at(0).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(secondDataChanged.at(1).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(secondDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testHasHeaderMoveAnotherLikeQml()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album2"), 4, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.move(3, 0, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 1);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     const auto &firstDataChanged = dataChangedSpy[4];
     QCOMPARE(firstDataChanged.count(), 3);
     QCOMPARE(firstDataChanged.at(0).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(firstDataChanged.at(1).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(firstDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     const auto &secondDataChanged = dataChangedSpy[5];
     QCOMPARE(secondDataChanged.count(), 3);
     QCOMPARE(secondDataChanged.at(0).toModelIndex(), myPlayList.index(1, 0));
     QCOMPARE(secondDataChanged.at(1).toModelIndex(), myPlayList.index(1, 0));
     QCOMPARE(secondDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testHasHeaderYetAnotherMoveLikeQml()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album2"), 4, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     myPlayList.move(0, 2, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 1);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     const auto &firstDataChanged = dataChangedSpy[4];
     QCOMPARE(firstDataChanged.count(), 3);
     QCOMPARE(firstDataChanged.at(0).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(firstDataChanged.at(1).toModelIndex(), myPlayList.index(0, 0));
     QCOMPARE(firstDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     const auto &secondDataChanged = dataChangedSpy[5];
     QCOMPARE(secondDataChanged.count(), 3);
     QCOMPARE(secondDataChanged.at(0).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(secondDataChanged.at(1).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(secondDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.move(2, 0, 1);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 2);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 2);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 6);
     QCOMPARE(dataChangedSpy.count(), 8);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     const auto &newFirstDataChanged = dataChangedSpy[6];
     QCOMPARE(newFirstDataChanged.count(), 3);
     QCOMPARE(newFirstDataChanged.at(0).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(newFirstDataChanged.at(1).toModelIndex(), myPlayList.index(3, 0));
     QCOMPARE(newFirstDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     const auto &newSecondDataChanged = dataChangedSpy[7];
     QCOMPARE(newSecondDataChanged.count(), 3);
     QCOMPARE(newSecondDataChanged.at(0).toModelIndex(), myPlayList.index(1, 0));
     QCOMPARE(newSecondDataChanged.at(1).toModelIndex(), myPlayList.index(1, 0));
     QCOMPARE(newSecondDataChanged.at(2).value<QVector<int>>(), {MediaPlayList::HasAlbumHeader});
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 }
 
 void MediaPlayListTest::enqueueReplaceAndPlay()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackID = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track6"), QStringLiteral("artist1 and artist2"),
                                                                                QStringLiteral("album2"), 6, 1);
     myPlayList.enqueue({firstTrackID, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track6"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1 and artist2"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 6);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 10);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
 
     myPlayList.replaceAndPlay(myDatabaseContent.albumFromTitleAndArtist(QStringLiteral("album1"), QStringLiteral("Various Artists")));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist4"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::DiscNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 4);
 }
 
 void MediaPlayListTest::crashOnEnqueue()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
     CrashEnqueuePlayList myCrash(&myPlayList);
 
     connect(&myPlayList, &MediaPlayList::rowsInserted, &myCrash, &CrashEnqueuePlayList::crashMediaPlayList);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto newTrackID = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track6"), QStringLiteral("artist1 and artist2"),
                                                                              QStringLiteral("album2"), 6, 1);
     myPlayList.enqueue({newTrackID, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 }
 
 void MediaPlayListTest::restoreMultipleIdenticalTracks()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContentHeaderWithRestore"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 1);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 2);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 3);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 4);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 4);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 8);
     QCOMPARE(newTrackByNameInListSpy.count(), 4);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 3);
 }
 
 void MediaPlayListTest::testHasHeaderAlbumWithSameTitle()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist2"),
                                                                                QStringLiteral("album3"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                                                 QStringLiteral("album1"), 1, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist2"),
                                                                                QStringLiteral("album3"), 2, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto fourthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist2"),
                                                                                 QStringLiteral("album3"), 3, 1);
     myPlayList.enqueue({fourthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 4);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 4);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 4);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 4);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 
     auto fithTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track9"), QStringLiteral("artist2"),
                                                                               QStringLiteral("album3"), 9, 1);
     myPlayList.enqueue({fithTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 5);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 5);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 5);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 5);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 5);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 5);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 5);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 5);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 5);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto sixthTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist7"),
                                                                                QStringLiteral("album3"), 1, 1);
     myPlayList.enqueue({sixthTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 6);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 6);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 6);
     QCOMPARE(persistentStateChangedSpy.count(), 6);
     QCOMPARE(dataChangedSpy.count(), 5);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 6);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 6);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 6);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 6);
     QCOMPARE(persistentStateChangedSpy.count(), 6);
     QCOMPARE(dataChangedSpy.count(), 6);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), false);
 }
 
 void MediaPlayListTest::testSavePersistentState()
 {
     MediaPlayList myPlayListSave;
     QAbstractItemModelTester testModelSave(&myPlayListSave);
     DatabaseInterface myDatabaseContent;
     TracksListener myListenerSave(&myDatabaseContent);
     MediaPlayList myPlayListRead;
     QAbstractItemModelTester testModelRead(&myPlayListRead);
     TracksListener myListenerRead(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpySave(&myPlayListSave, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpySave(&myPlayListSave, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpySave(&myPlayListSave, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpySave(&myPlayListSave, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpySave(&myPlayListSave, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpySave(&myPlayListSave, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpySave(&myPlayListSave, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpySave(&myPlayListSave, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpySave(&myPlayListSave, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpySave(&myPlayListSave, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpySave(&myPlayListSave, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpySave(&myPlayListSave, &MediaPlayList::newEntryInList);
     QSignalSpy rowsAboutToBeMovedSpyRead(&myPlayListRead, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpyRead(&myPlayListRead, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpyRead(&myPlayListRead, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpyRead(&myPlayListRead, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpyRead(&myPlayListRead, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpyRead(&myPlayListRead, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpyRead(&myPlayListRead, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpyRead(&myPlayListRead, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpyRead(&myPlayListRead, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpyRead(&myPlayListRead, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpyRead(&myPlayListRead, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpyRead(&myPlayListRead, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 0);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 0);
     QCOMPARE(persistentStateChangedSpySave.count(), 0);
     QCOMPARE(dataChangedSpySave.count(), 0);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListenerSave, &TracksListener::trackHasChanged,
             &myPlayListSave, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListenerSave, &TracksListener::albumAdded,
-            &myPlayListSave, &MediaPlayList::albumAdded,
+    connect(&myListenerSave, &TracksListener::tracksListAdded,
+            &myPlayListSave, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayListSave, &MediaPlayList::newTrackByNameInList,
             &myListenerSave, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayListSave, &MediaPlayList::newTrackByFileNameInList,
-            &myListenerSave, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayListSave, &MediaPlayList::newEntryInList,
             &myListenerSave, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListenerSave, &TracksListener::tracksAdded);
     connect(&myListenerRead, &TracksListener::trackHasChanged,
             &myPlayListRead, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListenerRead, &TracksListener::albumAdded,
-            &myPlayListRead, &MediaPlayList::albumAdded,
+    connect(&myListenerRead, &TracksListener::tracksListAdded,
+            &myPlayListRead, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayListRead, &MediaPlayList::newTrackByNameInList,
             &myListenerRead, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayListRead, &MediaPlayList::newTrackByFileNameInList,
-            &myListenerRead, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayListRead, &MediaPlayList::newEntryInList,
             &myListenerRead, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListenerRead, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 0);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 0);
     QCOMPARE(persistentStateChangedSpySave.count(), 0);
     QCOMPARE(dataChangedSpySave.count(), 0);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist2"),
                                                                                QStringLiteral("album3"), 1, 1);
     myPlayListSave.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 1);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 1);
     QCOMPARE(persistentStateChangedSpySave.count(), 1);
     QCOMPARE(dataChangedSpySave.count(), 0);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 1);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(dataChangedSpySave.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 1);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 1);
     QCOMPARE(persistentStateChangedSpySave.count(), 1);
     QCOMPARE(dataChangedSpySave.count(), 1);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 1);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                                                 QStringLiteral("album1"), 1, 1);
     myPlayListSave.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 2);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 2);
     QCOMPARE(persistentStateChangedSpySave.count(), 2);
     QCOMPARE(dataChangedSpySave.count(), 1);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 2);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(dataChangedSpySave.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 2);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 2);
     QCOMPARE(persistentStateChangedSpySave.count(), 2);
     QCOMPARE(dataChangedSpySave.count(), 2);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 2);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist2"),
                                                                                QStringLiteral("album3"), 2, 1);
     myPlayListSave.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 3);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 3);
     QCOMPARE(persistentStateChangedSpySave.count(), 3);
     QCOMPARE(dataChangedSpySave.count(), 2);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 3);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(dataChangedSpySave.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 3);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 3);
     QCOMPARE(persistentStateChangedSpySave.count(), 3);
     QCOMPARE(dataChangedSpySave.count(), 3);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 3);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 0);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 0);
     QCOMPARE(persistentStateChangedSpyRead.count(), 0);
     QCOMPARE(dataChangedSpyRead.count(), 0);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 0);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(11));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album3"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album3")));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$11")));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(1));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$1")));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(1, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(12));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album3"));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album3")));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$12")));
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListSave.data(myPlayListSave.index(2, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), true);
 
     myPlayListRead.setPersistentState(myPlayListSave.persistentState());
 
     QCOMPARE(dataChangedSpyRead.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpySave.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpySave.count(), 3);
     QCOMPARE(rowsRemovedSpySave.count(), 0);
     QCOMPARE(rowsMovedSpySave.count(), 0);
     QCOMPARE(rowsInsertedSpySave.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpySave.count(), 3);
     QCOMPARE(persistentStateChangedSpySave.count(), 3);
     QCOMPARE(dataChangedSpySave.count(), 3);
     QCOMPARE(newTrackByNameInListSpySave.count(), 0);
     QCOMPARE(newEntryInListSpySave.count(), 3);
     QCOMPARE(rowsAboutToBeRemovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpyRead.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpyRead.count(), 3);
     QCOMPARE(rowsRemovedSpyRead.count(), 0);
     QCOMPARE(rowsMovedSpyRead.count(), 0);
     QCOMPARE(rowsInsertedSpyRead.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpyRead.count(), 3);
     QCOMPARE(persistentStateChangedSpyRead.count(), 4);
     QCOMPARE(dataChangedSpyRead.count(), 6);
     QCOMPARE(newTrackByNameInListSpyRead.count(), 3);
     QCOMPARE(newEntryInListSpyRead.count(), 0);
 
     QCOMPARE(myPlayListRead.tracksCount(), 3);
 
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(11));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album3"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album3")));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$11")));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(1));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$1")));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(1, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(12));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album3"));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album3")));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$12")));
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayListRead.data(myPlayListRead.index(2, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), true);
 }
 
 void MediaPlayListTest::testReplaceAndPlayArtist()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
-    myPlayList.replaceAndPlay(QStringLiteral("artist3"));
+    myPlayList.replaceAndPlay({0, QStringLiteral("artist3")}, ElisaUtils::Artist);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(3));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$3")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
 
-    myPlayList.replaceAndPlay(QStringLiteral("artist4"));
+    myPlayList.replaceAndPlay({0, QStringLiteral("artist4")}, ElisaUtils::Artist);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 4);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.tracksCount(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(4));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist4"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$4")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
 }
 
 void MediaPlayListTest::testReplaceAndPlayTrackId()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist3"),
-                                                                                QStringLiteral("album1"), 3, 3);
+                                                                               QStringLiteral("album1"), 3, 3);
 
     QCOMPARE(firstTrackId != 0, true);
 
-    myPlayList.replaceAndPlay(firstTrackId);
+    myPlayList.replaceAndPlay({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(3));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$3")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist4"),
                                                                                 QStringLiteral("album1"), 4, 4);
 
     QCOMPARE(secondTrackId != 0, true);
 
-    myPlayList.replaceAndPlay(secondTrackId);
+    myPlayList.replaceAndPlay({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.tracksCount(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(4));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist4"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$4")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
 }
 
 void MediaPlayListTest::testReplaceAndPlayTrackData()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track3"), QStringLiteral("artist3"),
-                                                                                QStringLiteral("album1"), 3, 3);
+                                                                               QStringLiteral("album1"), 3, 3);
 
     QCOMPARE(firstTrackId != 0, true);
 
     auto firstTrack = myDatabaseContent.trackDataFromDatabaseId(firstTrackId);
 
     QVERIFY(!firstTrack.isEmpty());
 
     myPlayList.replaceAndPlay(firstTrack);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(3));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist3"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("file:///$3")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track4"), QStringLiteral("artist4"),
                                                                                 QStringLiteral("album1"), 4, 4);
 
     QCOMPARE(secondTrackId != 0, true);
 
     auto secondTrack = myDatabaseContent.trackDataFromDatabaseId(secondTrackId);
 
     QVERIFY(!secondTrack.isEmpty());
 
     myPlayList.replaceAndPlay(secondTrack);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 1);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 1);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.tracksCount(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DurationRole).toTime(), QTime::fromMSecsSinceStartOfDay(4));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist4"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ImageUrlRole).toUrl(), QUrl::fromLocalFile(QStringLiteral("album1")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ResourceRole).toUrl(), QUrl::fromUserInput(QStringLiteral("/$4")));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsSingleDiscAlbumRole).toBool(), false);
 }
 
 void MediaPlayListTest::testSetData()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     auto firstTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist2"),
                                                                                QStringLiteral("album3"), 1, 1);
     myPlayList.enqueue({firstTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 1);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
 
     auto secondTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                                                 QStringLiteral("album1"), 1, 1);
     myPlayList.enqueue({secondTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 2);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
 
     auto thirdTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist2"),
                                                                                QStringLiteral("album3"), 2, 1);
     myPlayList.enqueue({thirdTrackId, {}}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
 
     QCOMPARE(myPlayList.setData(myPlayList.index(2, 0), true, MediaPlayList::ColumnsRoles::IsPlayingRole), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::HasAlbumHeader).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsPlayingRole).toBool(), true);
 
     QCOMPARE(myPlayList.setData(myPlayList.index(2, 0), true, MediaPlayList::ColumnsRoles::TitleRole), false);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.setData(myPlayList.index(4, 0), true, MediaPlayList::ColumnsRoles::TitleRole), false);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 
     QCOMPARE(myPlayList.setData({}, true, MediaPlayList::ColumnsRoles::TitleRole), false);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 3);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 3);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 3);
     QCOMPARE(persistentStateChangedSpy.count(), 3);
     QCOMPARE(dataChangedSpy.count(), 4);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 3);
 }
 
 void MediaPlayListTest::testRemoveSelection()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
-    myPlayList.replaceAndPlay(QStringLiteral("artist1"));
+    myPlayList.replaceAndPlay({0, QStringLiteral("artist1")}, ElisaUtils::Artist);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track5"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
     myPlayList.removeSelection({2, 4, 5});
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 3);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 3);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 5);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 3);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 }
 
 void MediaPlayListTest::testTrackBeenRemoved()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
-    myPlayList.replaceAndPlay(QStringLiteral("artist1"));
+    myPlayList.replaceAndPlay({0, QStringLiteral("artist1")}, ElisaUtils::Artist);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(dataChangedSpy.wait(), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track5"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
     auto removedTrackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track2"), QStringLiteral("artist1"),
                                                                                  QStringLiteral("album2"), 2, 1);
 
     QCOMPARE(removedTrackId != 0, true);
 
     auto removedTrack = myDatabaseContent.trackDataFromDatabaseId(removedTrackId);
 
     QVERIFY(!removedTrack.isEmpty());
 
     myPlayList.trackRemoved(removedTrack[DatabaseInterface::DatabaseIdRole].toULongLong());
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 2);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 2);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 2);
     QCOMPARE(dataChangedSpy.count(), 2);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 1);
 
     QCOMPARE(myPlayList.tracksCount(), 6);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("Various Artists"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
     QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
     QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
     QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track5"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 5);
     QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 }
 
 CrashEnqueuePlayList::CrashEnqueuePlayList(MediaPlayList *list, QObject *parent) : QObject(parent), mList(list)
 {
 }
 
 void CrashEnqueuePlayList::crashMediaPlayList()
 {
     mList->data(mList->index(0, 0), MediaPlayList::ResourceRole);
 }
 
 void MediaPlayListTest::testBringUpCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testBringUpCaseFromNewAlbum()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     auto newTrackID = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                                              QStringLiteral("album2"), 1, 2);
     myPlayList.enqueue({newTrackID, {}}, ElisaUtils::Track);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndDownCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.removeRow(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 1);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex());
 }
 
 void MediaPlayListTest::testBringUpAndRemoveCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.removeRow(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 1);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex());
 }
 
 void MediaPlayListTest::testBringUpAndRemoveMultipleCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.removeRow(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndRemoveMultipleNotBeginCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album2"), 4, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.removeRow(1);
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndPlayCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist2"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndSkipNextCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist2"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndSkipPreviousCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist2"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndSkipPreviousAndContinueCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.setRepeatPlay(true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 5);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(4, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 6);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(5, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 7);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(4, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 8);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 9);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 10);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 11);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipPreviousTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 12);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(5, 0)));
 }
 
 void MediaPlayListTest::finishPlayList()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist2"), QStringLiteral("album1"), 3, 3});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 1);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::randomPlayList()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.seedRandomGenerator(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.setRandomPlay(true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.randomPlay(), true);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 5);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 }
 
 void MediaPlayListTest::randomAndContinuePlayList()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.seedRandomGenerator(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.setRandomPlay(true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.randomPlay(), true);
 
     myPlayList.setRepeatPlay(true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.repeatPlay(), true);
 
     myPlayList.switchTo(3);
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 5);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 }
 
 void MediaPlayListTest::continuePlayList()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.seedRandomGenerator(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.setRepeatPlay(true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.repeatPlay(), true);
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 5);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testRestoreSettings()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QVariantMap settings;
     settings[QStringLiteral("currentTrack")] = 2;
     settings[QStringLiteral("randomPlay")] = true;
     settings[QStringLiteral("repeatPlay")] = true;
 
     myPlayList.setPersistentState(settings);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.seedRandomGenerator(0);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSpy.count(), 1);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 }
 
 void MediaPlayListTest::testSaveAndRestoreSettings()
 {
     MediaPlayList myPlayListSave;
     QAbstractItemModelTester testModelSave(&myPlayListSave);
     DatabaseInterface myDatabaseContent;
     TracksListener myListenerSave(&myDatabaseContent);
     MediaPlayList myPlayListRestore;
     QAbstractItemModelTester testModelRestore(&myPlayListRestore);
     TracksListener myListenerRestore(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSaveSpy(&myPlayListSave, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSaveSpy(&myPlayListSave, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSaveSpy(&myPlayListSave, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSaveSpy(&myPlayListSave, &MediaPlayList::playListFinished);
     QSignalSpy currentTrackChangedRestoreSpy(&myPlayListRestore, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedRestoreSpy(&myPlayListRestore, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedRestoreSpy(&myPlayListRestore, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedRestoreSpy(&myPlayListRestore, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListenerSave, &TracksListener::trackHasChanged,
             &myPlayListSave, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListenerSave, &TracksListener::albumAdded,
-            &myPlayListSave, &MediaPlayList::albumAdded,
+    connect(&myListenerSave, &TracksListener::tracksListAdded,
+            &myPlayListSave, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayListSave, &MediaPlayList::newTrackByNameInList,
             &myListenerSave, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayListSave, &MediaPlayList::newTrackByFileNameInList,
-            &myListenerSave, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayListSave, &MediaPlayList::newEntryInList,
             &myListenerSave, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListenerSave, &TracksListener::tracksAdded);
 
     connect(&myListenerRestore, &TracksListener::trackHasChanged,
             &myPlayListRestore, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListenerRestore, &TracksListener::albumAdded,
-            &myPlayListRestore, &MediaPlayList::albumAdded,
+    connect(&myListenerRestore, &TracksListener::tracksListAdded,
+            &myPlayListRestore, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayListRestore, &MediaPlayList::newTrackByNameInList,
             &myListenerRestore, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayListRestore, &MediaPlayList::newTrackByFileNameInList,
-            &myListenerRestore, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayListRestore, &MediaPlayList::newEntryInList,
             &myListenerRestore, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListenerRestore, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myPlayListSave.seedRandomGenerator(0);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myPlayListSave.setRepeatPlay(true);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myPlayListSave.setRandomPlay(true);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myPlayListSave.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayListSave.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayListSave.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayListSave.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSaveSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 1);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     QCOMPARE(myPlayListSave.currentTrack(), QPersistentModelIndex(myPlayListSave.index(0, 0)));
 
     myPlayListSave.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 2);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myPlayListSave.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 3);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     myPlayListRestore.setPersistentState(myPlayListSave.persistentState());
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 3);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 1);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 1);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 1);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 1);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 1);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
 
     qDebug() << myPlayListRestore.currentTrack();
 
     QCOMPARE(myPlayListRestore.repeatPlay(), true);
     QCOMPARE(myPlayListRestore.randomPlay(), true);
     const auto indexSavePlaylist = myPlayListRestore.currentTrack();
     QCOMPARE(myPlayListRestore.currentTrack(), QPersistentModelIndex(myPlayListRestore.index(indexSavePlaylist.row(), 0)));
 }
 
 void MediaPlayListTest::removeBeforeCurrentTrack()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(3, 0)));
 
     myPlayList.removeRow(1);
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 }
 
 void MediaPlayListTest::switchToTrackTest()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayList.enqueue({QStringLiteral("track4"), QStringLiteral("artist1"), QStringLiteral("album1"), 4, 4});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album1"), 2, 2});
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.switchTo(4);
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(4, 0)));
 }
 
 void MediaPlayListTest::singleTrack()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 1);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testBringUpAndRemoveLastCase()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSpy(&myPlayList, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSpy(&myPlayList, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSpy(&myPlayList, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSpy(&myPlayList, &MediaPlayList::playListFinished);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     myPlayList.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayList.enqueue({QStringLiteral("track2"), QStringLiteral("artist1"), QStringLiteral("album2"), 2, 1});
     myPlayList.enqueue({QStringLiteral("track3"), QStringLiteral("artist1"), QStringLiteral("album2"), 3, 1});
 
     QCOMPARE(currentTrackChangedSpy.count(), 0);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSpy.count(), 1);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 2);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(1, 0)));
 
     myPlayList.skipNextTrack();
 
     QCOMPARE(currentTrackChangedSpy.count(), 3);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 0);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(2, 0)));
 
     myPlayList.removeRow(2);
 
     QCOMPARE(currentTrackChangedSpy.count(), 4);
     QCOMPARE(randomPlayChangedSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSpy.count(), 0);
     QCOMPARE(playListFinishedSpy.count(), 1);
 
     QCOMPARE(myPlayList.currentTrack(), QPersistentModelIndex(myPlayList.index(0, 0)));
 }
 
 void MediaPlayListTest::testSaveLoadPlayList()
 {
     MediaPlayList myPlayListSave;
     QAbstractItemModelTester testModelSave(&myPlayListSave);
     DatabaseInterface myDatabaseContent;
     TracksListener myListenerSave(&myDatabaseContent);
     MediaPlayList myPlayListRestore;
     QAbstractItemModelTester testModelRestore(&myPlayListRestore);
     TracksListener myListenerRestore(&myDatabaseContent);
 
     QSignalSpy currentTrackChangedSaveSpy(&myPlayListSave, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedSaveSpy(&myPlayListSave, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedSaveSpy(&myPlayListSave, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedSaveSpy(&myPlayListSave, &MediaPlayList::playListFinished);
     QSignalSpy playListLoadedSaveSpy(&myPlayListSave, &MediaPlayList::playListLoaded);
     QSignalSpy playListLoadFailedSaveSpy(&myPlayListSave, &MediaPlayList::playListLoadFailed);
     QSignalSpy currentTrackChangedRestoreSpy(&myPlayListRestore, &MediaPlayList::currentTrackChanged);
     QSignalSpy randomPlayChangedRestoreSpy(&myPlayListRestore, &MediaPlayList::randomPlayChanged);
     QSignalSpy repeatPlayChangedRestoreSpy(&myPlayListRestore, &MediaPlayList::repeatPlayChanged);
     QSignalSpy playListFinishedRestoreSpy(&myPlayListRestore, &MediaPlayList::playListFinished);
     QSignalSpy playListLoadedRestoreSpy(&myPlayListRestore, &MediaPlayList::playListLoaded);
     QSignalSpy playListLoadFailedRestoreSpy(&myPlayListRestore, &MediaPlayList::playListLoadFailed);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListenerSave, &TracksListener::trackHasChanged,
             &myPlayListSave, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListenerSave, &TracksListener::albumAdded,
-            &myPlayListSave, &MediaPlayList::albumAdded,
+    connect(&myListenerSave, &TracksListener::tracksListAdded,
+            &myPlayListSave, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayListSave, &MediaPlayList::newTrackByNameInList,
             &myListenerSave, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayListSave, &MediaPlayList::newTrackByFileNameInList,
-            &myListenerSave, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayListSave, &MediaPlayList::newEntryInList,
             &myListenerSave, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListenerSave, &TracksListener::tracksAdded);
 
     connect(&myListenerRestore, &TracksListener::trackHasChanged,
             &myPlayListRestore, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListenerRestore, &TracksListener::albumAdded,
-            &myPlayListRestore, &MediaPlayList::albumAdded,
+    connect(&myListenerRestore, &TracksListener::tracksListAdded,
+            &myPlayListRestore, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayListRestore, &MediaPlayList::newTrackByNameInList,
             &myListenerRestore, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayListRestore, &MediaPlayList::newTrackByFileNameInList,
-            &myListenerRestore, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayListRestore, &MediaPlayList::newEntryInList,
             &myListenerRestore, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListenerRestore, &TracksListener::tracksAdded);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     myPlayListSave.seedRandomGenerator(0);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     myPlayListSave.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album2"), 1, 1});
     myPlayListSave.enqueue({QStringLiteral("track3"), QStringLiteral("artist3"), QStringLiteral("album1"), 3, 3});
     myPlayListSave.enqueue({QStringLiteral("track5"), QStringLiteral("artist1"), QStringLiteral("album2"), 5, 1});
     myPlayListSave.enqueue({QStringLiteral("track1"), QStringLiteral("artist1"), QStringLiteral("album1"), 1, 1});
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 0);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedSaveSpy.wait(), true);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 1);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     QCOMPARE(myPlayListSave.currentTrack(), QPersistentModelIndex(myPlayListSave.index(0, 0)));
 
     QTemporaryFile playlistFile(QStringLiteral("./myPlaylistXXXXXX.m3u"));
     playlistFile.open();
 
     QCOMPARE(myPlayListSave.savePlaylist(QUrl::fromLocalFile(playlistFile.fileName())), true);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 1);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     myPlayListRestore.loadPlaylist(QUrl::fromLocalFile(playlistFile.fileName()));
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 1);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 0);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 1);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     QCOMPARE(currentTrackChangedRestoreSpy.wait(300), true);
 
     QCOMPARE(currentTrackChangedSaveSpy.count(), 1);
     QCOMPARE(randomPlayChangedSaveSpy.count(), 0);
     QCOMPARE(repeatPlayChangedSaveSpy.count(), 0);
     QCOMPARE(playListFinishedSaveSpy.count(), 0);
     QCOMPARE(playListLoadedSaveSpy.count(), 0);
     QCOMPARE(playListLoadFailedSaveSpy.count(), 0);
     QCOMPARE(currentTrackChangedRestoreSpy.count(), 1);
     QCOMPARE(randomPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(repeatPlayChangedRestoreSpy.count(), 0);
     QCOMPARE(playListFinishedRestoreSpy.count(), 0);
     QCOMPARE(playListLoadedRestoreSpy.count(), 1);
     QCOMPARE(playListLoadFailedRestoreSpy.count(), 0);
 
     QCOMPARE(myPlayListRestore.currentTrack(), QPersistentModelIndex(myPlayListRestore.index(0, 0)));
 }
 
 void MediaPlayListTest::testEnqueueFiles()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue({{0, QStringLiteral("/$1")}, {0, QStringLiteral("/$2")}}, ElisaUtils::FileName);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 2);
-    QCOMPARE(newEntryInListSpy.count(), 0);
+    QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.rowCount(), 2);
 
     QCOMPARE(dataChangedSpy.wait(300), true);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 2);
-    QCOMPARE(newEntryInListSpy.count(), 0);
+    QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist1"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("album1"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 2);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 2);
 }
 
 void MediaPlayListTest::testEnqueueSampleFiles()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
     QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue({{0, QStringLiteral(MEDIAPLAYLIST_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/test.ogg")},
                         {0, QStringLiteral(MEDIAPLAYLIST_TESTS_SAMPLE_FILES_PATH) + QStringLiteral("/test2.ogg")}},
                        ElisaUtils::FileName);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 1);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 2);
-    QCOMPARE(newEntryInListSpy.count(), 0);
+    QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.rowCount(), 2);
 
     while (dataChangedSpy.count() < 3) {
         QCOMPARE(dataChangedSpy.wait(), true);
     }
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 1);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 1);
     QCOMPARE(dataChangedSpy.count(), 3);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 2);
-    QCOMPARE(newEntryInListSpy.count(), 0);
+    QCOMPARE(newEntryInListSpy.count(), 2);
 
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("Title"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("Test"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("Artist"));
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 1000);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("Title2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::AlbumRole).toString(), QStringLiteral("Test2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("Artist2"));
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::TrackNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::DiscNumberRole).toInt(), 1);
     QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 1000);
 }
 
 void MediaPlayListTest::testEmptyEnqueue()
 {
     MediaPlayList myPlayList;
     QAbstractItemModelTester testModel(&myPlayList);
     DatabaseInterface myDatabaseContent;
     TracksListener myListener(&myDatabaseContent);
 
     QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
     QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
     QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
     QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
     QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
     QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
-    QSignalSpy trackHasBeenAddedSpy(&myPlayList, &MediaPlayList::trackHasBeenAdded);
     QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
     QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
-        QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
-    QSignalSpy newTrackByFileNameInListSpy(&myPlayList, &MediaPlayList::newTrackByFileNameInList);
+    QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
     QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
     connect(&myListener, &TracksListener::trackHasChanged,
             &myPlayList, &MediaPlayList::trackChanged,
             Qt::QueuedConnection);
-    connect(&myListener, &TracksListener::albumAdded,
-            &myPlayList, &MediaPlayList::albumAdded,
+    connect(&myListener, &TracksListener::tracksListAdded,
+            &myPlayList, &MediaPlayList::tracksListAdded,
             Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
             &myListener, &TracksListener::trackByNameInList,
             Qt::QueuedConnection);
-    connect(&myPlayList, &MediaPlayList::newTrackByFileNameInList,
-            &myListener, &TracksListener::trackByFileNameInList,
-            Qt::QueuedConnection);
     connect(&myPlayList, &MediaPlayList::newEntryInList,
             &myListener, &TracksListener::newEntryInList,
             Qt::QueuedConnection);
     connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
             &myListener, &TracksListener::tracksAdded);
 
     myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
-    myPlayList.enqueue(QList<ElisaUtils::EntryData>{}, ElisaUtils::Track);
+    myPlayList.enqueue(ElisaUtils::EntryDataList{}, ElisaUtils::Track);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
-    myPlayList.enqueue(QList<ElisaUtils::EntryData>{}, ElisaUtils::FileName);
+    myPlayList.enqueue(ElisaUtils::EntryDataList{}, ElisaUtils::FileName);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue(QList<MusicAudioTrack>{}, ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
     myPlayList.enqueue(QList<MusicAlbum>{}, ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 
-    myPlayList.enqueueArtists({}, ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
+    myPlayList.enqueue(ElisaUtils::EntryDataList{},
+                       ElisaUtils::Artist,
+                       ElisaUtils::AppendPlayList,
+                       ElisaUtils::DoNotTriggerPlay);
 
     QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
     QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
     QCOMPARE(rowsRemovedSpy.count(), 0);
     QCOMPARE(rowsMovedSpy.count(), 0);
     QCOMPARE(rowsInsertedSpy.count(), 0);
-    QCOMPARE(trackHasBeenAddedSpy.count(), 0);
     QCOMPARE(persistentStateChangedSpy.count(), 0);
     QCOMPARE(dataChangedSpy.count(), 0);
     QCOMPARE(newTrackByNameInListSpy.count(), 0);
-    QCOMPARE(newTrackByFileNameInListSpy.count(), 0);
     QCOMPARE(newEntryInListSpy.count(), 0);
 }
 
 QTEST_GUILESS_MAIN(MediaPlayListTest)
 
 
 #include "moc_mediaplaylisttest.cpp"
diff --git a/autotests/trackslistenertest.cpp b/autotests/trackslistenertest.cpp
index 38558b8a..dfd43ead 100644
--- a/autotests/trackslistenertest.cpp
+++ b/autotests/trackslistenertest.cpp
@@ -1,482 +1,483 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "databasetestdata.h"
 
 #include "trackslistener.h"
 #include "mediaplaylist.h"
 #include "databaseinterface.h"
 
 #include "config-upnp-qt.h"
 
 #include <QObject>
 #include <QUrl>
 #include <QString>
 #include <QHash>
 #include <QVector>
 #include <QThread>
 #include <QMetaObject>
 #include <QStandardPaths>
 #include <QDir>
 #include <QFile>
 
 #include <QDebug>
 
 #include <QtTest>
 
 class TracksListenerTests: public QObject, public DatabaseTestData
 {
     Q_OBJECT
 
 public:
 
     TracksListenerTests(QObject *parent = nullptr) : QObject(parent)
     {
     }
 
 private Q_SLOTS:
 
     void initTestCase()
     {
         qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
         qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
         qRegisterMetaType<QList<MusicAudioTrack>>("QList<MusicAudioTrack>");
         qRegisterMetaType<QVector<qlonglong>>("QVector<qlonglong>");
         qRegisterMetaType<QHash<qlonglong,int>>("QHash<qlonglong,int>");
         qRegisterMetaType<QList<QUrl>>("QList<QUrl>");
         qRegisterMetaType<DatabaseInterface::ListTrackDataType>("ListTrackDataType");
         qRegisterMetaType<DatabaseInterface::ListAlbumDataType>("ListAlbumDataType");
         qRegisterMetaType<DatabaseInterface::ListArtistDataType>("ListArtistDataType");
         qRegisterMetaType<DatabaseInterface::ListGenreDataType>("ListGenreDataType");
         qRegisterMetaType<DatabaseInterface::TrackDataType>("TrackDataType");
         qRegisterMetaType<DatabaseInterface::AlbumDataType>("AlbumDataType");
         qRegisterMetaType<DatabaseInterface::ArtistDataType>("ArtistDataType");
         qRegisterMetaType<DatabaseInterface::GenreDataType>("GenreDataType");
+        qRegisterMetaType<ElisaUtils::PlayListEntryType>("PlayListEntryType");
     }
 
     void testTrackRemoval()
     {
         MediaPlayList myPlayList;
         DatabaseInterface myDatabaseContent;
         TracksListener myListener(&myDatabaseContent);
 
         QSignalSpy trackHasChangedSpy(&myListener, &TracksListener::trackHasChanged);
         QSignalSpy trackHasBeenRemovedSpy(&myListener, &TracksListener::trackHasBeenRemoved);
-        QSignalSpy albumAddedSpy(&myListener, &TracksListener::albumAdded);
+        QSignalSpy tracksListAddedSpy(&myListener, &TracksListener::tracksListAdded);
 
         myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
         connect(&myDatabaseContent, &DatabaseInterface::trackRemoved, &myListener, &TracksListener::trackRemoved);
         connect(&myDatabaseContent, &DatabaseInterface::tracksAdded, &myListener, &TracksListener::tracksAdded);
         connect(&myDatabaseContent, &DatabaseInterface::trackModified, &myListener, &TracksListener::trackModified);
         connect(&myListener, &TracksListener::trackHasChanged, &myPlayList, &MediaPlayList::trackChanged);
         connect(&myListener, &TracksListener::trackHasBeenRemoved, &myPlayList, &MediaPlayList::trackRemoved);
-        connect(&myListener, &TracksListener::albumAdded, &myPlayList, &MediaPlayList::albumAdded);
+        connect(&myListener, &TracksListener::tracksListAdded, &myPlayList, &MediaPlayList::tracksListAdded);
         connect(&myPlayList, &MediaPlayList::newEntryInList, &myListener, &TracksListener::newEntryInList);
         connect(&myPlayList, &MediaPlayList::newTrackByNameInList, &myListener, &TracksListener::trackByNameInList);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
-        myPlayList.replaceAndPlay(QStringLiteral("artist1"));
+        myPlayList.replaceAndPlay({0, QStringLiteral("artist1")}, ElisaUtils::Artist);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 1);
+        QCOMPARE(tracksListAddedSpy.count(), 1);
 
         QCOMPARE(myPlayList.tracksCount(), 6);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track5"));
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 5);
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
         myDatabaseContent.removeTracksList({QUrl::fromLocalFile(QStringLiteral("/$1"))});
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 1);
-        QCOMPARE(albumAddedSpy.count(), 1);
+        QCOMPARE(tracksListAddedSpy.count(), 1);
 
         QCOMPARE(myPlayList.tracksCount(), 6);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(1, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track2"));
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
         QCOMPARE(myPlayList.data(myPlayList.index(2, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track3"));
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 3);
         QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track4"));
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 4);
         QCOMPARE(myPlayList.data(myPlayList.index(4, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track5"));
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album2"));
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 5);
         QCOMPARE(myPlayList.data(myPlayList.index(5, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
     }
 
     void testInsertTrackIdAndRemoval()
     {
         MediaPlayList myPlayList;
         DatabaseInterface myDatabaseContent;
         TracksListener myListener(&myDatabaseContent);
 
         QSignalSpy trackHasChangedSpy(&myListener, &TracksListener::trackHasChanged);
         QSignalSpy trackHasBeenRemovedSpy(&myListener, &TracksListener::trackHasBeenRemoved);
-        QSignalSpy albumAddedSpy(&myListener, &TracksListener::albumAdded);
+        QSignalSpy tracksListAddedSpy(&myListener, &TracksListener::tracksListAdded);
 
         myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
         connect(&myDatabaseContent, &DatabaseInterface::trackRemoved, &myListener, &TracksListener::trackRemoved);
         connect(&myDatabaseContent, &DatabaseInterface::tracksAdded, &myListener, &TracksListener::tracksAdded);
         connect(&myDatabaseContent, &DatabaseInterface::trackModified, &myListener, &TracksListener::trackModified);
         connect(&myListener, &TracksListener::trackHasChanged, &myPlayList, &MediaPlayList::trackChanged);
         connect(&myListener, &TracksListener::trackHasBeenRemoved, &myPlayList, &MediaPlayList::trackRemoved);
-        connect(&myListener, &TracksListener::albumAdded, &myPlayList, &MediaPlayList::albumAdded);
+        connect(&myListener, &TracksListener::tracksListAdded, &myPlayList, &MediaPlayList::tracksListAdded);
         connect(&myPlayList, &MediaPlayList::newEntryInList, &myListener, &TracksListener::newEntryInList);
         connect(&myPlayList, &MediaPlayList::newTrackByNameInList, &myListener, &TracksListener::trackByNameInList);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         auto trackId = myDatabaseContent.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                                               QStringLiteral("album1"), 1, 1);
 
         QCOMPARE(trackId != 0, true);
 
-        myPlayList.replaceAndPlay(trackId);
+        myPlayList.replaceAndPlay({trackId, {}}, ElisaUtils::Track);
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
         myDatabaseContent.removeTracksList({QUrl::fromLocalFile(QStringLiteral("/$1"))});
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 1);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
     }
 
     void testInsertTrackByNameAndRemoval()
     {
         MediaPlayList myPlayList;
         DatabaseInterface myDatabaseContent;
         TracksListener myListener(&myDatabaseContent);
 
         QSignalSpy trackHasChangedSpy(&myListener, &TracksListener::trackHasChanged);
         QSignalSpy trackHasBeenRemovedSpy(&myListener, &TracksListener::trackHasBeenRemoved);
-        QSignalSpy albumAddedSpy(&myListener, &TracksListener::albumAdded);
+        QSignalSpy tracksListAddedSpy(&myListener, &TracksListener::tracksListAdded);
 
         myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
         connect(&myDatabaseContent, &DatabaseInterface::trackRemoved, &myListener, &TracksListener::trackRemoved);
         connect(&myDatabaseContent, &DatabaseInterface::tracksAdded, &myListener, &TracksListener::tracksAdded);
         connect(&myDatabaseContent, &DatabaseInterface::trackModified, &myListener, &TracksListener::trackModified);
         connect(&myListener, &TracksListener::trackHasChanged, &myPlayList, &MediaPlayList::trackChanged);
         connect(&myListener, &TracksListener::trackHasBeenRemoved, &myPlayList, &MediaPlayList::trackRemoved);
-        connect(&myListener, &TracksListener::albumAdded, &myPlayList, &MediaPlayList::albumAdded);
+        connect(&myListener, &TracksListener::tracksListAdded, &myPlayList, &MediaPlayList::tracksListAdded);
         connect(&myPlayList, &MediaPlayList::newEntryInList, &myListener, &TracksListener::newEntryInList);
         connect(&myPlayList, &MediaPlayList::newTrackByNameInList, &myListener, &TracksListener::trackByNameInList);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myPlayList.enqueue(MediaPlayListEntry(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                       QStringLiteral("album1"), 1, 1));
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
         myDatabaseContent.removeTracksList({QUrl::fromLocalFile(QStringLiteral("/$1"))});
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 1);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
     }
 
     void testInsertTrackByNameBeforeDatabaseAndRemoval()
     {
         MediaPlayList myPlayList;
         DatabaseInterface myDatabaseContent;
         TracksListener myListener(&myDatabaseContent);
 
         QSignalSpy trackHasChangedSpy(&myListener, &TracksListener::trackHasChanged);
         QSignalSpy trackHasBeenRemovedSpy(&myListener, &TracksListener::trackHasBeenRemoved);
-        QSignalSpy albumAddedSpy(&myListener, &TracksListener::albumAdded);
+        QSignalSpy tracksListAddedSpy(&myListener, &TracksListener::tracksListAdded);
 
         myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
         connect(&myDatabaseContent, &DatabaseInterface::trackRemoved, &myListener, &TracksListener::trackRemoved);
         connect(&myDatabaseContent, &DatabaseInterface::tracksAdded, &myListener, &TracksListener::tracksAdded);
         connect(&myDatabaseContent, &DatabaseInterface::trackModified, &myListener, &TracksListener::trackModified);
         connect(&myListener, &TracksListener::trackHasChanged, &myPlayList, &MediaPlayList::trackChanged);
         connect(&myListener, &TracksListener::trackHasBeenRemoved, &myPlayList, &MediaPlayList::trackRemoved);
-        connect(&myListener, &TracksListener::albumAdded, &myPlayList, &MediaPlayList::albumAdded);
+        connect(&myListener, &TracksListener::tracksListAdded, &myPlayList, &MediaPlayList::tracksListAdded);
         connect(&myPlayList, &MediaPlayList::newEntryInList, &myListener, &TracksListener::newEntryInList);
         connect(&myPlayList, &MediaPlayList::newTrackByNameInList, &myListener, &TracksListener::trackByNameInList);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myPlayList.enqueue(MediaPlayListEntry(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                       QStringLiteral("album1"), 1, 1));
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
 
         myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
         myDatabaseContent.removeTracksList({QUrl::fromLocalFile(QStringLiteral("/$1"))});
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 1);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
     }
 
     void testInsertTrackByNameModifyAndRemoval()
     {
         MediaPlayList myPlayList;
         DatabaseInterface myDatabaseContent;
         TracksListener myListener(&myDatabaseContent);
 
         QSignalSpy trackHasChangedSpy(&myListener, &TracksListener::trackHasChanged);
         QSignalSpy trackHasBeenRemovedSpy(&myListener, &TracksListener::trackHasBeenRemoved);
-        QSignalSpy albumAddedSpy(&myListener, &TracksListener::albumAdded);
+        QSignalSpy tracksListAddedSpy(&myListener, &TracksListener::tracksListAdded);
 
         myDatabaseContent.init(QStringLiteral("testDbDirectContent"));
 
         connect(&myDatabaseContent, &DatabaseInterface::trackRemoved, &myListener, &TracksListener::trackRemoved);
         connect(&myDatabaseContent, &DatabaseInterface::tracksAdded, &myListener, &TracksListener::tracksAdded);
         connect(&myDatabaseContent, &DatabaseInterface::trackModified, &myListener, &TracksListener::trackModified);
         connect(&myListener, &TracksListener::trackHasChanged, &myPlayList, &MediaPlayList::trackChanged);
         connect(&myListener, &TracksListener::trackHasBeenRemoved, &myPlayList, &MediaPlayList::trackRemoved);
-        connect(&myListener, &TracksListener::albumAdded, &myPlayList, &MediaPlayList::albumAdded);
+        connect(&myListener, &TracksListener::tracksListAdded, &myPlayList, &MediaPlayList::tracksListAdded);
         connect(&myPlayList, &MediaPlayList::newEntryInList, &myListener, &TracksListener::newEntryInList);
         connect(&myPlayList, &MediaPlayList::newTrackByNameInList, &myListener, &TracksListener::trackByNameInList);
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myDatabaseContent.insertTracksList(mNewTracks, mNewCovers, QStringLiteral("autoTest"));
 
         QCOMPARE(trackHasChangedSpy.count(), 0);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         myPlayList.enqueue(MediaPlayListEntry(QStringLiteral("track1"), QStringLiteral("artist1"),
                                                       QStringLiteral("album1"), 1, 1));
 
         QCOMPARE(trackHasChangedSpy.count(), 1);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 1);
 
         myDatabaseContent.insertTracksList({
                                                {true, QStringLiteral("$1"), QStringLiteral("0"), QStringLiteral("track1"),
                                                 QStringLiteral("artist1"), QStringLiteral("album1"), QStringLiteral("Various Artists"),
                                                 2, 3, QTime::fromMSecsSinceStartOfDay(1000), {QUrl::fromLocalFile(QStringLiteral("/$1"))},
                                                 QDateTime::fromMSecsSinceEpoch(1),
                                                 {QUrl::fromLocalFile(QStringLiteral("file://image$1"))}, 1, false,
                                                 {}, {}, QStringLiteral("lyricist1"), false}
                                            }, mNewCovers, QStringLiteral("autoTest"));
 
         QCOMPARE(trackHasChangedSpy.count(), 2);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 0);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), true);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), 2);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 3);
 
         myDatabaseContent.removeTracksList({QUrl::fromLocalFile(QStringLiteral("/$1"))});
 
         QCOMPARE(trackHasChangedSpy.count(), 2);
         QCOMPARE(trackHasBeenRemovedSpy.count(), 1);
-        QCOMPARE(albumAddedSpy.count(), 0);
+        QCOMPARE(tracksListAddedSpy.count(), 0);
 
         QCOMPARE(myPlayList.tracksCount(), 1);
 
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::IsValidRole).toBool(), false);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TitleRole).toString(), QStringLiteral("track1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::ArtistRole).toString(), QStringLiteral("artist1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::AlbumRole).toString(), QStringLiteral("album1"));
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::TrackNumberRole).toInt(), -1);
         QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ColumnsRoles::DiscNumberRole).toInt(), 0);
     }
 };
 
 QTEST_GUILESS_MAIN(TracksListenerTests)
 
 
 #include "trackslistenertest.moc"
diff --git a/src/databaseinterface.cpp b/src/databaseinterface.cpp
index d088e38b..0816f78c 100644
--- a/src/databaseinterface.cpp
+++ b/src/databaseinterface.cpp
@@ -1,5201 +1,5243 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "databaseinterface.h"
 
 #include <KI18n/KLocalizedString>
 
 #include <QSqlDatabase>
 #include <QSqlDriver>
 #include <QSqlQuery>
 #include <QSqlRecord>
 #include <QSqlError>
 
 #include <QMutex>
 #include <QVariant>
 #include <QAtomicInt>
 #include <QDebug>
 
 #include <algorithm>
 
 class DatabaseInterfacePrivate
 {
 public:
 
     DatabaseInterfacePrivate(const QSqlDatabase &tracksDatabase)
         : mTracksDatabase(tracksDatabase), mSelectAlbumQuery(mTracksDatabase),
           mSelectTrackQuery(mTracksDatabase), mSelectAlbumIdFromTitleQuery(mTracksDatabase),
           mInsertAlbumQuery(mTracksDatabase), mSelectTrackIdFromTitleAlbumIdArtistQuery(mTracksDatabase),
           mInsertTrackQuery(mTracksDatabase), mSelectTracksFromArtist(mTracksDatabase),
           mSelectTrackFromIdQuery(mTracksDatabase), mSelectCountAlbumsForArtistQuery(mTracksDatabase),
           mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery(mTracksDatabase), mSelectAllAlbumsQuery(mTracksDatabase),
           mSelectAllAlbumsFromArtistQuery(mTracksDatabase), mSelectAllArtistsQuery(mTracksDatabase),
           mInsertArtistsQuery(mTracksDatabase), mSelectArtistByNameQuery(mTracksDatabase),
           mSelectArtistQuery(mTracksDatabase), mSelectTrackFromFilePathQuery(mTracksDatabase),
           mRemoveTrackQuery(mTracksDatabase), mRemoveAlbumQuery(mTracksDatabase),
           mRemoveArtistQuery(mTracksDatabase), mSelectAllTracksQuery(mTracksDatabase),
           mInsertTrackMapping(mTracksDatabase), mSelectAllTracksFromSourceQuery(mTracksDatabase),
           mInsertMusicSource(mTracksDatabase), mSelectMusicSource(mTracksDatabase),
           mUpdateTrackMapping(mTracksDatabase),
           mSelectTracksMapping(mTracksDatabase), mSelectTracksMappingPriority(mTracksDatabase),
           mUpdateAlbumArtUriFromAlbumIdQuery(mTracksDatabase), mSelectTracksMappingPriorityByTrackId(mTracksDatabase),
           mSelectAllTrackFilesFromSourceQuery(mTracksDatabase),  mSelectAlbumIdsFromArtist(mTracksDatabase),
           mRemoveTracksMappingFromSource(mTracksDatabase), mRemoveTracksMapping(mTracksDatabase),
           mSelectTracksWithoutMappingQuery(mTracksDatabase), mSelectAlbumIdFromTitleAndArtistQuery(mTracksDatabase),
           mSelectAlbumIdFromTitleWithoutArtistQuery(mTracksDatabase),
           mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery(mTracksDatabase), mSelectAlbumArtUriFromAlbumIdQuery(mTracksDatabase),
           mInsertComposerQuery(mTracksDatabase), mSelectComposerByNameQuery(mTracksDatabase),
           mSelectComposerQuery(mTracksDatabase), mInsertLyricistQuery(mTracksDatabase),
           mSelectLyricistByNameQuery(mTracksDatabase), mSelectLyricistQuery(mTracksDatabase),
           mInsertGenreQuery(mTracksDatabase), mSelectGenreByNameQuery(mTracksDatabase),
           mSelectGenreQuery(mTracksDatabase), mSelectAllTracksShortQuery(mTracksDatabase),
           mSelectAllAlbumsShortQuery(mTracksDatabase), mSelectAllComposersQuery(mTracksDatabase),
           mSelectAllLyricistsQuery(mTracksDatabase), mSelectCountAlbumsForComposerQuery(mTracksDatabase),
           mSelectCountAlbumsForLyricistQuery(mTracksDatabase), mSelectAllGenresQuery(mTracksDatabase),
           mSelectGenreForArtistQuery(mTracksDatabase), mSelectGenreForAlbumQuery(mTracksDatabase),
           mUpdateTrackQuery(mTracksDatabase), mUpdateAlbumArtistQuery(mTracksDatabase),
           mUpdateAlbumArtistInTracksQuery(mTracksDatabase), mQueryMaximumTrackIdQuery(mTracksDatabase),
           mQueryMaximumAlbumIdQuery(mTracksDatabase), mQueryMaximumArtistIdQuery(mTracksDatabase),
           mQueryMaximumLyricistIdQuery(mTracksDatabase), mQueryMaximumComposerIdQuery(mTracksDatabase),
           mQueryMaximumGenreIdQuery(mTracksDatabase)
     {
     }
 
     QSqlDatabase mTracksDatabase;
 
     QSqlQuery mSelectAlbumQuery;
 
     QSqlQuery mSelectTrackQuery;
 
     QSqlQuery mSelectAlbumIdFromTitleQuery;
 
     QSqlQuery mInsertAlbumQuery;
 
     QSqlQuery mSelectTrackIdFromTitleAlbumIdArtistQuery;
 
     QSqlQuery mInsertTrackQuery;
 
     QSqlQuery mSelectTracksFromArtist;
 
     QSqlQuery mSelectTrackFromIdQuery;
 
     QSqlQuery mSelectCountAlbumsForArtistQuery;
 
     QSqlQuery mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery;
 
     QSqlQuery mSelectAllAlbumsQuery;
 
     QSqlQuery mSelectAllAlbumsFromArtistQuery;
 
     QSqlQuery mSelectAllArtistsQuery;
 
     QSqlQuery mInsertArtistsQuery;
 
     QSqlQuery mSelectArtistByNameQuery;
 
     QSqlQuery mSelectArtistQuery;
 
     QSqlQuery mSelectTrackFromFilePathQuery;
 
     QSqlQuery mRemoveTrackQuery;
 
     QSqlQuery mRemoveAlbumQuery;
 
     QSqlQuery mRemoveArtistQuery;
 
     QSqlQuery mSelectAllTracksQuery;
 
     QSqlQuery mInsertTrackMapping;
 
     QSqlQuery mSelectAllTracksFromSourceQuery;
 
     QSqlQuery mInsertMusicSource;
 
     QSqlQuery mSelectMusicSource;
 
     QSqlQuery mUpdateTrackMapping;
 
     QSqlQuery mSelectTracksMapping;
 
     QSqlQuery mSelectTracksMappingPriority;
 
     QSqlQuery mUpdateAlbumArtUriFromAlbumIdQuery;
 
     QSqlQuery mSelectTracksMappingPriorityByTrackId;
 
     QSqlQuery mSelectAllTrackFilesFromSourceQuery;
 
     QSqlQuery mSelectAlbumIdsFromArtist;
 
     QSqlQuery mRemoveTracksMappingFromSource;
 
     QSqlQuery mRemoveTracksMapping;
 
     QSqlQuery mSelectTracksWithoutMappingQuery;
 
     QSqlQuery mSelectAlbumIdFromTitleAndArtistQuery;
 
     QSqlQuery mSelectAlbumIdFromTitleWithoutArtistQuery;
 
     QSqlQuery mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery;
 
     QSqlQuery mSelectAlbumArtUriFromAlbumIdQuery;
 
     QSqlQuery mInsertComposerQuery;
 
     QSqlQuery mSelectComposerByNameQuery;
 
     QSqlQuery mSelectComposerQuery;
 
     QSqlQuery mInsertLyricistQuery;
 
     QSqlQuery mSelectLyricistByNameQuery;
 
     QSqlQuery mSelectLyricistQuery;
 
     QSqlQuery mInsertGenreQuery;
 
     QSqlQuery mSelectGenreByNameQuery;
 
     QSqlQuery mSelectGenreQuery;
 
     QSqlQuery mSelectAllTracksShortQuery;
 
     QSqlQuery mSelectAllAlbumsShortQuery;
 
     QSqlQuery mSelectAllComposersQuery;
 
     QSqlQuery mSelectAllLyricistsQuery;
 
     QSqlQuery mSelectCountAlbumsForComposerQuery;
 
     QSqlQuery mSelectCountAlbumsForLyricistQuery;
 
     QSqlQuery mSelectAllGenresQuery;
 
     QSqlQuery mSelectGenreForArtistQuery;
 
     QSqlQuery mSelectGenreForAlbumQuery;
 
     QSqlQuery mUpdateTrackQuery;
 
     QSqlQuery mUpdateAlbumArtistQuery;
 
     QSqlQuery mUpdateAlbumArtistInTracksQuery;
 
     QSqlQuery mQueryMaximumTrackIdQuery;
 
     QSqlQuery mQueryMaximumAlbumIdQuery;
 
     QSqlQuery mQueryMaximumArtistIdQuery;
 
     QSqlQuery mQueryMaximumLyricistIdQuery;
 
     QSqlQuery mQueryMaximumComposerIdQuery;
 
     QSqlQuery mQueryMaximumGenreIdQuery;
 
     QHash<qulonglong, MusicAudioTrack> mTracksCache;
 
     QHash<qulonglong, MusicAlbum> mAlbumsCache;
 
     QSet<qulonglong> mModifiedTrackIds;
 
     QSet<qulonglong> mModifiedAlbumIds;
 
     QSet<qulonglong> mModifiedArtistIds;
 
     QSet<qulonglong> mInsertedTracks;
 
     QSet<qulonglong> mInsertedAlbums;
 
     QSet<qulonglong> mInsertedArtists;
 
     qulonglong mAlbumId = 1;
 
     qulonglong mArtistId = 1;
 
     qulonglong mComposerId = 1;
 
     qulonglong mLyricistId = 1;
 
     qulonglong mGenreId = 1;
 
     qulonglong mTrackId = 1;
 
     qulonglong mDiscoverId = 1;
 
     QAtomicInt mStopRequest = 0;
 
     bool mInitFinished = false;
 
 };
 
 DatabaseInterface::DatabaseInterface(QObject *parent) : QObject(parent), d(nullptr)
 {
 }
 
 DatabaseInterface::~DatabaseInterface()
 {
     if (d) {
         d->mTracksDatabase.close();
     }
 }
 
 void DatabaseInterface::init(const QString &dbName, const QString &databaseFileName)
 {
     QSqlDatabase tracksDatabase = QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), dbName);
 
     if (!databaseFileName.isEmpty()) {
         tracksDatabase.setDatabaseName(QStringLiteral("file:") + databaseFileName);
     } else {
         tracksDatabase.setDatabaseName(QStringLiteral("file:memdb1?mode=memory"));
     }
     tracksDatabase.setConnectOptions(QStringLiteral("foreign_keys = ON;locking_mode = EXCLUSIVE;QSQLITE_OPEN_URI;QSQLITE_BUSY_TIMEOUT=500000"));
 
     auto result = tracksDatabase.open();
     if (result) {
         qDebug() << "database open";
     } else {
         qDebug() << "database not open";
     }
     qDebug() << "DatabaseInterface::init" << (tracksDatabase.driver()->hasFeature(QSqlDriver::Transactions) ? "yes" : "no");
 
     tracksDatabase.exec(QStringLiteral("PRAGMA foreign_keys = ON;"));
 
     d = std::make_unique<DatabaseInterfacePrivate>(tracksDatabase);
 
     initDatabase();
     initRequest();
 
     if (!databaseFileName.isEmpty()) {
         reloadExistingDatabase();
     }
 }
 
 MusicAlbum DatabaseInterface::albumFromTitleAndArtist(const QString &title, const QString &artist)
 {
     auto result = MusicAlbum();
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalAlbumFromTitleAndArtist(title, artist);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 DatabaseInterface::ListTrackDataType DatabaseInterface::allTracksData()
 {
     auto result = ListTrackDataType{};
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalAllTracksPartialData();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 DatabaseInterface::ListAlbumDataType DatabaseInterface::allAlbumsData()
 {
     auto result = ListAlbumDataType{};
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalAllAlbumsPartialData();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
+DatabaseInterface::ListTrackDataType DatabaseInterface::albumData(qulonglong databaseId)
+{
+    auto result = ListTrackDataType{};
+
+    if (!d) {
+        return result;
+    }
+
+    auto transactionResult = startTransaction();
+    if (!transactionResult) {
+        return result;
+    }
+
+    d->mSelectTrackQuery.bindValue(QStringLiteral(":albumId"), databaseId);
+
+    auto queryResult = d->mSelectTrackQuery.exec();
+
+    if (!queryResult || !d->mSelectTrackQuery.isSelect() || !d->mSelectTrackQuery.isActive()) {
+        Q_EMIT databaseError();
+
+        qDebug() << "DatabaseInterface::albumData" << d->mSelectTrackQuery.lastQuery();
+        qDebug() << "DatabaseInterface::albumData" << d->mSelectTrackQuery.boundValues();
+        qDebug() << "DatabaseInterface::albumData" << d->mSelectTrackQuery.lastError();
+    }
+
+    while (d->mSelectTrackQuery.next()) {
+        const auto &currentRecord = d->mSelectTrackQuery.record();
+
+        result.push_back(buildTrackDataFromDatabaseRecord(currentRecord));
+    }
+
+    d->mSelectTrackQuery.finish();
+
+    transactionResult = finishTransaction();
+    if (!transactionResult) {
+        return result;
+    }
+
+    return result;
+}
+
 DatabaseInterface::ListArtistDataType DatabaseInterface::allArtistsData()
 {
     auto result = ListArtistDataType{};
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalAllArtistsPartialData();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 DatabaseInterface::ListGenreDataType DatabaseInterface::allGenresData()
 {
     auto result = ListGenreDataType{};
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalAllGenresPartialData();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
-DatabaseInterface::DataType DatabaseInterface::oneData(DataUtils::DataType aType, qulonglong databaseId)
+DatabaseInterface::DataType DatabaseInterface::oneData(ElisaUtils::PlayListEntryType aType, qulonglong databaseId)
 {
     auto result = DataType{};
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     switch (aType)
     {
-    case DataUtils::DataType::AllArtists:
+    case ElisaUtils::Artist:
         result = internalOneArtistPartialData(databaseId);
         break;
-    case DataUtils::DataType::AllAlbums:
+    case ElisaUtils::Album:
         result = internalOneAlbumPartialData(databaseId);
         break;
-    case DataUtils::DataType::AllTracks:
+    case ElisaUtils::Track:
         result = internalOneTrackPartialData(databaseId);
         break;
-    case DataUtils::DataType::AllGenres:
+    case ElisaUtils::Genre:
         result = internalOneGenrePartialData(databaseId);
         break;
-    case DataUtils::DataType::AllComposers:
+    case ElisaUtils::Composer:
         result = internalOneComposerPartialData(databaseId);
         break;
-    case DataUtils::DataType::AllLyricists:
+    case ElisaUtils::Lyricist:
         result = internalOneLyricistPartialData(databaseId);
         break;
-    case DataUtils::DataType::UnknownType:
+    case ElisaUtils::Unknown:
+    case ElisaUtils::FileName:
         break;
     };
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 
 QList<MusicAudioTrack> DatabaseInterface::allTracks()
 {
     auto result = QList<MusicAudioTrack>();
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     auto queryResult = d->mSelectAllTracksQuery.exec();
 
     if (!queryResult || !d->mSelectAllTracksQuery.isSelect() || !d->mSelectAllTracksQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllTracksQuery.lastQuery();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllTracksQuery.boundValues();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllTracksQuery.lastError();
 
         return result;
     }
 
     while(d->mSelectAllTracksQuery.next()) {
         const auto &currentRecord = d->mSelectAllTracksQuery.record();
 
         result.push_back(buildTrackFromDatabaseRecord(currentRecord));
     }
 
     d->mSelectAllTracksQuery.finish();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 QList<MusicAudioTrack> DatabaseInterface::allTracksFromSource(const QString &musicSource)
 {
     auto result = QList<MusicAudioTrack>();
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     d->mSelectAllTracksFromSourceQuery.bindValue(QStringLiteral(":source"), musicSource);
 
     auto queryResult = d->mSelectAllTracksFromSourceQuery.exec();
 
     if (!queryResult || !d->mSelectAllTracksFromSourceQuery.isSelect() || !d->mSelectAllTracksFromSourceQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllTracksFromSourceQuery.lastQuery();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllTracksFromSourceQuery.boundValues();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllTracksFromSourceQuery.lastError();
 
         d->mSelectAllTracksFromSourceQuery.finish();
 
         transactionResult = finishTransaction();
         if (!transactionResult) {
             return result;
         }
 
         return result;
     }
 
     while(d->mSelectAllTracksFromSourceQuery.next()) {
         const auto &currentRecord = d->mSelectAllTracksFromSourceQuery.record();
 
         result.push_back(buildTrackFromDatabaseRecord(currentRecord));
     }
 
     d->mSelectAllTracksFromSourceQuery.finish();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 QList<MusicAlbum> DatabaseInterface::allAlbums()
 {
     auto result = QList<MusicAlbum>();
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     auto queryResult = d->mSelectAllAlbumsQuery.exec();
 
     if (!queryResult || !d->mSelectAllAlbumsQuery.isSelect() || !d->mSelectAllAlbumsQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllAlbumsQuery.lastQuery();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllAlbumsQuery.boundValues();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllAlbumsQuery.lastError();
 
         return result;
     }
 
     while(d->mSelectAllAlbumsQuery.next()) {
         const auto &currentRecord = d->mSelectAllAlbumsQuery.record();
 
         auto albumId = currentRecord.value(0).toULongLong();
 
         auto &newAlbum = d->mAlbumsCache[albumId];
 
         if (newAlbum.isValid()) {
             result.push_back(newAlbum);
             continue;
         }
 
         newAlbum.setDatabaseId(albumId);
         newAlbum.setTitle(currentRecord.value(1).toString());
         newAlbum.setId(currentRecord.value(2).toString());
         newAlbum.setArtist(currentRecord.value(3).toString());
         newAlbum.setAlbumPath(currentRecord.value(4).toUrl());
         newAlbum.setAlbumArtURI(currentRecord.value(5).toUrl());
         newAlbum.setTracksCount(currentRecord.value(6).toInt());
         newAlbum.setIsSingleDiscAlbum(currentRecord.value(7).toBool());
         newAlbum.setTracks(fetchTracks(newAlbum.databaseId()));
         newAlbum.setValid(true);
 
         d->mSelectGenreForAlbumQuery.bindValue(QStringLiteral(":albumId"), newAlbum.databaseId());
 
         queryResult = d->mSelectGenreForAlbumQuery.exec();
 
         if (!queryResult || !d->mSelectGenreForAlbumQuery.isSelect() || !d->mSelectGenreForAlbumQuery.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectGenreForAlbumQuery.lastQuery();
             qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectGenreForAlbumQuery.boundValues();
             qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectGenreForAlbumQuery.lastError();
 
             d->mSelectGenreForAlbumQuery.finish();
 
             return result;
         }
 
         QStringList allGenres;
         while(d->mSelectGenreForAlbumQuery.next()) {
             allGenres.push_back(d->mSelectGenreForAlbumQuery.record().value(0).toString());
         }
 
         newAlbum.setGenres(allGenres);
 
         d->mSelectGenreForAlbumQuery.finish();
 
         result.push_back(newAlbum);
     }
 
     d->mSelectAllAlbumsQuery.finish();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 QList<MusicAudioGenre> DatabaseInterface::allGenres()
 {
     auto result = QList<MusicAudioGenre>();
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     auto queryResult = d->mSelectAllGenresQuery.exec();
 
     if (!queryResult || !d->mSelectAllGenresQuery.isSelect() || !d->mSelectAllGenresQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllGenresQuery.lastQuery();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllGenresQuery.boundValues();
         qDebug() << "DatabaseInterface::allAlbums" << d->mSelectAllGenresQuery.lastError();
 
         return result;
     }
 
     while(d->mSelectAllGenresQuery.next()) {
         auto newGenre = MusicAudioGenre();
 
         const auto &currentRecord = d->mSelectAllGenresQuery.record();
 
         newGenre.setDatabaseId(currentRecord.value(0).toULongLong());
         newGenre.setName(currentRecord.value(1).toString());
 
         result.push_back(newGenre);
     }
 
     d->mSelectAllGenresQuery.finish();
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 DatabaseInterface::ListTrackDataType DatabaseInterface::tracksFromAuthor(const QString &ArtistName)
 {
     auto allTracks = ListTrackDataType{};
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return allTracks;
     }
 
     allTracks = internalTracksFromAuthor(ArtistName);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return allTracks;
     }
 
     return allTracks;
 }
 
 DatabaseInterface::TrackDataType DatabaseInterface::trackDataFromDatabaseId(qulonglong id)
 {
     auto result = TrackDataType();
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalOneTrackPartialData(id);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 MusicAudioTrack DatabaseInterface::trackFromDatabaseId(qulonglong id)
 {
     auto result = MusicAudioTrack();
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalTrackFromDatabaseId(id);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 qulonglong DatabaseInterface::trackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &artist, const QString &album,
                                                                    int trackNumber, int discNumber)
 {
     auto result = qulonglong(0);
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalTrackIdFromTitleAlbumTracDiscNumber(title, artist, album, trackNumber, discNumber);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 qulonglong DatabaseInterface::trackIdFromFileName(const QUrl &fileName)
 {
     auto result = qulonglong(0);
 
     if (!d) {
         return result;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     result = internalTrackIdFromFileName(fileName);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 void DatabaseInterface::applicationAboutToQuit()
 {
     d->mStopRequest = 1;
 }
 
 void DatabaseInterface::removeAllTracksFromSource(const QString &sourceName)
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     initChangesTrackers();
 
     auto sourceId = internalSourceIdFromName(sourceName);
 
     auto allFileNames = internalAllFileNameFromSource(sourceId);
 
     internalRemoveTracksList(allFileNames, sourceId);
 
     if (!d->mInsertedArtists.isEmpty()) {
         ListArtistDataType newArtists;
         for (auto artistId : qAsConst(d->mInsertedArtists)) {
             newArtists.push_back({{DatabaseIdRole, artistId}});
         }
         Q_EMIT artistsAdded(newArtists);
     }
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 }
 
 void DatabaseInterface::getAlbumFromAlbumId(qulonglong id)
 {
     auto result = MusicAlbum();
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         Q_EMIT sentAlbumData(result);
     }
 
     result = internalAlbumFromId(id);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         Q_EMIT sentAlbumData(result);
     }
 
     Q_EMIT sentAlbumData(result);
 }
 
 void DatabaseInterface::askRestoredTracks(const QString &musicSource)
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     auto result = internalAllFileNameFromSource(internalSourceIdFromName(musicSource));
 
     Q_EMIT restoredTracks(musicSource, result);
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 }
 
 void DatabaseInterface::initChangesTrackers()
 {
     d->mModifiedTrackIds.clear();
     d->mModifiedAlbumIds.clear();
     d->mModifiedArtistIds.clear();
     d->mInsertedTracks.clear();
     d->mInsertedAlbums.clear();
     d->mInsertedArtists.clear();
 }
 
 void DatabaseInterface::recordModifiedTrack(qulonglong trackId)
 {
     d->mModifiedTrackIds.insert(trackId);
     d->mTracksCache.remove(trackId);
 }
 
 void DatabaseInterface::recordModifiedAlbum(qulonglong albumId)
 {
     d->mModifiedAlbumIds.insert(albumId);
     d->mAlbumsCache.remove(albumId);
 }
 
 void DatabaseInterface::insertTracksList(const QList<MusicAudioTrack> &tracks, const QHash<QString, QUrl> &covers, const QString &musicSource)
 {
     if (d->mStopRequest == 1) {
         return;
     }
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     initChangesTrackers();
 
     for(const auto &oneTrack : tracks) {
         d->mSelectTracksMapping.bindValue(QStringLiteral(":fileName"), oneTrack.resourceURI());
 
         auto result = d->mSelectTracksMapping.exec();
 
         if (!result || !d->mSelectTracksMapping.isSelect() || !d->mSelectTracksMapping.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::insertTracksList" << d->mSelectTracksMapping.lastQuery();
             qDebug() << "DatabaseInterface::insertTracksList" << d->mSelectTracksMapping.boundValues();
             qDebug() << "DatabaseInterface::insertTracksList" << d->mSelectTracksMapping.lastError();
 
             d->mSelectTracksMapping.finish();
 
             rollBackTransaction();
             return;
         }
 
         bool isNewTrack = !d->mSelectTracksMapping.next();
 
         if (isNewTrack) {
             insertTrackOrigin(oneTrack.resourceURI(), oneTrack.fileModificationTime(), insertMusicSource(musicSource));
         } else if (!d->mSelectTracksMapping.record().value(0).isNull() && d->mSelectTracksMapping.record().value(0).toULongLong() != 0) {
             updateTrackOrigin(d->mSelectTracksMapping.record().value(0).toULongLong(), oneTrack.resourceURI(), oneTrack.fileModificationTime());
         } else {
             continue;
         }
 
         d->mSelectTracksMapping.finish();
 
         const auto insertedTrackId = internalInsertTrack(oneTrack, covers, 0,
                                                          (isNewTrack ? TrackFileInsertType::NewTrackFileInsert : TrackFileInsertType::ModifiedTrackFileInsert));
 
         if (isNewTrack && insertedTrackId != 0) {
             d->mInsertedTracks.insert(insertedTrackId);
         }
 
         if (d->mStopRequest == 1) {
             transactionResult = finishTransaction();
             if (!transactionResult) {
                 return;
             }
             return;
         }
     }
 
     if (!d->mInsertedArtists.isEmpty()) {
         ListArtistDataType newArtists;
 
         for (auto artistId : qAsConst(d->mInsertedArtists)) {
             newArtists.push_back({{DatabaseIdRole, artistId}});
         }
 
         Q_EMIT artistsAdded(newArtists);
     }
 
     if (!d->mInsertedAlbums.isEmpty()) {
         ListAlbumDataType newAlbums;
 
         for (auto albumId : qAsConst(d->mInsertedAlbums)) {
             d->mModifiedAlbumIds.remove(albumId);
             newAlbums.push_back(internalOneAlbumPartialData(albumId));
         }
 
         Q_EMIT albumsAdded(newAlbums);
     }
 
     for (auto albumId : qAsConst(d->mModifiedAlbumIds)) {
         Q_EMIT albumModified({{DatabaseIdRole, albumId}}, albumId);
     }
 
     if (!d->mInsertedTracks.isEmpty()) {
         ListTrackDataType newTracks;
 
         for (auto trackId : qAsConst(d->mInsertedTracks)) {
             newTracks.push_back(internalOneTrackPartialData(trackId));
             d->mModifiedTrackIds.remove(trackId);
         }
 
         Q_EMIT tracksAdded(newTracks);
     }
 
     for (auto trackId : qAsConst(d->mModifiedTrackIds)) {
         Q_EMIT trackModified(internalOneTrackPartialData(trackId));
     }
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 }
 
 void DatabaseInterface::removeTracksList(const QList<QUrl> &removedTracks)
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     initChangesTrackers();
 
     internalRemoveTracksList(removedTracks);
 
     if (!d->mInsertedArtists.isEmpty()) {
         ListArtistDataType newArtists;
         for (auto artistId : qAsConst(d->mInsertedArtists)) {
             newArtists.push_back({{DatabaseIdRole, artistId}});
         }
         Q_EMIT artistsAdded(newArtists);
     }
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 }
 
 void DatabaseInterface::modifyTracksList(const QList<MusicAudioTrack> &modifiedTracks, const QHash<QString, QUrl> &covers,
                                          const QString &musicSource)
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     initChangesTrackers();
 
     for (const auto &oneModifiedTrack : modifiedTracks) {
         if (oneModifiedTrack.albumArtist().isEmpty()) {
             continue;
         }
 
         bool modifyExistingTrack = internalTrackFromDatabaseId(oneModifiedTrack.databaseId()).isValid() ||
                 (internalTrackIdFromFileName(oneModifiedTrack.resourceURI()) != 0);
 
         auto originTrackId = oneModifiedTrack.databaseId();
         if (!originTrackId) {
             originTrackId = internalTrackIdFromFileName(oneModifiedTrack.resourceURI());
         }
 
         if (!modifyExistingTrack) {
             insertTrackOrigin(oneModifiedTrack.resourceURI(), oneModifiedTrack.fileModificationTime(), insertMusicSource(musicSource));
         } else {
             updateTrackOrigin(originTrackId, oneModifiedTrack.resourceURI(), oneModifiedTrack.fileModificationTime());
         }
 
         const auto insertedTrackId = internalInsertTrack(oneModifiedTrack, covers, (modifyExistingTrack ? originTrackId : 0),
                                                          (modifyExistingTrack ? TrackFileInsertType::ModifiedTrackFileInsert : TrackFileInsertType::NewTrackFileInsert));
 
         if (!modifyExistingTrack && insertedTrackId != 0) {
             d->mInsertedTracks.insert(insertedTrackId);
         }
     }
 
     if (!d->mInsertedArtists.isEmpty()) {
         ListArtistDataType newArtists;
 
         for (auto artistId : qAsConst(d->mInsertedArtists)) {
             newArtists.push_back({{DatabaseIdRole, artistId}});
         }
 
         Q_EMIT artistsAdded(newArtists);
     }
 
     if (!d->mInsertedAlbums.isEmpty()) {
         ListAlbumDataType newAlbums;
 
         for (auto albumId : qAsConst(d->mInsertedAlbums)) {
             d->mModifiedAlbumIds.remove(albumId);
             newAlbums.push_back(internalOneAlbumPartialData(albumId));
         }
 
         Q_EMIT albumsAdded(newAlbums);
     }
 
     for (auto albumId : qAsConst(d->mModifiedAlbumIds)) {
         Q_EMIT albumModified({{DatabaseIdRole, albumId}}, albumId);
     }
 
     if (!d->mInsertedTracks.isEmpty()) {
         ListTrackDataType newTracks;
 
         for (auto trackId : qAsConst(d->mInsertedTracks)) {
             newTracks.push_back(internalOneTrackPartialData(trackId));
             d->mModifiedTrackIds.remove(trackId);
         }
 
         Q_EMIT tracksAdded(newTracks);
     }
 
     for (auto trackId : qAsConst(d->mModifiedTrackIds)) {
         Q_EMIT trackModified(internalOneTrackPartialData(trackId));
     }
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 }
 
 bool DatabaseInterface::startTransaction() const
 {
     auto result = false;
 
     auto transactionResult = d->mTracksDatabase.transaction();
     if (!transactionResult) {
         qDebug() << "transaction failed" << d->mTracksDatabase.lastError() << d->mTracksDatabase.lastError().driverText();
 
         return result;
     }
 
     result = true;
 
     return result;
 }
 
 bool DatabaseInterface::finishTransaction() const
 {
     auto result = false;
 
     auto transactionResult = d->mTracksDatabase.commit();
 
     if (!transactionResult) {
         qDebug() << "commit failed" << d->mTracksDatabase.lastError() << d->mTracksDatabase.lastError().nativeErrorCode();
 
         return result;
     }
 
     result = true;
 
     return result;
 }
 
 bool DatabaseInterface::rollBackTransaction() const
 {
     auto result = false;
 
     auto transactionResult = d->mTracksDatabase.rollback();
 
     if (!transactionResult) {
         qDebug() << "commit failed" << d->mTracksDatabase.lastError() << d->mTracksDatabase.lastError().nativeErrorCode();
 
         return result;
     }
 
     result = true;
 
     return result;
 }
 
 void DatabaseInterface::initDatabase()
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     auto listTables = d->mTracksDatabase.tables();
 
     if (!listTables.contains(QStringLiteral("DatabaseVersionV7"))) {
         auto oldTables = QStringList{
                 QStringLiteral("DatabaseVersionV2"),
                 QStringLiteral("DatabaseVersionV3"),
                 QStringLiteral("DatabaseVersionV4"),
                 QStringLiteral("DatabaseVersionV5"),
                 QStringLiteral("DatabaseVersionV6"),
                 QStringLiteral("AlbumsArtists"),
                 QStringLiteral("TracksArtists"),
                 QStringLiteral("TracksMapping"),
                 QStringLiteral("Tracks"),
                 QStringLiteral("Composer"),
                 QStringLiteral("Genre"),
                 QStringLiteral("Lyricist"),
                 QStringLiteral("Albums"),
                 QStringLiteral("DiscoverSource"),
                 QStringLiteral("Artists"),};
         for (const auto &oneTable : oldTables) {
             if (listTables.indexOf(oneTable) == -1) {
                 continue;
             }
 
             QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
             auto result = createSchemaQuery.exec(QStringLiteral("DROP TABLE ") + oneTable);
 
             if (!result) {
                 qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
                 qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
                 Q_EMIT databaseError();
             }
         }
 
         listTables = d->mTracksDatabase.tables();
     }
 
     if (!listTables.contains(QStringLiteral("DatabaseVersionV7"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `DatabaseVersionV7` (`Version` INTEGER PRIMARY KEY NOT NULL)"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("DiscoverSource"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `DiscoverSource` (`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Name` VARCHAR(55) NOT NULL, "
                                                                    "UNIQUE (`Name`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("Artists"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `Artists` (`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Name` VARCHAR(55) NOT NULL, "
                                                                    "UNIQUE (`Name`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("Composer"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `Composer` (`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Name` VARCHAR(55) NOT NULL, "
                                                                    "UNIQUE (`Name`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("Genre"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `Genre` (`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Name` VARCHAR(85) NOT NULL, "
                                                                    "UNIQUE (`Name`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("Lyricist"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `Lyricist` (`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Name` VARCHAR(55) NOT NULL, "
                                                                    "UNIQUE (`Name`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("Albums"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `Albums` ("
                                                                    "`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Title` VARCHAR(55) NOT NULL, "
                                                                    "`ArtistName` VARCHAR(55), "
                                                                    "`AlbumPath` VARCHAR(255) NOT NULL, "
                                                                    "`CoverFileName` VARCHAR(255) NOT NULL, "
                                                                    "`AlbumInternalID` VARCHAR(55), "
                                                                    "UNIQUE (`Title`, `ArtistName`, `AlbumPath`), "
                                                                    "CONSTRAINT fk_artists FOREIGN KEY (`ArtistName`) REFERENCES `Artists`(`Name`) "
                                                                    "ON DELETE CASCADE)"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("Tracks"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `Tracks` ("
                                                                    "`ID` INTEGER PRIMARY KEY NOT NULL, "
                                                                    "`Title` VARCHAR(85) NOT NULL, "
                                                                    "`ArtistName` VARCHAR(55), "
                                                                    "`AlbumTitle` VARCHAR(55), "
                                                                    "`AlbumArtistName` VARCHAR(55), "
                                                                    "`AlbumPath` VARCHAR(255), "
                                                                    "`TrackNumber` INTEGER DEFAULT -1, "
                                                                    "`DiscNumber` INTEGER DEFAULT -1, "
                                                                    "`Duration` INTEGER NOT NULL, "
                                                                    "`Rating` INTEGER NOT NULL DEFAULT 0, "
                                                                    "`GenreID` INTEGER DEFAULT -1, "
                                                                    "`ComposerID` INTEGER, "
                                                                    "`LyricistID` INTEGER, "
                                                                    "`Comment` VARCHAR(85) DEFAULT '', "
                                                                    "`Year` INTEGER DEFAULT 0, "
                                                                    "`Channels` INTEGER DEFAULT -1, "
                                                                    "`BitRate` INTEGER DEFAULT -1, "
                                                                    "`SampleRate` INTEGER DEFAULT -1, "
                                                                    "`HasEmbeddedCover` BOOLEAN NOT NULL, "
                                                                    "UNIQUE ("
                                                                    "`Title`, `AlbumTitle`, `AlbumArtistName`, "
                                                                    "`AlbumPath`, `TrackNumber`, `DiscNumber`"
                                                                    "), "
                                                                    "CONSTRAINT fk_artist FOREIGN KEY (`ArtistName`) REFERENCES `Artists`(`Name`), "
                                                                    "CONSTRAINT fk_tracks_composer FOREIGN KEY (`ComposerID`) REFERENCES `Composer`(`ID`), "
                                                                    "CONSTRAINT fk_tracks_lyricist FOREIGN KEY (`LyricistID`) REFERENCES `Lyricist`(`ID`), "
                                                                    "CONSTRAINT fk_tracks_genre FOREIGN KEY (`GenreID`) REFERENCES `Genre`(`ID`), "
                                                                    "CONSTRAINT fk_tracks_album FOREIGN KEY ("
                                                                    "`AlbumTitle`, `AlbumArtistName`, `AlbumPath`)"
                                                                    "REFERENCES `Albums`(`Title`, `ArtistName`, `AlbumPath`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     if (!listTables.contains(QStringLiteral("TracksMapping"))) {
         QSqlQuery createSchemaQuery(d->mTracksDatabase);
 
         const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `TracksMapping` ("
                                                                    "`TrackID` INTEGER NULL, "
                                                                    "`DiscoverID` INTEGER NOT NULL, "
                                                                    "`FileName` VARCHAR(255) NOT NULL, "
                                                                    "`Priority` INTEGER NOT NULL, "
                                                                    "`FileModifiedTime` DATETIME NOT NULL, "
                                                                    "PRIMARY KEY (`FileName`), "
                                                                    "CONSTRAINT TracksUnique UNIQUE (`TrackID`, `Priority`), "
                                                                    "CONSTRAINT fk_tracksmapping_trackID FOREIGN KEY (`TrackID`) REFERENCES `Tracks`(`ID`) ON DELETE CASCADE, "
                                                                    "CONSTRAINT fk_tracksmapping_discoverID FOREIGN KEY (`DiscoverID`) REFERENCES `DiscoverSource`(`ID`))"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createSchemaQuery.lastError();
         }
     }
 
     {
         QSqlQuery createTrackIndex(d->mTracksDatabase);
 
         const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
                                                                   "IF NOT EXISTS "
                                                                   "`TitleAlbumsIndex` ON `Albums` "
                                                                   "(`Title`)"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         QSqlQuery createTrackIndex(d->mTracksDatabase);
 
         const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
                                                                   "IF NOT EXISTS "
                                                                   "`ArtistNameAlbumsIndex` ON `Albums` "
                                                                   "(`ArtistName`)"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         QSqlQuery createTrackIndex(d->mTracksDatabase);
 
         const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
                                                                   "IF NOT EXISTS "
                                                                   "`TracksAlbumIndex` ON `Tracks` "
                                                                   "(`AlbumTitle`, `AlbumArtistName`, `AlbumPath`)"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         QSqlQuery createTrackIndex(d->mTracksDatabase);
 
         const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
                                                                   "IF NOT EXISTS "
                                                                   "`TracksFileNameIndex` ON `TracksMapping` "
                                                                   "(`FileName`)"));
 
         if (!result) {
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastQuery();
             qDebug() << "DatabaseInterface::initDatabase" << createTrackIndex.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 }
 
 void DatabaseInterface::initRequest()
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     {
         auto selectAlbumQueryText = QStringLiteral("SELECT "
                                                    "album.`ID`, "
                                                    "album.`Title`, "
                                                    "album.`AlbumInternalID`, "
                                                    "album.`ArtistName`, "
                                                    "album.`AlbumPath`, "
                                                    "album.`CoverFileName`, "
                                                    "("
                                                    "SELECT "
                                                    "COUNT(*) "
                                                    "FROM "
                                                    "`Tracks` tracks3 "
                                                    "WHERE "
                                                    "tracks3.`AlbumTitle` = album.`Title` AND "
                                                    "(tracks3.`AlbumArtistName` = album.`ArtistName` OR "
                                                    "(tracks3.`AlbumArtistName` IS NULL AND "
                                                    "album.`ArtistName` IS NULL"
                                                    ")"
                                                    ") AND "
                                                    "tracks3.`AlbumPath` = album.`AlbumPath` "
                                                    ") as `TracksCount`, "
                                                    "("
                                                    "SELECT "
                                                    "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                    "FROM "
                                                    "`Tracks` tracks2 "
                                                    "WHERE "
                                                    "tracks2.`AlbumTitle` = album.`Title` AND "
                                                    "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                    "(tracks2.`AlbumArtistName` IS NULL AND "
                                                    "album.`ArtistName` IS NULL"
                                                    ")"
                                                    ") AND "
                                                    "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                    ") as `IsSingleDiscAlbum`, "
                                                    "GROUP_CONCAT(tracks.`ArtistName`, ', ') as AllArtists, "
                                                    "MAX(tracks.`Rating`) as HighestRating, "
                                                    "GROUP_CONCAT(genres.`Name`, ', ') as AllGenres "
                                                    "FROM "
                                                    "`Albums` album LEFT JOIN "
                                                    "`Tracks` tracks ON "
                                                    "tracks.`AlbumTitle` = album.`Title` AND "
                                                    "("
                                                    "tracks.`AlbumArtistName` = album.`ArtistName` OR "
                                                    "("
                                                    "tracks.`AlbumArtistName` IS NULL AND "
                                                    "album.`ArtistName` IS NULL"
                                                    ")"
                                                    ") AND "
                                                    "tracks.`AlbumPath` = album.`AlbumPath`"
                                                    "LEFT JOIN "
                                                    "`Genre` genres ON tracks.`GenreID` = genres.`ID` "
                                                    "WHERE "
                                                    "album.`ID` = :albumId "
                                                    "GROUP BY album.`ID`");
 
         auto result = prepareQuery(d->mSelectAlbumQuery, selectAlbumQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllAlbumsText = QStringLiteral("SELECT "
                                                   "album.`ID`, "
                                                   "album.`Title`, "
                                                   "album.`AlbumInternalID`, "
                                                   "album.`ArtistName`, "
                                                   "album.`AlbumPath`, "
                                                   "album.`CoverFileName`, "
                                                   "("
                                                   "SELECT "
                                                   "COUNT(*) "
                                                   "FROM "
                                                   "`Tracks` tracks "
                                                   "WHERE "
                                                   "tracks.`AlbumTitle` = album.`Title` AND "
                                                   "(tracks.`AlbumArtistName` = album.`ArtistName` OR "
                                                   "(tracks.`AlbumArtistName` IS NULL AND "
                                                   "album.`ArtistName` IS NULL"
                                                   ")"
                                                   ") AND "
                                                   "tracks.`AlbumPath` = album.`AlbumPath` "
                                                   ") as `TracksCount`, "
                                                   "("
                                                   "SELECT "
                                                   "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                   "FROM "
                                                   "`Tracks` tracks2 "
                                                   "WHERE "
                                                   "tracks2.`AlbumTitle` = album.`Title` AND "
                                                   "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                   "(tracks2.`AlbumArtistName` IS NULL AND "
                                                   "album.`ArtistName` IS NULL"
                                                   ")"
                                                   ") AND "
                                                   "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                   ") as `IsSingleDiscAlbum` "
                                                   "FROM `Albums` album "
                                                   "ORDER BY album.`Title` COLLATE NOCASE");
 
         auto result = prepareQuery(d->mSelectAllAlbumsQuery, selectAllAlbumsText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllAlbumsQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllAlbumsQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllGenresText = QStringLiteral("SELECT "
                                                   "genre.`ID`, "
                                                   "genre.`Name` "
                                                   "FROM `Genre` genre "
                                                   "ORDER BY genre.`Name` COLLATE NOCASE");
 
         auto result = prepareQuery(d->mSelectAllGenresQuery, selectAllGenresText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllAlbumsQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllAlbumsQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllAlbumsText = QStringLiteral("SELECT "
                                                   "album.`ID`, "
                                                   "album.`Title`, "
                                                   "album.`ArtistName` as SecondaryText, "
                                                   "album.`CoverFileName`, "
                                                   "album.`ArtistName`, "
                                                   "GROUP_CONCAT(tracks.`ArtistName`, ', ') as AllArtists, "
                                                   "MAX(tracks.`Rating`) as HighestRating, "
                                                   "GROUP_CONCAT(genres.`Name`, ', ') as AllGenres "
                                                   "FROM "
                                                   "`Albums` album, "
                                                   "`Tracks` tracks LEFT JOIN "
                                                   "`Genre` genres ON tracks.`GenreID` = genres.`ID` "
                                                   "WHERE "
                                                   "tracks.`AlbumTitle` = album.`Title` AND "
                                                   "(tracks.`AlbumArtistName` = album.`ArtistName` OR "
                                                   "(tracks.`AlbumArtistName` IS NULL AND "
                                                   "album.`ArtistName` IS NULL"
                                                   ")"
                                                   ") AND "
                                                   "tracks.`AlbumPath` = album.`AlbumPath` "
                                                   "GROUP BY album.`ID`, album.`Title`, album.`AlbumPath` "
                                                   "ORDER BY album.`Title` COLLATE NOCASE");
 
         auto result = prepareQuery(d->mSelectAllAlbumsShortQuery, selectAllAlbumsText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllAlbumsShortQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllAlbumsShortQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllArtistsWithFilterText = QStringLiteral("SELECT artists.`ID`, "
                                                              "artists.`Name`, "
                                                              "GROUP_CONCAT(genres.`Name`, ', ') as AllGenres "
                                                              "FROM `Artists` artists  LEFT JOIN "
                                                              "`Tracks` tracks ON artists.`Name` = tracks.`ArtistName` LEFT JOIN "
                                                              "`Genre` genres ON tracks.`GenreID` = genres.`ID` "
                                                              "GROUP BY artists.`ID` "
                                                              "ORDER BY artists.`Name` COLLATE NOCASE");
 
         auto result = prepareQuery(d->mSelectAllArtistsQuery, selectAllArtistsWithFilterText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllArtistsQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllArtistsQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllComposersWithFilterText = QStringLiteral("SELECT `ID`, "
                                                                "`Name` "
                                                                "FROM `Artists` "
                                                                "ORDER BY `Name` COLLATE NOCASE");
 
         auto result = prepareQuery(d->mSelectAllComposersQuery, selectAllComposersWithFilterText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllComposersQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllComposersQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllLyricistsWithFilterText = QStringLiteral("SELECT `ID`, "
                                                                "`Name` "
                                                                "FROM `Lyricist` "
                                                                "ORDER BY `Name` COLLATE NOCASE");
 
         auto result = prepareQuery(d->mSelectAllLyricistsQuery, selectAllLyricistsWithFilterText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllLyricistsQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllLyricistsQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllTracksText = QStringLiteral("SELECT "
                                                   "tracks.`ID`, "
                                                   "tracks.`Title`, "
                                                   "album.`ID`, "
                                                   "tracks.`ArtistName`, "
                                                   "tracks.`AlbumArtistName`, "
                                                   "tracksMapping.`FileName`, "
                                                   "tracksMapping.`FileModifiedTime`, "
                                                   "tracks.`TrackNumber`, "
                                                   "tracks.`DiscNumber`, "
                                                   "tracks.`Duration`, "
                                                   "tracks.`AlbumTitle`, "
                                                   "tracks.`Rating`, "
                                                   "album.`CoverFileName`, "
                                                   "("
                                                   "SELECT "
                                                   "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                   "FROM "
                                                   "`Tracks` tracks2 "
                                                   "WHERE "
                                                   "tracks2.`AlbumTitle` = album.`Title` AND "
                                                   "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                   "(tracks2.`AlbumArtistName` IS NULL AND "
                                                   "album.`ArtistName` IS NULL"
                                                   ")"
                                                   ") AND "
                                                   "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                   ") as `IsSingleDiscAlbum`, "
                                                   "trackGenre.`Name`, "
                                                   "trackComposer.`Name`, "
                                                   "trackLyricist.`Name`, "
                                                   "tracks.`Comment`, "
                                                   "tracks.`Year`, "
                                                   "tracks.`Channels`, "
                                                   "tracks.`BitRate`, "
                                                   "tracks.`SampleRate`, "
                                                   "tracks.`HasEmbeddedCover` "
                                                   "FROM "
                                                   "`Tracks` tracks, "
                                                   "`TracksMapping` tracksMapping "
                                                   "LEFT JOIN "
                                                   "`Albums` album "
                                                   "ON "
                                                   "tracks.`AlbumTitle` = album.`Title` AND "
                                                   "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                   "tracks.`AlbumPath` = album.`AlbumPath` "
                                                   "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                   "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                   "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                   "WHERE "
                                                   "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                   "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`)");
 
         auto result = prepareQuery(d->mSelectAllTracksQuery, selectAllTracksText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTracksQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTracksQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllTracksShortText = QStringLiteral("SELECT "
                                                        "tracks.`ID`, "
                                                        "tracks.`Title`, "
                                                        "tracks.`ArtistName`, "
                                                        "tracks.`AlbumTitle`, "
                                                        "tracks.`AlbumArtistName`, "
                                                        "tracks.`Duration`, "
                                                        "album.`CoverFileName`, "
                                                        "tracks.`TrackNumber`, "
                                                        "tracks.`DiscNumber`, "
                                                        "tracks.`Rating` "
                                                        "FROM "
                                                        "`Tracks` tracks "
                                                        "LEFT JOIN "
                                                        "`Albums` album "
                                                        "ON "
                                                        "tracks.`AlbumTitle` = album.`Title` AND "
                                                        "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                        "tracks.`AlbumPath` = album.`AlbumPath` "
                                                        "");
 
         auto result = prepareQuery(d->mSelectAllTracksShortQuery, selectAllTracksShortText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTracksShortQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTracksShortQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllTracksFromSourceQueryText = QStringLiteral("SELECT "
                                                                  "tracks.`ID`, "
                                                                  "tracks.`Title`, "
                                                                  "album.`ID`, "
                                                                  "tracks.`ArtistName`, "
                                                                  "tracks.`AlbumArtistName`, "
                                                                  "tracksMapping.`FileName`, "
                                                                  "tracksMapping.`FileModifiedTime`, "
                                                                  "tracks.`TrackNumber`, "
                                                                  "tracks.`DiscNumber`, "
                                                                  "tracks.`Duration`, "
                                                                  "tracks.`AlbumTitle`, "
                                                                  "tracks.`Rating`, "
                                                                  "album.`CoverFileName`, "
                                                                  "("
                                                                  "SELECT "
                                                                  "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                                  "FROM "
                                                                  "`Tracks` tracks2 "
                                                                  "WHERE "
                                                                  "tracks2.`AlbumTitle` = album.`Title` AND "
                                                                  "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                                  "(tracks2.`AlbumArtistName` IS NULL AND "
                                                                  "album.`ArtistName` IS NULL"
                                                                  ")"
                                                                  ") AND "
                                                                  "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                                  ") as `IsSingleDiscAlbum`, "
                                                                  "trackGenre.`Name`, "
                                                                  "trackComposer.`Name`, "
                                                                  "trackLyricist.`Name`, "
                                                                  "tracks.`Comment`, "
                                                                  "tracks.`Year`, "
                                                                  "tracks.`Channels`, "
                                                                  "tracks.`BitRate`, "
                                                                  "tracks.`SampleRate`, "
                                                                  "tracks.`HasEmbeddedCover` "
                                                                  "FROM "
                                                                  "`Tracks` tracks, "
                                                                  "`TracksMapping` tracksMapping, "
                                                                  "`DiscoverSource` source "
                                                                  "LEFT JOIN "
                                                                  "`Albums` album "
                                                                  "ON "
                                                                  "tracks.`AlbumTitle` = album.`Title` AND "
                                                                  "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                                  "tracks.`AlbumPath` = album.`AlbumPath` "
                                                                  "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                                  "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                                  "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                                  "WHERE "
                                                                  "source.`Name` = :source AND "
                                                                  "source.`ID` = tracksMapping.`DiscoverID` AND "
                                                                  "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                                  "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`)");
 
         auto result = prepareQuery(d->mSelectAllTracksFromSourceQuery, selectAllTracksFromSourceQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTracksFromSourceQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTracksFromSourceQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectArtistByNameText = QStringLiteral("SELECT `ID`, "
                                                      "`Name` "
                                                      "FROM `Artists` "
                                                      "WHERE "
                                                      "`Name` = :name");
 
         auto result = prepareQuery(d->mSelectArtistByNameQuery, selectArtistByNameText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectArtistByNameQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectArtistByNameQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectComposerByNameText = QStringLiteral("SELECT `ID`, "
                                                        "`Name` "
                                                        "FROM `Composer` "
                                                        "WHERE "
                                                        "`Name` = :name");
 
         auto result = prepareQuery(d->mSelectComposerByNameQuery, selectComposerByNameText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectComposerByNameQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectComposerByNameQuery.lastError();
         }
     }
 
     {
         auto selectLyricistByNameText = QStringLiteral("SELECT `ID`, "
                                                        "`Name` "
                                                        "FROM `Lyricist` "
                                                        "WHERE "
                                                        "`Name` = :name");
 
         auto result = prepareQuery(d->mSelectLyricistByNameQuery, selectLyricistByNameText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectLyricistByNameQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectLyricistByNameQuery.lastError();
         }
     }
 
     {
         auto selectGenreByNameText = QStringLiteral("SELECT `ID`, "
                                                     "`Name` "
                                                     "FROM `Genre` "
                                                     "WHERE "
                                                     "`Name` = :name");
 
         auto result = prepareQuery(d->mSelectGenreByNameQuery, selectGenreByNameText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreByNameQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreByNameQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertArtistsText = QStringLiteral("INSERT INTO `Artists` (`ID`, `Name`) "
                                                 "VALUES (:artistId, :name)");
 
         auto result = prepareQuery(d->mInsertArtistsQuery, insertArtistsText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertArtistsQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertArtistsQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertGenreText = QStringLiteral("INSERT INTO `Genre` (`ID`, `Name`) "
                                               "VALUES (:genreId, :name)");
 
         auto result = prepareQuery(d->mInsertGenreQuery, insertGenreText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertGenreQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertGenreQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertComposerText = QStringLiteral("INSERT INTO `Composer` (`ID`, `Name`) "
                                                  "VALUES (:composerId, :name)");
 
         auto result = prepareQuery(d->mInsertComposerQuery, insertComposerText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertComposerQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertComposerQuery.lastError();
         }
     }
 
     {
         auto insertLyricistText = QStringLiteral("INSERT INTO `Lyricist` (`ID`, `Name`) "
                                                  "VALUES (:lyricistId, :name)");
 
         auto result = prepareQuery(d->mInsertLyricistQuery, insertLyricistText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertLyricistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertLyricistQuery.lastError();
         }
     }
 
     {
         auto selectTrackQueryText = QStringLiteral("SELECT "
                                                    "tracks.`ID`, "
                                                    "tracks.`Title`, "
                                                    "album.`ID`, "
                                                    "tracks.`ArtistName`, "
                                                    "tracks.`AlbumArtistName`, "
                                                    "tracksMapping.`FileName`, "
                                                    "tracksMapping.`FileModifiedTime`, "
                                                    "tracks.`TrackNumber`, "
                                                    "tracks.`DiscNumber`, "
                                                    "tracks.`Duration`, "
                                                    "tracks.`AlbumTitle`, "
                                                    "tracks.`Rating`, "
                                                    "album.`CoverFileName`, "
                                                    "("
                                                    "SELECT "
                                                    "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                    "FROM "
                                                    "`Tracks` tracks2 "
                                                    "WHERE "
                                                    "tracks2.`AlbumTitle` = album.`Title` AND "
                                                    "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                    "(tracks2.`AlbumArtistName` IS NULL AND "
                                                    "album.`ArtistName` IS NULL"
                                                    ")"
                                                    ") AND "
                                                    "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                    ") as `IsSingleDiscAlbum`, "
                                                    "trackGenre.`Name`, "
                                                    "trackComposer.`Name`, "
                                                    "trackLyricist.`Name`, "
                                                    "tracks.`Comment`, "
                                                    "tracks.`Year`, "
                                                    "tracks.`Channels`, "
                                                    "tracks.`BitRate`, "
                                                    "tracks.`SampleRate`, "
                                                    "tracks.`HasEmbeddedCover` "
                                                    "FROM "
                                                    "`Tracks` tracks, "
                                                    "`TracksMapping` tracksMapping "
                                                    "LEFT JOIN "
                                                    "`Albums` album "
                                                    "ON "
                                                    "tracks.`AlbumTitle` = album.`Title` AND "
                                                    "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                    "tracks.`AlbumPath` = album.`AlbumPath` "
                                                    "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                    "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                    "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                    "WHERE "
                                                    "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                    "album.`ID` = :albumId AND "
                                                    "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`) "
                                                    "ORDER BY tracks.`DiscNumber` ASC, "
                                                    "tracks.`TrackNumber` ASC");
 
         auto result = prepareQuery(d->mSelectTrackQuery, selectTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
     {
         auto selectTrackFromIdQueryText = QStringLiteral("SELECT "
                                                          "tracks.`Id`, "
                                                          "tracks.`Title`, "
                                                          "album.`ID`, "
                                                          "tracks.`ArtistName`, "
                                                          "tracks.`AlbumArtistName`, "
                                                          "tracksMapping.`FileName`, "
                                                          "tracksMapping.`FileModifiedTime`, "
                                                          "tracks.`TrackNumber`, "
                                                          "tracks.`DiscNumber`, "
                                                          "tracks.`Duration`, "
                                                          "tracks.`AlbumTitle`, "
                                                          "tracks.`Rating`, "
                                                          "album.`CoverFileName`, "
                                                          "("
                                                          "SELECT "
                                                          "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                          "FROM "
                                                          "`Tracks` tracks2 "
                                                          "WHERE "
                                                          "tracks2.`AlbumTitle` = album.`Title` AND "
                                                          "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                          "(tracks2.`AlbumArtistName` IS NULL AND "
                                                          "album.`ArtistName` IS NULL"
                                                          ")"
                                                          ") AND "
                                                          "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                          ") as `IsSingleDiscAlbum`, "
                                                          "trackGenre.`Name`, "
                                                          "trackComposer.`Name`, "
                                                          "trackLyricist.`Name`, "
                                                          "tracks.`Comment`, "
                                                          "tracks.`Year`, "
                                                          "tracks.`Channels`, "
                                                          "tracks.`BitRate`, "
                                                          "tracks.`SampleRate`, "
                                                          "tracks.`HasEmbeddedCover` "
                                                          "FROM "
                                                          "`Tracks` tracks, "
                                                          "`TracksMapping` tracksMapping "
                                                          "LEFT JOIN "
                                                          "`Albums` album "
                                                          "ON "
                                                          "tracks.`AlbumTitle` = album.`Title` AND "
                                                          "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                          "tracks.`AlbumPath` = album.`AlbumPath` "
                                                          "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                          "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                          "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                          "WHERE "
                                                          "tracks.`ID` = :trackId AND "
                                                          "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                          "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`)");
 
         auto result = prepareQuery(d->mSelectTrackFromIdQuery, selectTrackFromIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackFromIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackFromIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
     {
         auto selectCountAlbumsQueryText = QStringLiteral("SELECT count(*) "
                                                          "FROM `Albums` album "
                                                          "WHERE album.`ArtistName` = :artistName ");
 
         const auto result = prepareQuery(d->mSelectCountAlbumsForArtistQuery, selectCountAlbumsQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectCountAlbumsForArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectCountAlbumsForArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectGenreForArtistQueryText = QStringLiteral("SELECT DISTINCT trackGenre.`Name` "
                                                             "FROM "
                                                             "`Tracks` tracks "
                                                             "LEFT JOIN "
                                                             "`Albums` album "
                                                             "ON "
                                                             "tracks.`AlbumTitle` = album.`Title` AND "
                                                             "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                             "tracks.`AlbumPath` = album.`AlbumPath` "
                                                             "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                             "WHERE "
                                                             "album.`ArtistName` = :artistName");
 
         const auto result = prepareQuery(d->mSelectGenreForArtistQuery, selectGenreForArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreForArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreForArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectGenreForAlbumQueryText = QStringLiteral("SELECT DISTINCT trackGenre.`Name` "
                                                            "FROM "
                                                            "`Tracks` tracks "
                                                            "LEFT JOIN "
                                                            "`Albums` album "
                                                            "ON "
                                                            "tracks.`AlbumTitle` = album.`Title` AND "
                                                            "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                            "tracks.`AlbumPath` = album.`AlbumPath` "
                                                            "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                            "WHERE "
                                                            "album.`ID` = :albumId");
 
         const auto result = prepareQuery(d->mSelectGenreForAlbumQuery, selectGenreForAlbumQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreForAlbumQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreForAlbumQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectCountAlbumsQueryText = QStringLiteral("SELECT distinct count(album.`ID`) "
                                                          "FROM "
                                                          "`Tracks` tracks, "
                                                          "`Albums` album "
                                                          "LEFT JOIN `Composer` albumComposer ON albumComposer.`ID` = tracks.`ComposerID` "
                                                          "WHERE "
                                                          "(tracks.`AlbumTitle` = album.`Title` OR tracks.`AlbumTitle` IS NULL ) AND "
                                                          "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                          "(tracks.`AlbumPath` = album.`AlbumPath` OR tracks.`AlbumPath` IS NULL ) AND "
                                                          "albumComposer.`Name` = :artistName");
 
         const auto result = prepareQuery(d->mSelectCountAlbumsForComposerQuery, selectCountAlbumsQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectCountAlbumsForComposerQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectCountAlbumsForComposerQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectCountAlbumsQueryText = QStringLiteral("SELECT distinct count(album.`ID`) "
                                                          "FROM "
                                                          "`Tracks` tracks, "
                                                          "`Albums` album "
                                                          "LEFT JOIN `Lyricist` albumLyricist ON albumLyricist.`ID` = tracks.`LyricistID` "
                                                          "WHERE "
                                                          "(tracks.`AlbumTitle` = album.`Title` OR tracks.`AlbumTitle` IS NULL ) AND "
                                                          "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                          "(tracks.`AlbumPath` = album.`AlbumPath` OR tracks.`AlbumPath` IS NULL ) AND "
                                                          "albumLyricist.`Name` = :artistName");
 
         const auto result = prepareQuery(d->mSelectCountAlbumsForLyricistQuery, selectCountAlbumsQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectCountAlbumsForLyricistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectCountAlbumsForLyricistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAlbumIdFromTitleQueryText = QStringLiteral("SELECT "
                                                               "album.`ID` "
                                                               "FROM "
                                                               "`Albums` album "
                                                               "WHERE "
                                                               "album.`ArtistName` = :artistName AND "
                                                               "album.`Title` = :title");
 
         auto result = prepareQuery(d->mSelectAlbumIdFromTitleQuery, selectAlbumIdFromTitleQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdFromTitleQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdFromTitleQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAlbumIdFromTitleAndArtistQueryText = QStringLiteral("SELECT "
                                                                        "album.`ID` "
                                                                        "FROM "
                                                                        "`Albums` album "
                                                                        "WHERE "
                                                                        "album.`ArtistName` = :artistName AND "
                                                                        "album.`Title` = :title AND "
                                                                        "album.`AlbumPath` = :albumPath");
 
         auto result = prepareQuery(d->mSelectAlbumIdFromTitleAndArtistQuery, selectAlbumIdFromTitleAndArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdFromTitleAndArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdFromTitleAndArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAlbumIdFromTitleWithoutArtistQueryText = QStringLiteral("SELECT "
                                                                            "album.`ID` "
                                                                            "FROM "
                                                                            "`Albums` album "
                                                                            "WHERE "
                                                                            "album.`AlbumPath` = :albumPath AND "
                                                                            "album.`Title` = :title AND "
                                                                            "album.`ArtistName` IS NULL");
 
         auto result = prepareQuery(d->mSelectAlbumIdFromTitleWithoutArtistQuery, selectAlbumIdFromTitleWithoutArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertAlbumQueryText = QStringLiteral("INSERT INTO `Albums` "
                                                    "(`ID`, "
                                                    "`Title`, "
                                                    "`ArtistName`, "
                                                    "`AlbumPath`, "
                                                    "`CoverFileName`) "
                                                    "VALUES "
                                                    "(:albumId, "
                                                    ":title, "
                                                    ":albumArtist, "
                                                    ":albumPath, "
                                                    ":coverFileName)");
 
         auto result = prepareQuery(d->mInsertAlbumQuery, insertAlbumQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertAlbumQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertAlbumQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertTrackMappingQueryText = QStringLiteral("INSERT INTO "
                                                           "`TracksMapping` "
                                                           "(`FileName`, "
                                                           "`DiscoverID`, "
                                                           "`Priority`, "
                                                           "`FileModifiedTime`) "
                                                           "VALUES (:fileName, :discoverId, :priority, :mtime)");
 
         auto result = prepareQuery(d->mInsertTrackMapping, insertTrackMappingQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertTrackMapping.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertTrackMapping.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto initialUpdateTracksValidityQueryText = QStringLiteral("UPDATE `TracksMapping` "
                                                                    "SET "
                                                                    "`TrackID` = :trackId, "
                                                                    "`Priority` = :priority, "
                                                                    "`FileModifiedTime` = :mtime "
                                                                    "WHERE `FileName` = :fileName");
 
         auto result = prepareQuery(d->mUpdateTrackMapping, initialUpdateTracksValidityQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateTrackMapping.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateTrackMapping.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto removeTracksMappingFromSourceQueryText = QStringLiteral("DELETE FROM `TracksMapping` "
                                                                      "WHERE `FileName` = :fileName AND `DiscoverID` = :sourceId");
 
         auto result = prepareQuery(d->mRemoveTracksMappingFromSource, removeTracksMappingFromSourceQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveTracksMappingFromSource.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveTracksMappingFromSource.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto removeTracksMappingQueryText = QStringLiteral("DELETE FROM `TracksMapping` "
                                                            "WHERE `FileName` = :fileName");
 
         auto result = prepareQuery(d->mRemoveTracksMapping, removeTracksMappingQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveTracksMapping.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveTracksMapping.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTracksWithoutMappingQueryText = QStringLiteral("SELECT "
                                                                   "tracks.`Id`, "
                                                                   "tracks.`Title`, "
                                                                   "album.`ID`, "
                                                                   "tracks.`ArtistName`, "
                                                                   "tracks.`AlbumArtistName`, "
                                                                   "\"\" as FileName, "
                                                                   "NULL as FileModifiedTime, "
                                                                   "tracks.`TrackNumber`, "
                                                                   "tracks.`DiscNumber`, "
                                                                   "tracks.`Duration`, "
                                                                   "tracks.`AlbumTitle`, "
                                                                   "tracks.`Rating`, "
                                                                   "album.`CoverFileName`, "
                                                                   "("
                                                                   "SELECT "
                                                                   "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                                   "FROM "
                                                                   "`Tracks` tracks2 "
                                                                   "WHERE "
                                                                   "tracks2.`AlbumTitle` = album.`Title` AND "
                                                                   "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                                   "(tracks2.`AlbumArtistName` IS NULL AND "
                                                                   "album.`ArtistName` IS NULL"
                                                                   ")"
                                                                   ") AND "
                                                                   "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                                   ") as `IsSingleDiscAlbum`, "
                                                                   "trackGenre.`Name`, "
                                                                   "trackComposer.`Name`, "
                                                                   "trackLyricist.`Name`, "
                                                                   "tracks.`Comment`, "
                                                                   "tracks.`Year`, "
                                                                   "tracks.`Channels`, "
                                                                   "tracks.`BitRate`, "
                                                                   "tracks.`SampleRate`, "
                                                                   "tracks.`HasEmbeddedCover` "
                                                                   "FROM "
                                                                   "`Tracks` tracks "
                                                                   "LEFT JOIN "
                                                                   "`Albums` album "
                                                                   "ON "
                                                                   "tracks.`AlbumTitle` = album.`Title` AND "
                                                                   "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                                   "tracks.`AlbumPath` = album.`AlbumPath` "
                                                                   "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                                   "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                                   "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                                   "WHERE "
                                                                   "tracks.`ID` NOT IN (SELECT tracksMapping2.`TrackID` FROM `TracksMapping` tracksMapping2)");
 
         auto result = prepareQuery(d->mSelectTracksWithoutMappingQuery, selectTracksWithoutMappingQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksWithoutMappingQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksWithoutMappingQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTracksMappingQueryText = QStringLiteral("SELECT "
                                                            "`TrackID`, "
                                                            "`FileName`, "
                                                            "`DiscoverID`, "
                                                            "`Priority`, "
                                                            "`FileModifiedTime` "
                                                            "FROM "
                                                            "`TracksMapping` "
                                                            "WHERE "
                                                            "`FileName` = :fileName");
 
         auto result = prepareQuery(d->mSelectTracksMapping, selectTracksMappingQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksMapping.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksMapping.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTracksMappingPriorityQueryText = QStringLiteral("SELECT "
                                                                    "`Priority` "
                                                                    "FROM "
                                                                    "`TracksMapping` "
                                                                    "WHERE "
                                                                    "`TrackID` = :trackId AND "
                                                                    "`FileName` = :fileName");
 
         auto result = prepareQuery(d->mSelectTracksMappingPriority, selectTracksMappingPriorityQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksMappingPriority.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksMappingPriority.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTracksMappingPriorityQueryByTrackIdText = QStringLiteral("SELECT "
                                                                             "MAX(`Priority`) "
                                                                             "FROM "
                                                                             "`TracksMapping` "
                                                                             "WHERE "
                                                                             "`TrackID` = :trackId");
 
         auto result = prepareQuery(d->mSelectTracksMappingPriorityByTrackId, selectTracksMappingPriorityQueryByTrackIdText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksMappingPriorityByTrackId.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksMappingPriorityByTrackId.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAllTrackFilesFromSourceQueryText = QStringLiteral("SELECT "
                                                                      "tracksMapping.`FileName`, "
                                                                      "tracksMapping.`FileModifiedTime` "
                                                                      "FROM "
                                                                      "`TracksMapping` tracksMapping "
                                                                      "WHERE "
                                                                      "tracksMapping.`DiscoverID` = :discoverId");
 
         auto result = prepareQuery(d->mSelectAllTrackFilesFromSourceQuery, selectAllTrackFilesFromSourceQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTrackFilesFromSourceQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAllTrackFilesFromSourceQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertMusicSourceQueryText = QStringLiteral("INSERT OR IGNORE INTO `DiscoverSource` (`ID`, `Name`) "
                                                          "VALUES (:discoverId, :name)");
 
         auto result = prepareQuery(d->mInsertMusicSource, insertMusicSourceQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertMusicSource.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertMusicSource.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectMusicSourceQueryText = QStringLiteral("SELECT `ID` FROM `DiscoverSource` WHERE `Name` = :name");
 
         auto result = prepareQuery(d->mSelectMusicSource, selectMusicSourceQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectMusicSource.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectMusicSource.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTrackQueryText = QStringLiteral("SELECT "
                                                    "tracks.`ID`,  tracksMapping.`FileName` "
                                                    "FROM "
                                                    "`Tracks` tracks, "
                                                    "`Albums` album, "
                                                    "`TracksMapping` tracksMapping "
                                                    "WHERE "
                                                    "tracks.`Title` = :title AND "
                                                    "album.`ID` = :album AND "
                                                    "(tracks.`AlbumTitle` = album.`Title` OR tracks.`AlbumTitle` IS NULL ) AND "
                                                    "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                    "(tracks.`AlbumPath` = album.`AlbumPath` OR tracks.`AlbumPath` IS NULL ) AND "
                                                    "tracks.`ArtistName` = :artist AND "
                                                    "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                    "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`)");
 
         auto result = prepareQuery(d->mSelectTrackIdFromTitleAlbumIdArtistQuery, selectTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackIdFromTitleAlbumIdArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackIdFromTitleAlbumIdArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto insertTrackQueryText = QStringLiteral("INSERT INTO `Tracks` "
                                                    "("
                                                    "`ID`, "
                                                    "`Title`, "
                                                    "`ArtistName`, "
                                                    "`AlbumTitle`, "
                                                    "`AlbumArtistName`, "
                                                    "`AlbumPath`, "
                                                    "`GenreID`, "
                                                    "`ComposerID`, "
                                                    "`LyricistID`, "
                                                    "`Comment`, "
                                                    "`TrackNumber`, "
                                                    "`DiscNumber`, "
                                                    "`Channels`, "
                                                    "`BitRate`, "
                                                    "`SampleRate`, "
                                                    "`Year`,  "
                                                    "`Duration`, "
                                                    "`Rating`, "
                                                    "`HasEmbeddedCover`) "
                                                    "VALUES "
                                                    "("
                                                    ":trackId, "
                                                    ":title, "
                                                    ":artistName, "
                                                    ":albumTitle, "
                                                    ":albumArtistName, "
                                                    ":albumPath, "
                                                    ":genreId, "
                                                    ":composerId, "
                                                    ":lyricistId, "
                                                    ":comment, "
                                                    ":trackNumber, "
                                                    ":discNumber, "
                                                    ":channels, "
                                                    ":bitRate, "
                                                    ":sampleRate, "
                                                    ":year, "
                                                    ":trackDuration, "
                                                    ":trackRating, "
                                                    ":hasEmbeddedCover)");
 
         auto result = prepareQuery(d->mInsertTrackQuery, insertTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertTrackQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mInsertTrackQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto updateTrackQueryText = QStringLiteral("UPDATE `Tracks` "
                                                    "SET "
                                                    "`Title` = :title, "
                                                    "`ArtistName` = :artistName, "
                                                    "`AlbumTitle` = :albumTitle, "
                                                    "`AlbumArtistName` = :albumArtistName, "
                                                    "`AlbumPath` = :albumPath, "
                                                    "`GenreID` = :genreId, "
                                                    "`ComposerID` = :composerId, "
                                                    "`LyricistID` = :lyricistId, "
                                                    "`Comment` = :comment, "
                                                    "`TrackNumber` = :trackNumber, "
                                                    "`DiscNumber` = :discNumber, "
                                                    "`Channels` = :channels, "
                                                    "`BitRate` = :bitRate, "
                                                    "`SampleRate` = :sampleRate, "
                                                    "`Year` = :year, "
                                                    " `Duration` = :trackDuration, "
                                                    "`Rating` = :trackRating "
                                                    "WHERE "
                                                    "`ID` = :trackId");
 
         auto result = prepareQuery(d->mUpdateTrackQuery, updateTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateTrackQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateTrackQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto updateAlbumArtistQueryText = QStringLiteral("UPDATE `Albums` "
                                                          "SET "
                                                          "`ArtistName` = :artistName "
                                                          "WHERE "
                                                          "`ID` = :albumId");
 
         auto result = prepareQuery(d->mUpdateAlbumArtistQuery, updateAlbumArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateAlbumArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateAlbumArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto updateAlbumArtistInTracksQueryText = QStringLiteral("UPDATE `Tracks` "
                                                                  "SET "
                                                                  "`AlbumArtistName` = :artistName "
                                                                  "WHERE "
                                                                  "`AlbumTitle` = :albumTitle AND "
                                                                  "`AlbumPath` = :albumPath AND "
                                                                  "`AlbumArtistName` IS NULL");
 
         auto result = prepareQuery(d->mUpdateAlbumArtistInTracksQuery, updateAlbumArtistInTracksQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateAlbumArtistInTracksQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateAlbumArtistInTracksQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto queryMaximumTrackIdQueryText = QStringLiteral("SELECT MAX(tracks.`ID`)"
                                                            "FROM "
                                                            "`Tracks` tracks");
 
         auto result = prepareQuery(d->mQueryMaximumTrackIdQuery, queryMaximumTrackIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumTrackIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumTrackIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto queryMaximumAlbumIdQueryText = QStringLiteral("SELECT MAX(albums.`ID`)"
                                                            "FROM "
                                                            "`Albums` albums");
 
         auto result = prepareQuery(d->mQueryMaximumAlbumIdQuery, queryMaximumAlbumIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumAlbumIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumAlbumIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto queryMaximumArtistIdQueryText = QStringLiteral("SELECT MAX(artists.`ID`)"
                                                             "FROM "
                                                             "`Artists` artists");
 
         auto result = prepareQuery(d->mQueryMaximumArtistIdQuery, queryMaximumArtistIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumArtistIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumArtistIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto queryMaximumLyricistIdQueryText = QStringLiteral("SELECT MAX(lyricists.`ID`)"
                                                               "FROM "
                                                               "`Lyricist` lyricists");
 
         auto result = prepareQuery(d->mQueryMaximumLyricistIdQuery, queryMaximumLyricistIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumLyricistIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumLyricistIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto queryMaximumComposerIdQueryText = QStringLiteral("SELECT MAX(composers.`ID`)"
                                                               "FROM "
                                                               "`Composer` composers");
 
         auto result = prepareQuery(d->mQueryMaximumComposerIdQuery, queryMaximumComposerIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumComposerIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumComposerIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto queryMaximumGenreIdQueryText = QStringLiteral("SELECT MAX(genres.`ID`)"
                                                            "FROM "
                                                            "`Genre` genres");
 
         auto result = prepareQuery(d->mQueryMaximumGenreIdQuery, queryMaximumGenreIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumGenreIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mQueryMaximumGenreIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTrackQueryText = QStringLiteral("SELECT "
                                                    "tracks.ID "
                                                    "FROM "
                                                    "`Tracks` tracks "
                                                    "WHERE "
                                                    "tracks.`Title` = :title AND "
                                                    "tracks.`AlbumTitle` = :album AND "
                                                    "tracks.`TrackNumber` = :trackNumber AND "
                                                    "tracks.`DiscNumber` = :discNumber AND "
                                                    "tracks.`ArtistName` = :artist");
 
         auto result = prepareQuery(d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery, selectTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTrackQueryText = QStringLiteral("SELECT "
                                                    "tracks.ID "
                                                    "FROM "
                                                    "`Tracks` tracks, "
                                                    "`Albums` albums "
                                                    "WHERE "
                                                    "tracks.`Title` = :title AND "
                                                    "tracks.`AlbumTitle` = albums.`Title` AND "
                                                    "tracks.`AlbumArtistName` = albums.`ArtistName` AND "
                                                    "tracks.`AlbumPath` = albums.`AlbumPath` AND "
                                                    "albums.`Title` = :album AND "
                                                    "albums.`AlbumPath` = :albumPath AND "
                                                    "tracks.`TrackNumber` = :trackNumber AND "
                                                    "tracks.`DiscNumber` = :discNumber AND "
                                                    "( "
                                                    "( albums.`ArtistName` IS NULL) OR "
                                                    "( albums.`ArtistName` = :albumArtist) "
                                                    ")");
 
         auto result = prepareQuery(d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery, selectTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAlbumArtUriFromAlbumIdQueryText = QStringLiteral("SELECT `CoverFileName`"
                                                                     "FROM "
                                                                     "`Albums` "
                                                                     "WHERE "
                                                                     "`ID` = :albumId");
 
         auto result = prepareQuery(d->mSelectAlbumArtUriFromAlbumIdQuery, selectAlbumArtUriFromAlbumIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumArtUriFromAlbumIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumArtUriFromAlbumIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto updateAlbumArtUriFromAlbumIdQueryText = QStringLiteral("UPDATE `Albums` "
                                                                     "SET `CoverFileName` = :coverFileName "
                                                                     "WHERE "
                                                                     "`ID` = :albumId");
 
         auto result = prepareQuery(d->mUpdateAlbumArtUriFromAlbumIdQuery, updateAlbumArtUriFromAlbumIdQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateAlbumArtUriFromAlbumIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mUpdateAlbumArtUriFromAlbumIdQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectTracksFromArtistQueryText = QStringLiteral("SELECT "
                                                               "tracks.`ID`, "
                                                               "tracks.`Title`, "
                                                               "album.`ID`, "
                                                               "tracks.`ArtistName`, "
                                                               "tracks.`AlbumArtistName`, "
                                                               "tracksMapping.`FileName`, "
                                                               "tracksMapping.`FileModifiedTime`, "
                                                               "tracks.`TrackNumber`, "
                                                               "tracks.`DiscNumber`, "
                                                               "tracks.`Duration`, "
                                                               "tracks.`AlbumTitle`, "
                                                               "tracks.`Rating`, "
                                                               "album.`CoverFileName`, "
                                                               "("
                                                               "SELECT "
                                                               "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                               "FROM "
                                                               "`Tracks` tracks2 "
                                                               "WHERE "
                                                               "tracks2.`AlbumTitle` = album.`Title` AND "
                                                               "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                               "(tracks2.`AlbumArtistName` IS NULL AND "
                                                               "album.`ArtistName` IS NULL"
                                                               ")"
                                                               ") AND "
                                                               "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                               ") as `IsSingleDiscAlbum`, "
                                                               "trackGenre.`Name`, "
                                                               "trackComposer.`Name`, "
                                                               "trackLyricist.`Name`, "
                                                               "tracks.`Comment`, "
                                                               "tracks.`Year`, "
                                                               "tracks.`Channels`, "
                                                               "tracks.`BitRate`, "
                                                               "tracks.`SampleRate`, "
                                                               "tracks.`HasEmbeddedCover` "
                                                               "FROM "
                                                               "`Tracks` tracks, "
                                                               "`TracksMapping` tracksMapping "
                                                               "LEFT JOIN "
                                                               "`Albums` album "
                                                               "ON "
                                                               "tracks.`AlbumTitle` = album.`Title` AND "
                                                               "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                               "tracks.`AlbumPath` = album.`AlbumPath` "
                                                               "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                               "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                               "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                               "WHERE "
                                                               "tracks.`ArtistName` = :artistName AND "
                                                               "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                               "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`) "
                                                               "ORDER BY tracks.`Title` ASC, "
                                                               "album.`Title` ASC");
 
         auto result = prepareQuery(d->mSelectTracksFromArtist, selectTracksFromArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksFromArtist.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTracksFromArtist.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectAlbumIdsFromArtistQueryText = QStringLiteral("SELECT "
                                                                 "album.`ID` "
                                                                 "FROM "
                                                                 "`Albums` album "
                                                                 "WHERE "
                                                                 "album.`ArtistName` = :artistName");
 
         auto result = prepareQuery(d->mSelectAlbumIdsFromArtist, selectAlbumIdsFromArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdsFromArtist.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectAlbumIdsFromArtist.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectArtistQueryText = QStringLiteral("SELECT `ID`, "
                                                     "`Name` "
                                                     "FROM `Artists` "
                                                     "WHERE "
                                                     "`ID` = :artistId");
 
         auto result = prepareQuery(d->mSelectArtistQuery, selectArtistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectGenreQueryText = QStringLiteral("SELECT `ID`, "
                                                    "`Name` "
                                                    "FROM `Genre` "
                                                    "WHERE "
                                                    "`ID` = :genreId");
 
         auto result = prepareQuery(d->mSelectGenreQuery, selectGenreQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectGenreQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto selectComposerQueryText = QStringLiteral("SELECT `ID`, "
                                                       "`Name` "
                                                       "FROM `Composer` "
                                                       "WHERE "
                                                       "`ID` = :composerId");
 
         auto result = prepareQuery(d->mSelectComposerQuery, selectComposerQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectComposerQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectComposerQuery.lastError();
         }
     }
 
     {
         auto selectLyricistQueryText = QStringLiteral("SELECT `ID`, "
                                                       "`Name` "
                                                       "FROM `Lyricist` "
                                                       "WHERE "
                                                       "`ID` = :lyricistId");
 
         auto result = prepareQuery(d->mSelectLyricistQuery, selectLyricistQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectLyricistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectLyricistQuery.lastError();
         }
     }
 
     {
         auto selectTrackFromFilePathQueryText = QStringLiteral("SELECT "
                                                                "tracks.`ID`, "
                                                                "tracks.`Title`, "
                                                                "album.`ID`, "
                                                                "tracks.`ArtistName`, "
                                                                "tracks.`AlbumArtistName`, "
                                                                "tracksMapping.`FileName`, "
                                                                "tracksMapping.`FileModifiedTime`, "
                                                                "tracks.`TrackNumber`, "
                                                                "tracks.`DiscNumber`, "
                                                                "tracks.`Duration`, "
                                                                "tracks.`AlbumTitle`, "
                                                                "tracks.`Rating`, "
                                                                "album.`CoverFileName`, "
                                                                "("
                                                                "SELECT "
                                                                "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
                                                                "FROM "
                                                                "`Tracks` tracks2 "
                                                                "WHERE "
                                                                "tracks2.`AlbumTitle` = album.`Title` AND "
                                                                "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
                                                                "(tracks2.`AlbumArtistName` IS NULL AND "
                                                                "album.`ArtistName` IS NULL"
                                                                ")"
                                                                ") AND "
                                                                "tracks2.`AlbumPath` = album.`AlbumPath` "
                                                                ") as `IsSingleDiscAlbum`, "
                                                                "trackGenre.`Name`, "
                                                                "trackComposer.`Name`, "
                                                                "trackLyricist.`Name`, "
                                                                "tracks.`Comment`, "
                                                                "tracks.`Year`, "
                                                                "tracks.`Channels`, "
                                                                "tracks.`BitRate`, "
                                                                "tracks.`SampleRate` "
                                                                "FROM "
                                                                "`Tracks` tracks, "
                                                                "`TracksMapping` tracksMapping "
                                                                "LEFT JOIN "
                                                                "`Albums` album "
                                                                "ON "
                                                                "tracks.`AlbumTitle` = album.`Title` AND "
                                                                "(tracks.`AlbumArtistName` = album.`ArtistName` OR tracks.`AlbumArtistName` IS NULL ) AND "
                                                                "tracks.`AlbumPath` = album.`AlbumPath` "
                                                                "LEFT JOIN `Composer` trackComposer ON trackComposer.`ID` = tracks.`ComposerID` "
                                                                "LEFT JOIN `Lyricist` trackLyricist ON trackLyricist.`ID` = tracks.`LyricistID` "
                                                                "LEFT JOIN `Genre` trackGenre ON trackGenre.`ID` = tracks.`GenreID` "
                                                                "WHERE "
                                                                "tracksMapping.`TrackID` = tracks.`ID` AND "
                                                                "tracksMapping.`FileName` = :filePath AND "
                                                                "tracksMapping.`Priority` = (SELECT MIN(`Priority`) FROM `TracksMapping` WHERE `TrackID` = tracks.`ID`)");
 
         auto result = prepareQuery(d->mSelectTrackFromFilePathQuery, selectTrackFromFilePathQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackFromFilePathQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mSelectTrackFromFilePathQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto removeTrackQueryText = QStringLiteral("DELETE FROM `Tracks` "
                                                    "WHERE "
                                                    "`ID` = :trackId");
 
         auto result = prepareQuery(d->mRemoveTrackQuery, removeTrackQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveTrackQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveTrackQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto removeAlbumQueryText = QStringLiteral("DELETE FROM `Albums` "
                                                    "WHERE "
                                                    "`ID` = :albumId");
 
         auto result = prepareQuery(d->mRemoveAlbumQuery, removeAlbumQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveAlbumQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveAlbumQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     {
         auto removeAlbumQueryText = QStringLiteral("DELETE FROM `Artists` "
                                                    "WHERE "
                                                    "`ID` = :artistId");
 
         auto result = prepareQuery(d->mRemoveArtistQuery, removeAlbumQueryText);
 
         if (!result) {
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::initRequest" << d->mRemoveArtistQuery.lastError();
 
             Q_EMIT databaseError();
         }
     }
 
     finishTransaction();
 
     d->mInitFinished = true;
     Q_EMIT requestsInitDone();
 }
 
 qulonglong DatabaseInterface::insertAlbum(const QString &title, const QString &albumArtist, const QString &trackArtist,
                                           const QString &trackPath, const QUrl &albumArtURI)
 {
     auto result = qulonglong(0);
 
     if (title.isEmpty()) {
         return result;
     }
 
     if (!albumArtist.isEmpty() || !trackArtist.isEmpty()) {
         d->mSelectAlbumIdFromTitleAndArtistQuery.bindValue(QStringLiteral(":title"), title);
         d->mSelectAlbumIdFromTitleAndArtistQuery.bindValue(QStringLiteral(":albumPath"), trackPath);
         if (!albumArtist.isEmpty()) {
             d->mSelectAlbumIdFromTitleAndArtistQuery.bindValue(QStringLiteral(":artistName"), albumArtist);
         } else {
             d->mSelectAlbumIdFromTitleAndArtistQuery.bindValue(QStringLiteral(":artistName"), trackArtist);
         }
 
         auto queryResult = d->mSelectAlbumIdFromTitleAndArtistQuery.exec();
 
         if (!queryResult || !d->mSelectAlbumIdFromTitleAndArtistQuery.isSelect() || !d->mSelectAlbumIdFromTitleAndArtistQuery.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::insertAlbum" << d->mSelectAlbumIdFromTitleAndArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::insertAlbum" << d->mSelectAlbumIdFromTitleAndArtistQuery.boundValues();
             qDebug() << "DatabaseInterface::insertAlbum" << d->mSelectAlbumIdFromTitleAndArtistQuery.lastError();
 
             d->mSelectAlbumIdFromTitleAndArtistQuery.finish();
 
             return result;
         }
 
         if (d->mSelectAlbumIdFromTitleAndArtistQuery.next()) {
             result = d->mSelectAlbumIdFromTitleAndArtistQuery.record().value(0).toULongLong();
 
             d->mSelectAlbumIdFromTitleAndArtistQuery.finish();
 
             return result;
         }
 
         d->mSelectAlbumIdFromTitleAndArtistQuery.finish();
     }
 
     if (result == 0) {
         d->mSelectAlbumIdFromTitleWithoutArtistQuery.bindValue(QStringLiteral(":title"), title);
         d->mSelectAlbumIdFromTitleWithoutArtistQuery.bindValue(QStringLiteral(":albumPath"), trackPath);
 
         auto queryResult = d->mSelectAlbumIdFromTitleWithoutArtistQuery.exec();
 
         if (!queryResult || !d->mSelectAlbumIdFromTitleWithoutArtistQuery.isSelect() || !d->mSelectAlbumIdFromTitleWithoutArtistQuery.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::insertAlbum" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::insertAlbum" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.boundValues();
             qDebug() << "DatabaseInterface::insertAlbum" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.lastError();
 
             d->mSelectAlbumIdFromTitleWithoutArtistQuery.finish();
 
             return result;
         }
 
         if (d->mSelectAlbumIdFromTitleWithoutArtistQuery.next()) {
             result = d->mSelectAlbumIdFromTitleWithoutArtistQuery.record().value(0).toULongLong();
 
             d->mSelectAlbumIdFromTitleWithoutArtistQuery.finish();
 
             return result;
         }
 
         d->mSelectAlbumIdFromTitleWithoutArtistQuery.finish();
     }
 
     d->mInsertAlbumQuery.bindValue(QStringLiteral(":albumId"), d->mAlbumId);
     d->mInsertAlbumQuery.bindValue(QStringLiteral(":title"), title);
     if (!albumArtist.isEmpty()) {
         insertArtist(albumArtist);
         d->mInsertAlbumQuery.bindValue(QStringLiteral(":albumArtist"), albumArtist);
     } else {
         d->mInsertAlbumQuery.bindValue(QStringLiteral(":albumArtist"), {});
     }
     d->mInsertAlbumQuery.bindValue(QStringLiteral(":albumPath"), trackPath);
     d->mInsertAlbumQuery.bindValue(QStringLiteral(":coverFileName"), albumArtURI);
 
     auto queryResult = d->mInsertAlbumQuery.exec();
 
     if (!queryResult || !d->mInsertAlbumQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertAlbum" << d->mInsertAlbumQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertAlbum" << d->mInsertAlbumQuery.boundValues();
         qDebug() << "DatabaseInterface::insertAlbum" << d->mInsertAlbumQuery.lastError();
 
         d->mInsertAlbumQuery.finish();
 
         return result;
     }
 
     result = d->mAlbumId;
 
     d->mInsertAlbumQuery.finish();
 
     ++d->mAlbumId;
 
     d->mInsertedAlbums.insert(result);
 
     return result;
 }
 
 bool DatabaseInterface::updateAlbumFromId(qulonglong albumId, const QUrl &albumArtUri,
                                           const MusicAudioTrack &currentTrack, const QString &albumPath)
 {
     auto modifiedAlbum = false;
     modifiedAlbum = true;
 
     if (!albumArtUri.isValid()) {
         return modifiedAlbum;
     }
 
     auto storedAlbumArtUri = internalAlbumArtUriFromAlbumId(albumId);
 
     if (!storedAlbumArtUri.isValid() || storedAlbumArtUri != albumArtUri) {
         d->mUpdateAlbumArtUriFromAlbumIdQuery.bindValue(QStringLiteral(":albumId"), albumId);
         d->mUpdateAlbumArtUriFromAlbumIdQuery.bindValue(QStringLiteral(":coverFileName"), albumArtUri);
 
         auto result = d->mUpdateAlbumArtUriFromAlbumIdQuery.exec();
 
         if (!result || !d->mUpdateAlbumArtUriFromAlbumIdQuery.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::updateAlbumFromId" << d->mUpdateAlbumArtUriFromAlbumIdQuery.lastQuery();
             qDebug() << "DatabaseInterface::updateAlbumFromId" << d->mUpdateAlbumArtUriFromAlbumIdQuery.boundValues();
             qDebug() << "DatabaseInterface::updateAlbumFromId" << d->mUpdateAlbumArtUriFromAlbumIdQuery.lastError();
 
             d->mUpdateAlbumArtUriFromAlbumIdQuery.finish();
 
             return modifiedAlbum;
         }
 
         d->mUpdateAlbumArtUriFromAlbumIdQuery.finish();
 
         modifiedAlbum = true;
     }
 
     if (!isValidArtist(albumId) && currentTrack.isValidAlbumArtist()) {
         updateAlbumArtist(albumId, currentTrack.albumName(), albumPath, currentTrack.albumArtist());
 
         modifiedAlbum = true;
     }
 
     return modifiedAlbum;
 }
 
 qulonglong DatabaseInterface::insertArtist(const QString &name)
 {
     auto result = qulonglong(0);
 
     if (name.isEmpty()) {
         return result;
     }
 
     d->mSelectArtistByNameQuery.bindValue(QStringLiteral(":name"), name);
 
     auto queryResult = d->mSelectArtistByNameQuery.exec();
 
     if (!queryResult || !d->mSelectArtistByNameQuery.isSelect() || !d->mSelectArtistByNameQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectArtistByNameQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectArtistByNameQuery.boundValues();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectArtistByNameQuery.lastError();
 
         d->mSelectArtistByNameQuery.finish();
 
         return result;
     }
 
     if (d->mSelectArtistByNameQuery.next()) {
         result = d->mSelectArtistByNameQuery.record().value(0).toULongLong();
 
         d->mSelectArtistByNameQuery.finish();
 
         return result;
     }
 
     d->mSelectArtistByNameQuery.finish();
 
     d->mInsertArtistsQuery.bindValue(QStringLiteral(":artistId"), d->mArtistId);
     d->mInsertArtistsQuery.bindValue(QStringLiteral(":name"), name);
 
     queryResult = d->mInsertArtistsQuery.exec();
 
     if (!queryResult || !d->mInsertArtistsQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertArtist" << d->mInsertArtistsQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertArtist" << d->mInsertArtistsQuery.boundValues();
         qDebug() << "DatabaseInterface::insertArtist" << d->mInsertArtistsQuery.lastError();
 
         d->mInsertArtistsQuery.finish();
 
         return result;
     }
 
     result = d->mArtistId;
 
     ++d->mArtistId;
 
     d->mInsertedArtists.insert(result);
 
     d->mInsertArtistsQuery.finish();
 
     return result;
 }
 
 qulonglong DatabaseInterface::insertComposer(const QString &name)
 {
     auto result = qulonglong(0);
 
     if (name.isEmpty()) {
         return result;
     }
 
     d->mSelectComposerByNameQuery.bindValue(QStringLiteral(":name"), name);
 
     auto queryResult = d->mSelectComposerByNameQuery.exec();
 
     if (!queryResult || !d->mSelectComposerByNameQuery.isSelect() || !d->mSelectComposerByNameQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertComposer" << d->mSelectComposerByNameQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertComposer" << d->mSelectComposerByNameQuery.boundValues();
         qDebug() << "DatabaseInterface::insertComposer" << d->mSelectComposerByNameQuery.lastError();
 
         d->mSelectComposerByNameQuery.finish();
 
         return result;
     }
 
 
     if (d->mSelectComposerByNameQuery.next()) {
         result = d->mSelectComposerByNameQuery.record().value(0).toULongLong();
 
         d->mSelectComposerByNameQuery.finish();
 
         return result;
     }
 
     d->mSelectComposerByNameQuery.finish();
 
     d->mInsertComposerQuery.bindValue(QStringLiteral(":composerId"), d->mComposerId);
     d->mInsertComposerQuery.bindValue(QStringLiteral(":name"), name);
 
     queryResult = d->mInsertComposerQuery.exec();
 
     if (!queryResult || !d->mInsertComposerQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertComposer" << d->mInsertComposerQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertComposer" << d->mInsertComposerQuery.boundValues();
         qDebug() << "DatabaseInterface::insertComposer" << d->mInsertComposerQuery.lastError();
 
         d->mInsertComposerQuery.finish();
 
         return result;
     }
 
     result = d->mComposerId;
 
     ++d->mComposerId;
 
     d->mInsertComposerQuery.finish();
 
     Q_EMIT composersAdded(internalAllComposersPartialData());
 
     return result;
 }
 
 qulonglong DatabaseInterface::insertGenre(const QString &name)
 {
     auto result = qulonglong(0);
 
     if (name.isEmpty()) {
         return result;
     }
 
     d->mSelectGenreByNameQuery.bindValue(QStringLiteral(":name"), name);
 
     auto queryResult = d->mSelectGenreByNameQuery.exec();
 
     if (!queryResult || !d->mSelectGenreByNameQuery.isSelect() || !d->mSelectGenreByNameQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertGenre" << d->mSelectGenreByNameQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertGenre" << d->mSelectGenreByNameQuery.boundValues();
         qDebug() << "DatabaseInterface::insertGenre" << d->mSelectGenreByNameQuery.lastError();
 
         d->mSelectGenreByNameQuery.finish();
 
         return result;
     }
 
     if (d->mSelectGenreByNameQuery.next()) {
         result = d->mSelectGenreByNameQuery.record().value(0).toULongLong();
 
         d->mSelectGenreByNameQuery.finish();
 
         return result;
     }
 
     d->mSelectGenreByNameQuery.finish();
 
     d->mInsertGenreQuery.bindValue(QStringLiteral(":genreId"), d->mGenreId);
     d->mInsertGenreQuery.bindValue(QStringLiteral(":name"), name);
 
     queryResult = d->mInsertGenreQuery.exec();
 
     if (!queryResult || !d->mInsertGenreQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertGenre" << d->mInsertGenreQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertGenre" << d->mInsertGenreQuery.boundValues();
         qDebug() << "DatabaseInterface::insertGenre" << d->mInsertGenreQuery.lastError();
 
         d->mInsertGenreQuery.finish();
 
         return result;
     }
 
     result = d->mGenreId;
 
     ++d->mGenreId;
 
     d->mInsertGenreQuery.finish();
 
     Q_EMIT genresAdded({{{DatabaseIdRole, result}}});
 
     return result;
 }
 
 MusicAudioGenre DatabaseInterface::internalGenreFromId(qulonglong genreId)
 {
     auto result = MusicAudioGenre{};
 
     if (!d || !d->mTracksDatabase.isValid() || !d->mInitFinished) {
         return result;
     }
 
     d->mSelectGenreQuery.bindValue(QStringLiteral(":genreId"), genreId);
 
     auto queryResult = d->mSelectGenreQuery.exec();
 
     if (!queryResult || !d->mSelectGenreQuery.isSelect() || !d->mSelectGenreQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalGenreFromId" << d->mSelectGenreQuery.lastQuery();
         qDebug() << "DatabaseInterface::internalGenreFromId" << d->mSelectGenreQuery.boundValues();
         qDebug() << "DatabaseInterface::internalGenreFromId" << d->mSelectGenreQuery.lastError();
 
         d->mSelectGenreQuery.finish();
 
         return result;
     }
 
     if (!d->mSelectGenreQuery.next()) {
         d->mSelectGenreQuery.finish();
 
         return result;
     }
 
     const auto &currentRecord = d->mSelectGenreQuery.record();
 
     result.setDatabaseId(currentRecord.value(0).toULongLong());
     result.setName(currentRecord.value(1).toString());
 
     d->mSelectGenreQuery.finish();
 
     return result;
 }
 
 void DatabaseInterface::insertTrackOrigin(const QUrl &fileNameURI, const QDateTime &fileModifiedTime,
                                           qulonglong discoverId)
 {
     d->mInsertTrackMapping.bindValue(QStringLiteral(":discoverId"), discoverId);
     d->mInsertTrackMapping.bindValue(QStringLiteral(":fileName"), fileNameURI);
     d->mInsertTrackMapping.bindValue(QStringLiteral(":priority"), 1);
     d->mInsertTrackMapping.bindValue(QStringLiteral(":mtime"), fileModifiedTime);
 
     auto queryResult = d->mInsertTrackMapping.exec();
 
     if (!queryResult || !d->mInsertTrackMapping.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertArtist" << d->mInsertTrackMapping.lastQuery();
         qDebug() << "DatabaseInterface::insertArtist" << d->mInsertTrackMapping.boundValues();
         qDebug() << "DatabaseInterface::insertArtist" << d->mInsertTrackMapping.lastError();
 
         d->mInsertTrackMapping.finish();
 
         return;
     }
 
     d->mInsertTrackMapping.finish();
 }
 
 void DatabaseInterface::updateTrackOrigin(qulonglong trackId, const QUrl &fileName, const QDateTime &fileModifiedTime)
 {
     d->mUpdateTrackMapping.bindValue(QStringLiteral(":trackId"), trackId);
     d->mUpdateTrackMapping.bindValue(QStringLiteral(":fileName"), fileName);
     d->mUpdateTrackMapping.bindValue(QStringLiteral(":priority"), computeTrackPriority(trackId, fileName));
     d->mUpdateTrackMapping.bindValue(QStringLiteral(":mtime"), fileModifiedTime);
 
     auto queryResult = d->mUpdateTrackMapping.exec();
 
     if (!queryResult || !d->mUpdateTrackMapping.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::updateTrackOrigin" << d->mUpdateTrackMapping.lastQuery();
         qDebug() << "DatabaseInterface::updateTrackOrigin" << d->mUpdateTrackMapping.boundValues();
         qDebug() << "DatabaseInterface::updateTrackOrigin" << d->mUpdateTrackMapping.lastError();
 
         d->mUpdateTrackMapping.finish();
 
         return;
     }
 
     d->mInsertTrackMapping.finish();
 }
 
 int DatabaseInterface::computeTrackPriority(qulonglong trackId, const QUrl &fileName)
 {
     auto result = int(1);
 
     if (!d) {
         return result;
     }
 
     d->mSelectTracksMappingPriority.bindValue(QStringLiteral(":trackId"), trackId);
     d->mSelectTracksMappingPriority.bindValue(QStringLiteral(":fileName"), fileName);
 
     auto queryResult = d->mSelectTracksMappingPriority.exec();
 
     if (!queryResult || !d->mSelectTracksMappingPriority.isSelect() || !d->mSelectTracksMappingPriority.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMappingPriority.lastQuery();
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMappingPriority.boundValues();
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMappingPriority.lastError();
 
         d->mSelectTracksMappingPriority.finish();
 
         return result;
     }
 
     if (d->mSelectTracksMappingPriority.next()) {
         result = d->mSelectTracksMappingPriority.record().value(0).toInt();
 
         d->mSelectTracksMappingPriority.finish();
 
         return result;
     }
 
     d->mSelectTracksMappingPriority.finish();
 
     d->mSelectTracksMappingPriorityByTrackId.bindValue(QStringLiteral(":trackId"), trackId);
 
     queryResult = d->mSelectTracksMappingPriorityByTrackId.exec();
 
     if (!queryResult || !d->mSelectTracksMappingPriorityByTrackId.isSelect() || !d->mSelectTracksMappingPriorityByTrackId.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMappingPriorityByTrackId.lastQuery();
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMappingPriorityByTrackId.boundValues();
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMappingPriorityByTrackId.lastError();
 
         d->mSelectTracksMappingPriorityByTrackId.finish();
 
         return result;
     }
 
     if (d->mSelectTracksMappingPriorityByTrackId.next()) {
         result = d->mSelectTracksMappingPriorityByTrackId.record().value(0).toInt() + 1;
     }
 
     d->mSelectTracksMappingPriorityByTrackId.finish();
 
     return result;
 }
 
 qulonglong DatabaseInterface::internalInsertTrack(const MusicAudioTrack &oneTrack, const QHash<QString, QUrl> &covers,
                                                   qulonglong originTrackId, TrackFileInsertType insertType)
 {
     qulonglong resultId = 0;
 
     if (oneTrack.title().isEmpty()) {
         return resultId;
     }
 
     auto oldTrack = oneTrack;
 
     QUrl::FormattingOptions currentOptions = QUrl::PreferLocalFile |
             QUrl::RemoveAuthority | QUrl::RemoveFilename | QUrl::RemoveFragment |
             QUrl::RemovePassword | QUrl::RemovePort | QUrl::RemoveQuery |
             QUrl::RemoveScheme | QUrl::RemoveUserInfo;
 
     const auto &trackPath = oneTrack.resourceURI().toString(currentOptions);
 
     auto albumId = insertAlbum(oneTrack.albumName(), (oneTrack.isValidAlbumArtist() ? oneTrack.albumArtist() : QString()),
                                oneTrack.artist(), trackPath, covers[oneTrack.resourceURI().toString()]);
 
     const auto &currentAlbum = internalAlbumFromId(albumId);
 
     auto otherTrackId = getDuplicateTrackIdFromTitleAlbumTrackDiscNumber(oneTrack.title(), oneTrack.albumName(), oneTrack.albumArtist(),
                                                                          trackPath, oneTrack.trackNumber(), oneTrack.discNumber());
     bool isModifiedTrack = (otherTrackId != 0) || (insertType == TrackFileInsertType::ModifiedTrackFileInsert);
     bool isSameTrack = false;
 
     qulonglong oldAlbumId = 0;
 
     if (isModifiedTrack) {
         if (otherTrackId == 0) {
             otherTrackId = internalTrackIdFromFileName(oneTrack.resourceURI());
         }
 
         originTrackId = otherTrackId;
 
         oldTrack = internalTrackFromDatabaseId(originTrackId);
 
         isSameTrack = (oldTrack.title() == oneTrack.title());
         isSameTrack = isSameTrack && (oldTrack.albumName() == oneTrack.albumName());
         isSameTrack = isSameTrack && (oldTrack.artist() == oneTrack.artist());
         isSameTrack = isSameTrack && (oldTrack.trackNumber() == oneTrack.trackNumber());
         isSameTrack = isSameTrack && (oldTrack.discNumber() == oneTrack.discNumber());
         isSameTrack = isSameTrack && (oldTrack.duration() == oneTrack.duration());
         isSameTrack = isSameTrack && (oldTrack.rating() == oneTrack.rating());
         isSameTrack = isSameTrack && (oldTrack.resourceURI() == oneTrack.resourceURI());
         isSameTrack = isSameTrack && (oldTrack.genre() == oneTrack.genre());
         isSameTrack = isSameTrack && (oldTrack.composer() == oneTrack.composer());
         isSameTrack = isSameTrack && (oldTrack.lyricist() == oneTrack.lyricist());
         isSameTrack = isSameTrack && (oldTrack.comment() == oneTrack.comment());
         isSameTrack = isSameTrack && (oldTrack.year() == oneTrack.year());
         isSameTrack = isSameTrack && (oldTrack.channels() == oneTrack.channels());
         isSameTrack = isSameTrack && (oldTrack.bitRate() == oneTrack.bitRate());
         isSameTrack = isSameTrack && (oldTrack.sampleRate() == oneTrack.sampleRate());
 
 
         oldAlbumId = internalAlbumIdFromTitleAndArtist(oldTrack.albumName(), oldTrack.albumArtist());
 
         if (!isSameTrack) {
             auto newTrack = oneTrack;
             newTrack.setDatabaseId(oldTrack.databaseId());
             updateTrackInDatabase(newTrack, trackPath);
             updateTrackOrigin(newTrack.databaseId(), oneTrack.resourceURI(), oneTrack.fileModificationTime());
             updateAlbumFromId(albumId, oneTrack.albumCover(), oneTrack, trackPath);
 
             recordModifiedTrack(originTrackId);
             if (albumId != 0) {
                 recordModifiedAlbum(albumId);
             }
             if (oldAlbumId != 0) {
                 recordModifiedAlbum(oldAlbumId);
             }
 
             isSameTrack = true;
         }
     } else {
         originTrackId = d->mTrackId;
     }
 
     resultId = originTrackId;
 
     if (!isSameTrack) {
         d->mInsertTrackQuery.bindValue(QStringLiteral(":trackId"), originTrackId);
         d->mInsertTrackQuery.bindValue(QStringLiteral(":title"), oneTrack.title());
         insertArtist(oneTrack.artist());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":artistName"), oneTrack.artist());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":albumTitle"), currentAlbum.title());
         if (currentAlbum.isValidArtist()) {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":albumArtistName"), currentAlbum.artist());
         } else {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":albumArtistName"), {});
         }
         d->mInsertTrackQuery.bindValue(QStringLiteral(":albumPath"), trackPath);
         d->mInsertTrackQuery.bindValue(QStringLiteral(":trackNumber"), oneTrack.trackNumber());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":discNumber"), oneTrack.discNumber());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":trackDuration"), QVariant::fromValue<qlonglong>(oneTrack.duration().msecsSinceStartOfDay()));
         d->mInsertTrackQuery.bindValue(QStringLiteral(":trackRating"), oneTrack.rating());
         auto genreId = insertGenre(oneTrack.genre());
         if (genreId != 0) {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":genreId"), genreId);
         } else {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":genreId"), {});
         }
         auto composerId = insertComposer(oneTrack.composer());
         if (composerId != 0) {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":composerId"), composerId);
         } else {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":composerId"), {});
         }
         auto lyricistId = insertLyricist(oneTrack.lyricist());
         if (lyricistId != 0) {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":lyricistId"), lyricistId);
         } else {
             d->mInsertTrackQuery.bindValue(QStringLiteral(":lyricistId"), {});
         }
         d->mInsertTrackQuery.bindValue(QStringLiteral(":comment"), oneTrack.comment());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":year"), oneTrack.year());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":channels"), oneTrack.channels());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":bitRate"), oneTrack.bitRate());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":sampleRate"), oneTrack.sampleRate());
         d->mInsertTrackQuery.bindValue(QStringLiteral(":hasEmbeddedCover"), oneTrack.hasEmbeddedCover());
 
         auto result = d->mInsertTrackQuery.exec();
 
         if (result && d->mInsertTrackQuery.isActive()) {
             d->mInsertTrackQuery.finish();
 
             if (!isModifiedTrack) {
                 ++d->mTrackId;
             }
 
             updateTrackOrigin(originTrackId, oneTrack.resourceURI(), oneTrack.fileModificationTime());
 
             if (isModifiedTrack) {
                 recordModifiedTrack(originTrackId);
                 if (albumId != 0) {
                     recordModifiedAlbum(albumId);
                 }
                 if (oldAlbumId != 0) {
                     recordModifiedAlbum(oldAlbumId);
                 }
             }
 
             if (albumId != 0) {
                 if (updateAlbumFromId(albumId, covers[oneTrack.resourceURI().toString()], oneTrack, trackPath)) {
                     auto modifiedTracks = fetchTrackIds(albumId);
                     for (auto oneModifiedTrack : modifiedTracks) {
                         if (oneModifiedTrack != resultId) {
                             recordModifiedTrack(oneModifiedTrack);
                         }
                     }
                 }
                 recordModifiedAlbum(albumId);
             }
         } else {
             d->mInsertTrackQuery.finish();
 
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::internalInsertTrack" << oneTrack << oneTrack.resourceURI();
             qDebug() << "DatabaseInterface::internalInsertTrack" << d->mInsertTrackQuery.lastQuery();
             qDebug() << "DatabaseInterface::internalInsertTrack" << d->mInsertTrackQuery.boundValues();
             qDebug() << "DatabaseInterface::internalInsertTrack" << d->mInsertTrackQuery.lastError();
         }
     }
 
     return resultId;
 }
 
 MusicAudioTrack DatabaseInterface::buildTrackFromDatabaseRecord(const QSqlRecord &trackRecord) const
 {
     auto id = trackRecord.value(0).toULongLong();
 
     auto &result = d->mTracksCache[id];
 
     if (result.isValid()) {
         return result;
     }
 
     result.setDatabaseId(id);
     result.setTitle(trackRecord.value(1).toString());
     result.setParentId(trackRecord.value(2).toString());
     result.setArtist(trackRecord.value(3).toString());
 
     if (trackRecord.value(4).isValid()) {
         result.setAlbumArtist(trackRecord.value(4).toString());
     }
 
     result.setResourceURI(trackRecord.value(5).toUrl());
     result.setFileModificationTime(trackRecord.value(6).toDateTime());
     result.setTrackNumber(trackRecord.value(7).toInt());
     result.setDiscNumber(trackRecord.value(8).toInt());
     result.setDuration(QTime::fromMSecsSinceStartOfDay(trackRecord.value(9).toInt()));
     result.setAlbumName(trackRecord.value(10).toString());
     result.setRating(trackRecord.value(11).toInt());
     result.setAlbumCover(trackRecord.value(12).toUrl());
     result.setIsSingleDiscAlbum(trackRecord.value(13).toBool());
     result.setGenre(trackRecord.value(14).toString());
     result.setComposer(trackRecord.value(15).toString());
     result.setLyricist(trackRecord.value(16).toString());
     result.setComment(trackRecord.value(17).toString());
     result.setYear(trackRecord.value(18).toInt());
     result.setChannels(trackRecord.value(19).toInt());
     result.setBitRate(trackRecord.value(20).toInt());
     result.setSampleRate(trackRecord.value(21).toInt());
     result.setAlbumId(trackRecord.value(2).toULongLong());
     result.setHasEmbeddedCover(trackRecord.value(22).toBool());
 
     result.setValid(true);
 
     return result;
 }
 
 DatabaseInterface::TrackDataType DatabaseInterface::buildTrackDataFromDatabaseRecord(const QSqlRecord &trackRecord) const
 {
     TrackDataType result;
 
     result[TrackDataType::key_type::DatabaseIdRole] = trackRecord.value(0);
     result[TrackDataType::key_type::TitleRole] = trackRecord.value(1);
     result[TrackDataType::key_type::AlbumRole] = trackRecord.value(10);
     result[TrackDataType::key_type::AlbumIdRole] = trackRecord.value(2);
     result[TrackDataType::key_type::ArtistRole] = trackRecord.value(3);
     result[TrackDataType::key_type::AlbumArtistRole] = trackRecord.value(4);
     result[TrackDataType::key_type::ResourceRole] = trackRecord.value(5);
     result[TrackDataType::key_type::TrackNumberRole] = trackRecord.value(7);
     result[TrackDataType::key_type::DiscNumberRole] = trackRecord.value(8);
     result[TrackDataType::key_type::DurationRole] = QTime::fromMSecsSinceStartOfDay(trackRecord.value(9).toInt());
     result[TrackDataType::key_type::MilliSecondsDurationRole] = trackRecord.value(9).toInt();
     result[TrackDataType::key_type::RatingRole] = trackRecord.value(11);
     result[TrackDataType::key_type::ImageUrlRole] = QUrl(trackRecord.value(12).toString());
     result[TrackDataType::key_type::IsSingleDiscAlbumRole] = trackRecord.value(13);
 
     return result;
 }
 
 void DatabaseInterface::internalRemoveTracksList(const QList<QUrl> &removedTracks)
 {
     for (const auto &removedTrackFileName : removedTracks) {
         d->mRemoveTracksMapping.bindValue(QStringLiteral(":fileName"), removedTrackFileName.toString());
 
         auto result = d->mRemoveTracksMapping.exec();
 
         if (!result || !d->mRemoveTracksMapping.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::internalRemoveTracksList" << d->mRemoveTracksMapping.lastQuery();
             qDebug() << "DatabaseInterface::internalRemoveTracksList" << d->mRemoveTracksMapping.boundValues();
             qDebug() << "DatabaseInterface::internalRemoveTracksList" << d->mRemoveTracksMapping.lastError();
 
             continue;
         }
 
         d->mRemoveTracksMapping.finish();
     }
 
     internalRemoveTracksWithoutMapping();
 }
 
 void DatabaseInterface::internalRemoveTracksList(const QHash<QUrl, QDateTime> &removedTracks, qulonglong sourceId)
 {
     for (auto itRemovedTrack = removedTracks.begin(); itRemovedTrack != removedTracks.end(); ++itRemovedTrack) {
         d->mRemoveTracksMappingFromSource.bindValue(QStringLiteral(":fileName"), itRemovedTrack.key().toString());
         d->mRemoveTracksMappingFromSource.bindValue(QStringLiteral(":sourceId"), sourceId);
 
         auto result = d->mRemoveTracksMappingFromSource.exec();
 
         if (!result || !d->mRemoveTracksMappingFromSource.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::removeTracksList" << d->mRemoveTracksMappingFromSource.lastQuery();
             qDebug() << "DatabaseInterface::removeTracksList" << d->mRemoveTracksMappingFromSource.boundValues();
             qDebug() << "DatabaseInterface::removeTracksList" << d->mRemoveTracksMappingFromSource.lastError();
 
             continue;
         }
 
         d->mRemoveTracksMappingFromSource.finish();
     }
 
     internalRemoveTracksWithoutMapping();
 }
 
 void DatabaseInterface::internalRemoveTracksWithoutMapping()
 {
     auto queryResult = d->mSelectTracksWithoutMappingQuery.exec();
 
     if (!queryResult || !d->mSelectTracksWithoutMappingQuery.isSelect() || !d->mSelectTracksWithoutMappingQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectTracksWithoutMappingQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectTracksWithoutMappingQuery.boundValues();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectTracksWithoutMappingQuery.lastError();
 
         d->mSelectTracksWithoutMappingQuery.finish();
 
         return;
     }
 
     QList<MusicAudioTrack> willRemoveTrack;
 
     while (d->mSelectTracksWithoutMappingQuery.next()) {
         const auto &currentRecord = d->mSelectTracksWithoutMappingQuery.record();
 
         willRemoveTrack.push_back(buildTrackFromDatabaseRecord(currentRecord));
     }
 
     d->mSelectTracksWithoutMappingQuery.finish();
 
     QSet<qulonglong> modifiedAlbums;
 
     QUrl::FormattingOptions currentOptions = QUrl::PreferLocalFile |
             QUrl::RemoveAuthority | QUrl::RemoveFilename | QUrl::RemoveFragment |
             QUrl::RemovePassword | QUrl::RemovePort | QUrl::RemoveQuery |
             QUrl::RemoveScheme | QUrl::RemoveUserInfo;
 
     for (const auto &oneRemovedTrack : willRemoveTrack) {
         removeTrackInDatabase(oneRemovedTrack.databaseId());
 
         Q_EMIT trackRemoved(oneRemovedTrack.databaseId());
 
         const auto &modifiedAlbumId = internalAlbumIdFromTitleAndArtist(oneRemovedTrack.albumName(), oneRemovedTrack.albumArtist());
         const auto &allTracksFromArtist = internalTracksFromAuthor(oneRemovedTrack.artist());
         const auto &allAlbumsFromArtist = internalAlbumIdsFromAuthor(oneRemovedTrack.artist());
         const auto &removedArtistId = internalArtistIdFromName(oneRemovedTrack.artist());
         const auto &trackPath = oneRemovedTrack.resourceURI().toString(currentOptions);
 
         recordModifiedAlbum(modifiedAlbumId);
         modifiedAlbums.insert(modifiedAlbumId);
         updateAlbumFromId(modifiedAlbumId, oneRemovedTrack.albumCover(), oneRemovedTrack, trackPath);
 
         if (removedArtistId != 0 && allTracksFromArtist.isEmpty() && allAlbumsFromArtist.isEmpty()) {
             removeArtistInDatabase(removedArtistId);
             Q_EMIT artistRemoved(removedArtistId);
         }
     }
 
     for (auto modifiedAlbumId : modifiedAlbums) {
         auto modifiedAlbum = internalAlbumFromId(modifiedAlbumId);
 
         if (modifiedAlbum.isValid() && !modifiedAlbum.isEmpty()) {
             Q_EMIT albumModified({{DatabaseIdRole, modifiedAlbumId}}, modifiedAlbumId);
         } else {
             removeAlbumInDatabase(modifiedAlbum.databaseId());
             Q_EMIT albumRemoved(modifiedAlbumId);
 
             const auto &allTracksFromArtist = internalTracksFromAuthor(modifiedAlbum.artist());
             const auto &allAlbumsFromArtist = internalAlbumIdsFromAuthor(modifiedAlbum.artist());
             const auto &removedArtistId = internalArtistIdFromName(modifiedAlbum.artist());
 
             if (removedArtistId != 0 && allTracksFromArtist.isEmpty() && allAlbumsFromArtist.isEmpty()) {
                 removeArtistInDatabase(removedArtistId);
                 Q_EMIT artistRemoved(removedArtistId);
             }
         }
     }
 }
 
 QUrl DatabaseInterface::internalAlbumArtUriFromAlbumId(qulonglong albumId)
 {
     auto result = QUrl();
 
     d->mSelectAlbumArtUriFromAlbumIdQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     auto queryResult = d->mSelectAlbumArtUriFromAlbumIdQuery.exec();
 
     if (!queryResult || !d->mSelectAlbumArtUriFromAlbumIdQuery.isSelect() || !d->mSelectAlbumArtUriFromAlbumIdQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectAlbumArtUriFromAlbumIdQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectAlbumArtUriFromAlbumIdQuery.boundValues();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectAlbumArtUriFromAlbumIdQuery.lastError();
 
         d->mSelectAlbumArtUriFromAlbumIdQuery.finish();
 
         return result;
     }
 
     if (!d->mSelectAlbumArtUriFromAlbumIdQuery.next()) {
         d->mSelectAlbumArtUriFromAlbumIdQuery.finish();
 
         return result;
     }
 
     result = d->mSelectAlbumArtUriFromAlbumIdQuery.record().value(0).toUrl();
 
     d->mSelectAlbumArtUriFromAlbumIdQuery.finish();
 
     return result;
 }
 
 bool DatabaseInterface::isValidArtist(qulonglong albumId)
 {
     auto result = false;
 
     d->mSelectAlbumQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     auto queryResult = d->mSelectAlbumQuery.exec();
 
     if (!queryResult || !d->mSelectAlbumQuery.isSelect() || !d->mSelectAlbumQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectAlbumQuery.lastQuery();
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectAlbumQuery.boundValues();
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectAlbumQuery.lastError();
 
         d->mSelectAlbumQuery.finish();
 
         return result;
     }
 
     if (!d->mSelectAlbumQuery.next()) {
         d->mSelectAlbumQuery.finish();
 
         return result;
     }
 
     const auto &currentRecord = d->mSelectAlbumQuery.record();
 
     result = !currentRecord.value(3).toString().isEmpty();
 
     return result;
 }
 
 qulonglong DatabaseInterface::internalSourceIdFromName(const QString &sourceName)
 {
     qulonglong sourceId = 0;
 
     d->mSelectMusicSource.bindValue(QStringLiteral(":name"), sourceName);
 
     auto queryResult = d->mSelectMusicSource.exec();
 
     if (!queryResult || !d->mSelectMusicSource.isSelect() || !d->mSelectMusicSource.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectMusicSource.lastQuery();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectMusicSource.boundValues();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectMusicSource.lastError();
 
         d->mSelectMusicSource.finish();
 
         return sourceId;
     }
 
     if (!d->mSelectMusicSource.next()) {
         return sourceId;
     }
 
     sourceId = d->mSelectMusicSource.record().value(0).toULongLong();
 
     d->mSelectMusicSource.finish();
 
     return sourceId;
 }
 
 QHash<QUrl, QDateTime> DatabaseInterface::internalAllFileNameFromSource(qulonglong sourceId)
 {
     QHash<QUrl, QDateTime> allFileNames;
 
     d->mSelectAllTrackFilesFromSourceQuery.bindValue(QStringLiteral(":discoverId"), sourceId);
 
     auto queryResult = d->mSelectAllTrackFilesFromSourceQuery.exec();
 
     if (!queryResult || !d->mSelectAllTrackFilesFromSourceQuery.isSelect() || !d->mSelectAllTrackFilesFromSourceQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectAllTrackFilesFromSourceQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectAllTrackFilesFromSourceQuery.boundValues();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectAllTrackFilesFromSourceQuery.lastError();
 
         d->mSelectAllTrackFilesFromSourceQuery.finish();
 
         return allFileNames;
     }
 
     while(d->mSelectAllTrackFilesFromSourceQuery.next()) {
         auto fileName = d->mSelectAllTrackFilesFromSourceQuery.record().value(0).toUrl();
         auto fileModificationTime = d->mSelectAllTrackFilesFromSourceQuery.record().value(1).toDateTime();
 
         allFileNames[fileName] = fileModificationTime;
     }
 
     d->mSelectAllTrackFilesFromSourceQuery.finish();
 
     return allFileNames;
 }
 
 bool DatabaseInterface::internalGenericPartialData(QSqlQuery &query)
 {
     auto result = false;
 
     auto queryResult = query.exec();
 
     if (!queryResult || !query.isSelect() || !query.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalAllGenericPartialData" << query.lastQuery();
         qDebug() << "DatabaseInterface::internalAllGenericPartialData" << query.boundValues();
         qDebug() << "DatabaseInterface::internalAllGenericPartialData" << query.lastError();
 
         query.finish();
 
         auto transactionResult = finishTransaction();
         if (!transactionResult) {
             return result;
         }
 
         return result;
     }
 
     result = true;
 
     return result;
 }
 
 qulonglong DatabaseInterface::insertLyricist(const QString &name)
 {
     auto result = qulonglong(0);
 
     if (name.isEmpty()) {
         return result;
     }
 
     d->mSelectLyricistByNameQuery.bindValue(QStringLiteral(":name"), name);
 
     auto queryResult = d->mSelectLyricistByNameQuery.exec();
 
     if (!queryResult || !d->mSelectLyricistByNameQuery.isSelect() || !d->mSelectLyricistByNameQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertLyricist" << d->mSelectLyricistByNameQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertLyricist" << d->mSelectLyricistByNameQuery.boundValues();
         qDebug() << "DatabaseInterface::insertLyricist" << d->mSelectLyricistByNameQuery.lastError();
 
         d->mSelectLyricistByNameQuery.finish();
 
         return result;
     }
 
     if (d->mSelectLyricistByNameQuery.next()) {
         result = d->mSelectLyricistByNameQuery.record().value(0).toULongLong();
 
         d->mSelectLyricistByNameQuery.finish();
 
         return result;
     }
 
     d->mSelectLyricistByNameQuery.finish();
 
     d->mInsertLyricistQuery.bindValue(QStringLiteral(":lyricistId"), d->mLyricistId);
     d->mInsertLyricistQuery.bindValue(QStringLiteral(":name"), name);
 
     queryResult = d->mInsertLyricistQuery.exec();
 
     if (!queryResult || !d->mInsertLyricistQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertLyricist" << d->mInsertLyricistQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertLyricist" << d->mInsertLyricistQuery.boundValues();
         qDebug() << "DatabaseInterface::insertLyricist" << d->mInsertLyricistQuery.lastError();
 
         d->mInsertLyricistQuery.finish();
 
         return result;
     }
 
     result = d->mLyricistId;
 
     ++d->mLyricistId;
 
     d->mInsertLyricistQuery.finish();
 
     Q_EMIT lyricistsAdded(internalAllLyricistsPartialData());
 
     return result;
 }
 
 qulonglong DatabaseInterface::internalArtistIdFromName(const QString &name)
 {
     auto result = qulonglong(0);
 
     if (name.isEmpty()) {
         return result;
     }
 
     d->mSelectArtistByNameQuery.bindValue(QStringLiteral(":name"), name);
 
     auto queryResult = d->mSelectArtistByNameQuery.exec();
 
     if (!queryResult || !d->mSelectArtistByNameQuery.isSelect() || !d->mSelectArtistByNameQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectArtistByNameQuery.lastQuery();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectArtistByNameQuery.boundValues();
         qDebug() << "DatabaseInterface::insertArtist" << d->mSelectArtistByNameQuery.lastError();
 
         d->mSelectArtistByNameQuery.finish();
 
         return result;
     }
 
     if (!d->mSelectArtistByNameQuery.next()) {
         d->mSelectArtistByNameQuery.finish();
 
         return result;
     }
 
     result = d->mSelectArtistByNameQuery.record().value(0).toULongLong();
 
     d->mSelectArtistByNameQuery.finish();
 
     return result;
 }
 
 void DatabaseInterface::removeTrackInDatabase(qulonglong trackId)
 {
     d->mRemoveTrackQuery.bindValue(QStringLiteral(":trackId"), trackId);
 
     d->mTracksCache.remove(trackId);
 
     auto result = d->mRemoveTrackQuery.exec();
 
     if (!result || !d->mRemoveTrackQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::removeTrackInDatabase" << d->mRemoveTrackQuery.lastQuery();
         qDebug() << "DatabaseInterface::removeTrackInDatabase" << d->mRemoveTrackQuery.boundValues();
         qDebug() << "DatabaseInterface::removeTrackInDatabase" << d->mRemoveTrackQuery.lastError();
     }
 
     d->mRemoveTrackQuery.finish();
 }
 
 void DatabaseInterface::updateTrackInDatabase(const MusicAudioTrack &oneTrack, const QString &albumPath)
 {
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":trackId"), oneTrack.databaseId());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":title"), oneTrack.title());
     insertArtist(oneTrack.artist());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":artistName"), oneTrack.artist());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":albumTitle"), oneTrack.albumName());
     if (oneTrack.isValidAlbumArtist()) {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":albumArtistName"), oneTrack.albumArtist());
     } else {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":albumArtistName"), {});
     }
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":albumPath"), albumPath);
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":trackNumber"), oneTrack.trackNumber());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":discNumber"), oneTrack.discNumber());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":trackDuration"), QVariant::fromValue<qlonglong>(oneTrack.duration().msecsSinceStartOfDay()));
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":trackRating"), oneTrack.rating());
     auto genreId = insertGenre(oneTrack.genre());
     if (genreId != 0) {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":genreId"), genreId);
     } else {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":genreId"), {});
     }
     auto composerId = insertComposer(oneTrack.composer());
     if (composerId != 0) {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":composerId"), composerId);
     } else {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":composerId"), {});
     }
     auto lyricistId = insertLyricist(oneTrack.lyricist());
     if (lyricistId != 0) {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":lyricistId"), lyricistId);
     } else {
         d->mUpdateTrackQuery.bindValue(QStringLiteral(":lyricistId"), {});
     }
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":comment"), oneTrack.comment());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":year"), oneTrack.year());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":channels"), oneTrack.channels());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":bitRate"), oneTrack.bitRate());
     d->mUpdateTrackQuery.bindValue(QStringLiteral(":sampleRate"), oneTrack.sampleRate());
 
     auto result = d->mUpdateTrackQuery.exec();
 
     if (!result || !d->mUpdateTrackQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::updateTrackInDatabase" << d->mUpdateTrackQuery.lastQuery();
         qDebug() << "DatabaseInterface::updateTrackInDatabase" << d->mUpdateTrackQuery.boundValues();
         qDebug() << "DatabaseInterface::updateTrackInDatabase" << d->mUpdateTrackQuery.lastError();
     }
 
     d->mUpdateTrackQuery.finish();
 }
 
 void DatabaseInterface::removeAlbumInDatabase(qulonglong albumId)
 {
     d->mRemoveAlbumQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     d->mAlbumsCache.remove(albumId);
 
     auto result = d->mRemoveAlbumQuery.exec();
 
     if (!result || !d->mRemoveAlbumQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::removeAlbumInDatabase" << d->mRemoveAlbumQuery.lastQuery();
         qDebug() << "DatabaseInterface::removeAlbumInDatabase" << d->mRemoveAlbumQuery.boundValues();
         qDebug() << "DatabaseInterface::removeAlbumInDatabase" << d->mRemoveAlbumQuery.lastError();
     }
 
     d->mRemoveAlbumQuery.finish();
 }
 
 void DatabaseInterface::removeArtistInDatabase(qulonglong artistId)
 {
     d->mRemoveArtistQuery.bindValue(QStringLiteral(":artistId"), artistId);
 
     auto result = d->mRemoveArtistQuery.exec();
 
     if (!result || !d->mRemoveArtistQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::removeArtistInDatabase" << d->mRemoveArtistQuery.lastQuery();
         qDebug() << "DatabaseInterface::removeArtistInDatabase" << d->mRemoveArtistQuery.boundValues();
         qDebug() << "DatabaseInterface::removeArtistInDatabase" << d->mRemoveArtistQuery.lastError();
     }
 
     d->mRemoveArtistQuery.finish();
 }
 
 void DatabaseInterface::reloadExistingDatabase()
 {
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return;
     }
 
     //d->mInitialUpdateTracksValidity.exec();
     qDebug() << "DatabaseInterface::reloadExistingDatabase";
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return;
     }
 
     d->mArtistId = initialId(DataUtils::DataType::AllArtists);
     if (d->mArtistId > 1) {
         Q_EMIT artistsAdded(allArtistsData());
     }
 
     d->mComposerId = initialId(DataUtils::DataType::AllComposers);
 
     d->mLyricistId = initialId(DataUtils::DataType::AllLyricists);
 
     d->mAlbumId = initialId(DataUtils::DataType::AllAlbums);
     if (d->mAlbumId > 1) {
         Q_EMIT albumsAdded(allAlbumsData());
     }
 
     d->mTrackId = initialId(DataUtils::DataType::AllTracks);
     if (d->mTrackId > 1) {
         Q_EMIT tracksAdded(allTracksData());
     }
 
     d->mGenreId = initialId(DataUtils::DataType::AllGenres);;
     if (d->mGenreId > 1) {
         Q_EMIT genresAdded(allGenresData());
     }
 }
 
 qulonglong DatabaseInterface::initialId(DataUtils::DataType aType)
 {
     switch (aType)
     {
     case DataUtils::DataType::AllAlbums:
         return genericInitialId(d->mQueryMaximumAlbumIdQuery);
     case DataUtils::DataType::AllArtists:
         return genericInitialId(d->mQueryMaximumArtistIdQuery);
     case DataUtils::DataType::AllComposers:
         return genericInitialId(d->mQueryMaximumComposerIdQuery);
     case DataUtils::DataType::AllGenres:
         return genericInitialId(d->mQueryMaximumGenreIdQuery);
     case DataUtils::DataType::AllLyricists:
         return genericInitialId(d->mQueryMaximumLyricistIdQuery);
     case DataUtils::DataType::AllTracks:
         return genericInitialId(d->mQueryMaximumTrackIdQuery);
     case DataUtils::DataType::UnknownType:
         break;
     }
     return 1;
 }
 
 qulonglong DatabaseInterface::genericInitialId(QSqlQuery &request)
 {
     auto result = qulonglong(0);
 
     auto transactionResult = startTransaction();
     if (!transactionResult) {
         return result;
     }
 
     auto queryResult = request.exec();
 
     if (!queryResult || !request.isSelect() || !request.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertMusicSource" << request.lastQuery();
         qDebug() << "DatabaseInterface::insertMusicSource" << request.boundValues();
         qDebug() << "DatabaseInterface::insertMusicSource" << request.lastError();
 
         request.finish();
 
         transactionResult = finishTransaction();
         if (!transactionResult) {
             return result;
         }
 
         return result;
     }
 
     if (request.next()) {
         result = request.record().value(0).toULongLong() + 1;
 
         request.finish();
     }
 
     transactionResult = finishTransaction();
     if (!transactionResult) {
         return result;
     }
 
     return result;
 }
 
 qulonglong DatabaseInterface::insertMusicSource(const QString &name)
 {
     qulonglong result = 0;
 
     d->mSelectMusicSource.bindValue(QStringLiteral(":name"), name);
 
     auto queryResult = d->mSelectMusicSource.exec();
 
     if (!queryResult || !d->mSelectMusicSource.isSelect() || !d->mSelectMusicSource.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectMusicSource.lastQuery();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectMusicSource.boundValues();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mSelectMusicSource.lastError();
 
         d->mSelectMusicSource.finish();
 
         return result;
     }
 
     if (d->mSelectMusicSource.next()) {
         result = d->mSelectMusicSource.record().value(0).toULongLong();
 
         d->mSelectMusicSource.finish();
 
         return result;
     }
 
     d->mSelectMusicSource.finish();
 
     d->mInsertMusicSource.bindValue(QStringLiteral(":discoverId"), d->mDiscoverId);
     d->mInsertMusicSource.bindValue(QStringLiteral(":name"), name);
 
     queryResult = d->mInsertMusicSource.exec();
 
     if (!queryResult || !d->mInsertMusicSource.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mInsertMusicSource.lastQuery();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mInsertMusicSource.boundValues();
         qDebug() << "DatabaseInterface::insertMusicSource" << d->mInsertMusicSource.lastError();
 
         d->mInsertMusicSource.finish();
 
         return d->mDiscoverId;
     }
 
     d->mInsertMusicSource.finish();
 
     ++d->mDiscoverId;
 
     return d->mDiscoverId - 1;
 }
 
 QList<MusicAudioTrack> DatabaseInterface::fetchTracks(qulonglong albumId)
 {
     auto allTracks = QList<MusicAudioTrack>();
 
     d->mSelectTrackQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     auto result = d->mSelectTrackQuery.exec();
 
     if (!result || !d->mSelectTrackQuery.isSelect() || !d->mSelectTrackQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::fetchTracks" << d->mSelectTrackQuery.lastQuery();
         qDebug() << "DatabaseInterface::fetchTracks" << d->mSelectTrackQuery.boundValues();
         qDebug() << "DatabaseInterface::fetchTracks" << d->mSelectTrackQuery.lastError();
     }
 
     while (d->mSelectTrackQuery.next()) {
         const auto &currentRecord = d->mSelectTrackQuery.record();
 
         allTracks.push_back(buildTrackFromDatabaseRecord(currentRecord));
     }
 
     d->mSelectTrackQuery.finish();
 
     return allTracks;
 }
 
 QList<qulonglong> DatabaseInterface::fetchTrackIds(qulonglong albumId)
 {
     auto allTracks = QList<qulonglong>();
 
     d->mSelectTrackQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     auto result = d->mSelectTrackQuery.exec();
 
     if (!result || !d->mSelectTrackQuery.isSelect() || !d->mSelectTrackQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::fetchTracks" << d->mSelectTrackQuery.lastQuery();
         qDebug() << "DatabaseInterface::fetchTracks" << d->mSelectTrackQuery.boundValues();
         qDebug() << "DatabaseInterface::fetchTracks" << d->mSelectTrackQuery.lastError();
     }
 
     while (d->mSelectTrackQuery.next()) {
         const auto &currentRecord = d->mSelectTrackQuery.record();
 
         allTracks.push_back(currentRecord.value(0).toULongLong());
     }
 
     d->mSelectTrackQuery.finish();
 
     return allTracks;
 }
 
 MusicAlbum DatabaseInterface::internalAlbumFromId(qulonglong albumId)
 {
     auto &retrievedAlbum = d->mAlbumsCache[albumId];
 
     if (retrievedAlbum.isValid()) {
         return retrievedAlbum;
     }
 
     d->mSelectAlbumQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     auto result = d->mSelectAlbumQuery.exec();
 
     if (!result || !d->mSelectAlbumQuery.isSelect() || !d->mSelectAlbumQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectAlbumQuery.lastQuery();
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectAlbumQuery.boundValues();
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectAlbumQuery.lastError();
 
         d->mSelectAlbumQuery.finish();
 
         return retrievedAlbum;
     }
 
     if (!d->mSelectAlbumQuery.next()) {
         d->mSelectAlbumQuery.finish();
 
         return retrievedAlbum;
     }
 
     const auto &currentRecord = d->mSelectAlbumQuery.record();
 
     retrievedAlbum.setDatabaseId(currentRecord.value(0).toULongLong());
     retrievedAlbum.setTitle(currentRecord.value(1).toString());
     retrievedAlbum.setId(currentRecord.value(2).toString());
     retrievedAlbum.setArtist(currentRecord.value(3).toString());
     retrievedAlbum.setAlbumPath(currentRecord.value(4).toUrl());
     retrievedAlbum.setAlbumArtURI(currentRecord.value(5).toUrl());
     retrievedAlbum.setTracksCount(currentRecord.value(6).toInt());
     retrievedAlbum.setIsSingleDiscAlbum(currentRecord.value(7).toBool());
     retrievedAlbum.setTracks(fetchTracks(albumId));
     retrievedAlbum.setValid(true);
 
     d->mSelectAlbumQuery.finish();
 
     d->mSelectGenreForAlbumQuery.bindValue(QStringLiteral(":albumId"), albumId);
 
     result = d->mSelectGenreForAlbumQuery.exec();
 
     if (!result || !d->mSelectGenreForAlbumQuery.isSelect() || !d->mSelectGenreForAlbumQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectGenreForAlbumQuery.lastQuery();
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectGenreForAlbumQuery.boundValues();
         qDebug() << "DatabaseInterface::internalAlbumFromId" << d->mSelectGenreForAlbumQuery.lastError();
 
         d->mSelectGenreForAlbumQuery.finish();
 
         return retrievedAlbum;
     }
 
     QStringList allGenres;
     while(d->mSelectGenreForAlbumQuery.next()) {
         allGenres.push_back(d->mSelectGenreForAlbumQuery.record().value(0).toString());
     }
 
     retrievedAlbum.setGenres(allGenres);
 
     d->mSelectGenreForAlbumQuery.finish();
 
     return retrievedAlbum;
 }
 
 MusicAlbum DatabaseInterface::internalAlbumFromTitleAndArtist(const QString &title, const QString &artist)
 {
     auto result = MusicAlbum();
 
     auto albumId = internalAlbumIdFromTitleAndArtist(title, artist);
 
     if (albumId == 0) {
         return result;
     }
 
     result = internalAlbumFromId(albumId);
 
     return result;
 }
 
 qulonglong DatabaseInterface::internalAlbumIdFromTitleAndArtist(const QString &title, const QString &artist)
 {
     auto result = qulonglong(0);
 
     d->mSelectAlbumIdFromTitleQuery.bindValue(QStringLiteral(":title"), title);
     d->mSelectAlbumIdFromTitleQuery.bindValue(QStringLiteral(":artistName"), artist);
 
     auto queryResult = d->mSelectAlbumIdFromTitleQuery.exec();
 
     if (!queryResult || !d->mSelectAlbumIdFromTitleQuery.isSelect() || !d->mSelectAlbumIdFromTitleQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalAlbumIdFromTitleAndArtist" << d->mSelectAlbumIdFromTitleQuery.lastQuery();
         qDebug() << "DatabaseInterface::internalAlbumIdFromTitleAndArtist" << d->mSelectAlbumIdFromTitleQuery.boundValues();
         qDebug() << "DatabaseInterface::internalAlbumIdFromTitleAndArtist" << d->mSelectAlbumIdFromTitleQuery.lastError();
 
         d->mSelectAlbumIdFromTitleQuery.finish();
 
         return result;
     }
 
     if (d->mSelectAlbumIdFromTitleQuery.next()) {
         result = d->mSelectAlbumIdFromTitleQuery.record().value(0).toULongLong();
     }
 
     d->mSelectAlbumIdFromTitleQuery.finish();
 
     if (result == 0) {
         d->mSelectAlbumIdFromTitleWithoutArtistQuery.bindValue(QStringLiteral(":title"), title);
 
         auto queryResult = d->mSelectAlbumIdFromTitleWithoutArtistQuery.exec();
 
         if (!queryResult || !d->mSelectAlbumIdFromTitleWithoutArtistQuery.isSelect() || !d->mSelectAlbumIdFromTitleWithoutArtistQuery.isActive()) {
             Q_EMIT databaseError();
 
             qDebug() << "DatabaseInterface::internalAlbumIdFromTitleAndArtist" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.lastQuery();
             qDebug() << "DatabaseInterface::internalAlbumIdFromTitleAndArtist" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.boundValues();
             qDebug() << "DatabaseInterface::internalAlbumIdFromTitleAndArtist" << d->mSelectAlbumIdFromTitleWithoutArtistQuery.lastError();
 
             d->mSelectAlbumIdFromTitleWithoutArtistQuery.finish();
 
             return result;
         }
 
         if (d->mSelectAlbumIdFromTitleWithoutArtistQuery.next()) {
             result = d->mSelectAlbumIdFromTitleWithoutArtistQuery.record().value(0).toULongLong();
         }
 
         d->mSelectAlbumIdFromTitleWithoutArtistQuery.finish();
     }
 
     return result;
 }
 
 MusicAudioTrack DatabaseInterface::internalTrackFromDatabaseId(qulonglong id)
 {
     auto result = MusicAudioTrack();
 
     if (result.isValid()) {
         return result;
     }
 
     if (!d || !d->mTracksDatabase.isValid() || !d->mInitFinished) {
         return result;
     }
 
     d->mSelectTrackFromIdQuery.bindValue(QStringLiteral(":trackId"), id);
 
     auto queryResult = d->mSelectTrackFromIdQuery.exec();
 
     if (!queryResult || !d->mSelectTrackFromIdQuery.isSelect() || !d->mSelectTrackFromIdQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalTrackFromDatabaseId" << d->mSelectAlbumQuery.lastQuery();
         qDebug() << "DatabaseInterface::internalTrackFromDatabaseId" << d->mSelectAlbumQuery.boundValues();
         qDebug() << "DatabaseInterface::internalTrackFromDatabaseId" << d->mSelectAlbumQuery.lastError();
 
         d->mSelectTrackFromIdQuery.finish();
 
         return result;
     }
 
     if (!d->mSelectTrackFromIdQuery.next()) {
         d->mSelectTrackFromIdQuery.finish();
 
         return result;
     }
 
     const auto &currentRecord = d->mSelectTrackFromIdQuery.record();
 
     result = buildTrackFromDatabaseRecord(currentRecord);
 
     d->mSelectTrackFromIdQuery.finish();
 
     return result;
 }
 
 qulonglong DatabaseInterface::internalTrackIdFromTitleAlbumTracDiscNumber(const QString &title, const QString &artist, const QString &album,
                                                                           int trackNumber, int discNumber)
 {
     auto result = qulonglong(0);
 
     if (!d) {
         return result;
     }
 
     d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":title"), title);
     d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":artist"), artist);
     d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":album"), album);
     d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":trackNumber"), trackNumber);
     d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":discNumber"), discNumber);
 
     auto queryResult = d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.exec();
 
     if (!queryResult || !d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.isSelect() || !d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::trackIdFromTitleAlbumArtist" << d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.lastQuery();
         qDebug() << "DatabaseInterface::trackIdFromTitleAlbumArtist" << d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.boundValues();
         qDebug() << "DatabaseInterface::trackIdFromTitleAlbumArtist" << d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.lastError();
 
         d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.finish();
 
         return result;
     }
 
     if (d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.next()) {
         result = d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.record().value(0).toULongLong();
     }
 
     d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.finish();
 
     return result;
 }
 
 qulonglong DatabaseInterface::getDuplicateTrackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &album,
                                                                                const QString &albumArtist, const QString &trackPath,
                                                                                int trackNumber, int discNumber)
 {
     auto result = qulonglong(0);
 
     if (!d) {
         return result;
     }
 
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":title"), title);
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":album"), album);
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":albumPath"), trackPath);
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":albumArtist"), albumArtist);
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":trackNumber"), trackNumber);
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":discNumber"), discNumber);
 
     auto queryResult = d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.exec();
 
     if (!queryResult || !d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.isSelect() || !d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::trackIdFromTitleAlbumArtist" << d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.lastQuery();
         qDebug() << "DatabaseInterface::trackIdFromTitleAlbumArtist" << d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.boundValues();
         qDebug() << "DatabaseInterface::trackIdFromTitleAlbumArtist" << d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.lastError();
 
         d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.finish();
 
         return result;
     }
 
     if (d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.next()) {
         result = d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.record().value(0).toULongLong();
     }
 
     d->mSelectTrackIdFromTitleAlbumTrackDiscNumberQuery.finish();
 
     return result;
 }
 
 qulonglong DatabaseInterface::internalTrackIdFromFileName(const QUrl &fileName)
 {
     auto result = qulonglong(0);
 
     if (!d) {
         return result;
     }
 
     d->mSelectTracksMapping.bindValue(QStringLiteral(":fileName"), fileName);
 
     auto queryResult = d->mSelectTracksMapping.exec();
 
     if (!queryResult || !d->mSelectTracksMapping.isSelect() || !d->mSelectTracksMapping.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMapping.lastQuery();
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMapping.boundValues();
         qDebug() << "DatabaseInterface::internalTrackIdFromFileName" << d->mSelectTracksMapping.lastError();
 
         d->mSelectTracksMapping.finish();
 
         return result;
     }
 
     if (d->mSelectTracksMapping.next()) {
         const auto &currentRecordValue = d->mSelectTracksMapping.record().value(0);
         if (currentRecordValue.isValid()) {
             result = currentRecordValue.toULongLong();
         }
     }
 
     d->mSelectTracksMapping.finish();
 
     return result;
 }
 
 DatabaseInterface::ListTrackDataType DatabaseInterface::internalTracksFromAuthor(const QString &ArtistName)
 {
     auto allTracks = ListTrackDataType{};
 
     d->mSelectTracksFromArtist.bindValue(QStringLiteral(":artistName"), ArtistName);
 
     auto result = d->mSelectTracksFromArtist.exec();
 
     if (!result || !d->mSelectTracksFromArtist.isSelect() || !d->mSelectTracksFromArtist.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::tracksFromAuthor" << d->mSelectTracksFromArtist.lastQuery();
         qDebug() << "DatabaseInterface::tracksFromAuthor" << d->mSelectTracksFromArtist.boundValues();
         qDebug() << "DatabaseInterface::tracksFromAuthor" << d->mSelectTracksFromArtist.lastError();
 
         return allTracks;
     }
 
     while (d->mSelectTracksFromArtist.next()) {
         const auto &currentRecord = d->mSelectTracksFromArtist.record();
 
         allTracks.push_back(buildTrackDataFromDatabaseRecord(currentRecord));
     }
 
     d->mSelectTracksFromArtist.finish();
 
     return allTracks;
 }
 
 QList<qulonglong> DatabaseInterface::internalAlbumIdsFromAuthor(const QString &ArtistName)
 {
     auto allAlbumIds = QList<qulonglong>();
 
     d->mSelectAlbumIdsFromArtist.bindValue(QStringLiteral(":artistName"), ArtistName);
 
     auto result = d->mSelectAlbumIdsFromArtist.exec();
 
     if (!result || !d->mSelectAlbumIdsFromArtist.isSelect() || !d->mSelectAlbumIdsFromArtist.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::tracksFromAuthor" << d->mSelectAlbumIdsFromArtist.lastQuery();
         qDebug() << "DatabaseInterface::tracksFromAuthor" << d->mSelectAlbumIdsFromArtist.boundValues();
         qDebug() << "DatabaseInterface::tracksFromAuthor" << d->mSelectAlbumIdsFromArtist.lastError();
 
         return allAlbumIds;
     }
 
     while (d->mSelectAlbumIdsFromArtist.next()) {
         const auto &currentRecord = d->mSelectAlbumIdsFromArtist.record();
 
         allAlbumIds.push_back(currentRecord.value(0).toULongLong());
     }
 
     d->mSelectAlbumIdsFromArtist.finish();
 
     return allAlbumIds;
 }
 
 DatabaseInterface::ListArtistDataType DatabaseInterface::internalAllArtistsPartialData()
 {
     auto result = ListArtistDataType{};
 
     if (!internalGenericPartialData(d->mSelectAllArtistsQuery)) {
         return result;
     }
 
     while(d->mSelectAllArtistsQuery.next()) {
         auto newData = ArtistDataType{};
 
         const auto &currentRecord = d->mSelectAllArtistsQuery.record();
 
         newData[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         newData[DataType::key_type::TitleRole] = currentRecord.value(1);
         newData[DataType::key_type::GenreRole] = QVariant::fromValue(currentRecord.value(2).toString().split(QStringLiteral(", ")));
 
         result.push_back(newData);
     }
 
     d->mSelectAllArtistsQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ArtistDataType DatabaseInterface::internalOneArtistPartialData(qulonglong databaseId)
 {
     auto result = ArtistDataType{};
 
     d->mSelectArtistQuery.bindValue(QStringLiteral(":artistId"), databaseId);
 
     if (!internalGenericPartialData(d->mSelectArtistQuery)) {
         return result;
     }
 
     if (d->mSelectArtistQuery.next()) {
         const auto &currentRecord = d->mSelectArtistQuery.record();
 
         result[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         result[DataType::key_type::TitleRole] = currentRecord.value(1);
         result[DataType::key_type::GenreRole] = QVariant::fromValue(currentRecord.value(2).toString().split(QStringLiteral(", ")));
     }
 
     d->mSelectArtistQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ListAlbumDataType DatabaseInterface::internalAllAlbumsPartialData()
 {
     auto result = ListAlbumDataType{};
 
     if (!internalGenericPartialData(d->mSelectAllAlbumsShortQuery)) {
         return result;
     }
 
     while(d->mSelectAllAlbumsShortQuery.next()) {
         auto newData = AlbumDataType{};
 
         const auto &currentRecord = d->mSelectAllAlbumsShortQuery.record();
 
         newData[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         newData[DataType::key_type::TitleRole] = currentRecord.value(1);
         newData[DataType::key_type::SecondaryTextRole] = currentRecord.value(2);
         newData[DataType::key_type::ImageUrlRole] = currentRecord.value(3);
         newData[DataType::key_type::ArtistRole] = currentRecord.value(4);
         newData[DataType::key_type::AllArtistsRole] = QVariant::fromValue(currentRecord.value(5).toString().split(QStringLiteral(", ")));
         newData[DataType::key_type::HighestTrackRating] = currentRecord.value(6);
         newData[DataType::key_type::GenreRole] = QVariant::fromValue(currentRecord.value(7).toString().split(QStringLiteral(", ")));
 
         result.push_back(newData);
     }
 
     d->mSelectAllAlbumsShortQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::AlbumDataType DatabaseInterface::internalOneAlbumPartialData(qulonglong databaseId)
 {
     auto result = AlbumDataType{};
 
     d->mSelectAlbumQuery.bindValue(QStringLiteral(":albumId"), databaseId);
 
     if (!internalGenericPartialData(d->mSelectAlbumQuery)) {
         return result;
     }
 
     if (d->mSelectAlbumQuery.next()) {
         const auto &currentRecord = d->mSelectAlbumQuery.record();
 
         result[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         result[DataType::key_type::TitleRole] = currentRecord.value(1);
         result[DataType::key_type::SecondaryTextRole] = currentRecord.value(3);
         result[DataType::key_type::ImageUrlRole] = currentRecord.value(5);
         result[DataType::key_type::ArtistRole] = currentRecord.value(3);
         result[DataType::key_type::AllArtistsRole] = QVariant::fromValue(currentRecord.value(9).toString().split(QStringLiteral(", ")));
         result[DataType::key_type::HighestTrackRating] = currentRecord.value(10);
         result[DataType::key_type::GenreRole] = QVariant::fromValue(currentRecord.value(11).toString().split(QStringLiteral(", ")));
     }
 
     d->mSelectAlbumQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ListTrackDataType DatabaseInterface::internalAllTracksPartialData()
 {
     auto result = ListTrackDataType{};
 
     if (!internalGenericPartialData(d->mSelectAllTracksShortQuery)) {
         return result;
     }
 
     while(d->mSelectAllTracksShortQuery.next()) {
         auto newData = TrackDataType{};
 
         const auto &currentRecord = d->mSelectAllTracksShortQuery.record();
 
         newData[TrackDataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         newData[TrackDataType::key_type::TitleRole] = currentRecord.value(1);
         newData[TrackDataType::key_type::ArtistRole] = currentRecord.value(2);
         newData[TrackDataType::key_type::AlbumRole] = currentRecord.value(3);
         newData[TrackDataType::key_type::AlbumArtistRole] = currentRecord.value(4);
         newData[TrackDataType::key_type::DurationRole] = currentRecord.value(5);
         newData[TrackDataType::key_type::ImageUrlRole] = currentRecord.value(6);
         newData[TrackDataType::key_type::TrackNumberRole] = currentRecord.value(7);
         newData[TrackDataType::key_type::DiscNumberRole] = currentRecord.value(8);
         newData[TrackDataType::key_type::RatingRole] = currentRecord.value(9);
         newData[TrackDataType::key_type::IsSingleDiscAlbumRole] = currentRecord.value(13);
 
         result.push_back(newData);
     }
 
     d->mSelectAllTracksShortQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::TrackDataType DatabaseInterface::internalOneTrackPartialData(qulonglong databaseId)
 {
     auto result = TrackDataType{};
 
     d->mSelectTrackFromIdQuery.bindValue(QStringLiteral(":trackId"), databaseId);
 
     if (!internalGenericPartialData(d->mSelectTrackFromIdQuery)) {
         return result;
     }
 
     if (d->mSelectTrackFromIdQuery.next()) {
         const auto &currentRecord = d->mSelectTrackFromIdQuery.record();
 
         result = buildTrackDataFromDatabaseRecord(currentRecord);
     }
 
     d->mSelectTrackFromIdQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ListGenreDataType DatabaseInterface::internalAllGenresPartialData()
 {
     ListGenreDataType result;
 
     if (!internalGenericPartialData(d->mSelectAllGenresQuery)) {
         return result;
     }
 
     while(d->mSelectAllGenresQuery.next()) {
         auto newData = GenreDataType{};
 
         const auto &currentRecord = d->mSelectAllGenresQuery.record();
 
         newData[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         newData[DataType::key_type::TitleRole] = currentRecord.value(1);
 
         result.push_back(newData);
     }
 
     d->mSelectAllGenresQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::GenreDataType DatabaseInterface::internalOneGenrePartialData(qulonglong databaseId)
 {
     auto result = GenreDataType{};
 
     d->mSelectGenreQuery.bindValue(QStringLiteral(":genreId"), databaseId);
 
     if (!internalGenericPartialData(d->mSelectGenreQuery)) {
         return result;
     }
 
     if (d->mSelectGenreQuery.next()) {
         const auto &currentRecord = d->mSelectGenreQuery.record();
 
         result[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         result[DataType::key_type::TitleRole] = currentRecord.value(1);
     }
 
     d->mSelectGenreQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ListArtistDataType DatabaseInterface::internalAllComposersPartialData()
 {
     ListArtistDataType result;
 
     if (!internalGenericPartialData(d->mSelectAllComposersQuery)) {
         return result;
     }
 
     while(d->mSelectAllComposersQuery.next()) {
         auto newData = ArtistDataType{};
 
         const auto &currentRecord = d->mSelectAllComposersQuery.record();
 
         newData[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         newData[DataType::key_type::TitleRole] = currentRecord.value(1);
 
         result.push_back(newData);
     }
 
     d->mSelectAllComposersQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ArtistDataType DatabaseInterface::internalOneComposerPartialData(qulonglong databaseId)
 {
     auto result = ArtistDataType{};
 
     d->mSelectComposerQuery.bindValue(QStringLiteral(":composerId"), databaseId);
 
     if (!internalGenericPartialData(d->mSelectComposerQuery)) {
         return result;
     }
 
     if (d->mSelectComposerQuery.next()) {
         const auto &currentRecord = d->mSelectComposerQuery.record();
 
         result[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         result[DataType::key_type::TitleRole] = currentRecord.value(1);
     }
 
     d->mSelectComposerQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ListArtistDataType DatabaseInterface::internalAllLyricistsPartialData()
 {
     ListArtistDataType result;
 
     if (!internalGenericPartialData(d->mSelectAllLyricistsQuery)) {
         return result;
     }
 
     while(d->mSelectAllLyricistsQuery.next()) {
         auto newData = ArtistDataType{};
 
         const auto &currentRecord = d->mSelectAllLyricistsQuery.record();
 
         newData[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         newData[DataType::key_type::TitleRole] = currentRecord.value(1);
 
         result.push_back(newData);
     }
 
     d->mSelectAllLyricistsQuery.finish();
 
     return result;
 }
 
 DatabaseInterface::ArtistDataType DatabaseInterface::internalOneLyricistPartialData(qulonglong databaseId)
 {
     auto result = ArtistDataType{};
 
     d->mSelectLyricistQuery.bindValue(QStringLiteral(":lyricistId"), databaseId);
 
     if (!internalGenericPartialData(d->mSelectLyricistQuery)) {
         return result;
     }
 
     if (d->mSelectLyricistQuery.next()) {
         const auto &currentRecord = d->mSelectLyricistQuery.record();
 
         result[DataType::key_type::DatabaseIdRole] = currentRecord.value(0);
         result[DataType::key_type::TitleRole] = currentRecord.value(1);
     }
 
     d->mSelectLyricistQuery.finish();
 
     return result;
 }
 
 bool DatabaseInterface::prepareQuery(QSqlQuery &query, const QString &queryText) const
 {
     query.setForwardOnly(true);
     return query.prepare(queryText);
 }
 
 void DatabaseInterface::updateAlbumArtist(qulonglong albumId, const QString &title,
                                           const QString &albumPath,
                                           const QString &artistName)
 {
     d->mUpdateAlbumArtistQuery.bindValue(QStringLiteral(":albumId"), albumId);
     insertArtist(artistName);
     d->mUpdateAlbumArtistQuery.bindValue(QStringLiteral(":artistName"), artistName);
 
     auto queryResult = d->mUpdateAlbumArtistQuery.exec();
 
     if (!queryResult || !d->mUpdateAlbumArtistQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::updateAlbumArtist" << d->mUpdateAlbumArtistQuery.lastQuery();
         qDebug() << "DatabaseInterface::updateAlbumArtist" << d->mUpdateAlbumArtistQuery.boundValues();
         qDebug() << "DatabaseInterface::updateAlbumArtist" << d->mUpdateAlbumArtistQuery.lastError();
 
         d->mUpdateAlbumArtistQuery.finish();
 
         return;
     }
 
     d->mUpdateAlbumArtistQuery.finish();
 
     d->mUpdateAlbumArtistInTracksQuery.bindValue(QStringLiteral(":albumTitle"), title);
     d->mUpdateAlbumArtistInTracksQuery.bindValue(QStringLiteral(":albumPath"), albumPath);
     d->mUpdateAlbumArtistInTracksQuery.bindValue(QStringLiteral(":artistName"), artistName);
 
     queryResult = d->mUpdateAlbumArtistInTracksQuery.exec();
 
     if (!queryResult || !d->mUpdateAlbumArtistInTracksQuery.isActive()) {
         Q_EMIT databaseError();
 
         qDebug() << "DatabaseInterface::updateAlbumArtist" << d->mUpdateAlbumArtistInTracksQuery.lastQuery();
         qDebug() << "DatabaseInterface::updateAlbumArtist" << d->mUpdateAlbumArtistInTracksQuery.boundValues();
         qDebug() << "DatabaseInterface::updateAlbumArtist" << d->mUpdateAlbumArtistInTracksQuery.lastError();
 
         d->mUpdateAlbumArtistInTracksQuery.finish();
 
         return;
     }
 
     d->mUpdateAlbumArtistInTracksQuery.finish();
 }
 
 
 #include "moc_databaseinterface.cpp"
diff --git a/src/databaseinterface.h b/src/databaseinterface.h
index 44e3ada6..2888c0ce 100644
--- a/src/databaseinterface.h
+++ b/src/databaseinterface.h
@@ -1,445 +1,447 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef DATABASEINTERFACE_H
 #define DATABASEINTERFACE_H
 
 #include "elisaLib_export.h"
 
 #include "datatype.h"
 #include "elisautils.h"
 #include "musicalbum.h"
 #include "musicaudiotrack.h"
 #include "musicaudiogenre.h"
 
 #include <QObject>
 #include <QString>
 #include <QHash>
 #include <QList>
 #include <QVariant>
 #include <QUrl>
 #include <QDateTime>
 #include <QPair>
 
 #include <memory>
 
 class DatabaseInterfacePrivate;
 class QMutex;
 class QSqlRecord;
 class QSqlQuery;
 
 class ELISALIB_EXPORT DatabaseInterface : public QObject
 {
     Q_OBJECT
 
 public:
 
     enum ColumnsRoles {
         TitleRole = Qt::UserRole + 1,
         SecondaryTextRole,
         ImageUrlRole,
         ShadowForImageRole,
         ChildModelRole,
         DurationRole,
         MilliSecondsDurationRole,
         ArtistRole,
         AllArtistsRole,
         HighestTrackRating,
         AlbumRole,
         AlbumArtistRole,
         TrackNumberRole,
         DiscNumberRole,
         RatingRole,
         GenreRole,
         LyricistRole,
         ComposerRole,
         CommentRole,
         YearRole,
         ChannelsRole,
         BitRateRole,
         SampleRateRole,
         ResourceRole,
         IdRole,
         DatabaseIdRole,
         IsSingleDiscAlbumRole,
         ContainerDataRole,
         IsPartialDataRole,
         AlbumIdRole,
     };
 
     Q_ENUM(ColumnsRoles)
 
 private:
 
     using DataType = QMap<ColumnsRoles, QVariant>;
 
 public:
 
     class TrackDataType : public DataType
     {
     public:
 
         using DataType::DataType;
 
         qulonglong databaseId() const
         {
             return operator[](key_type::DatabaseIdRole).toULongLong();
         }
 
         QString title() const
         {
             return operator[](key_type::TitleRole).toString();
         }
 
         QString artist() const
         {
             return operator[](key_type::ArtistRole).toString();
         }
 
         QString album() const
         {
             return operator[](key_type::AlbumRole).toString();
         }
 
         QString albumArtist() const
         {
             return operator[](key_type::AlbumArtistRole).toString();
         }
 
         int trackNumber() const
         {
             return operator[](key_type::TrackNumberRole).toInt();
         }
 
         int discNumber() const
         {
             return operator[](key_type::DiscNumberRole).toInt();
         }
 
         int duration() const
         {
             return operator[](key_type::DurationRole).toInt();
         }
 
         QUrl resourceURI() const
         {
             return operator[](key_type::ResourceRole).toUrl();
         }
     };
 
     using ListTrackDataType = QList<TrackDataType>;
 
     class AlbumDataType : public DataType
     {
     public:
 
         using DataType::DataType;
 
         qulonglong databaseId() const
         {
             return operator[](key_type::DatabaseIdRole).toULongLong();
         }
 
     };
 
     using ListAlbumDataType = QList<AlbumDataType>;
 
     class ArtistDataType : public DataType
     {
     public:
 
         using DataType::DataType;
 
         qulonglong databaseId() const
         {
             return operator[](key_type::DatabaseIdRole).toULongLong();
         }
 
     };
 
     using ListArtistDataType = QList<ArtistDataType>;
 
     class GenreDataType : public DataType
     {
     public:
 
         using DataType::DataType;
 
         qulonglong databaseId() const
         {
             return operator[](key_type::DatabaseIdRole).toULongLong();
         }
 
     };
 
     using ListGenreDataType = QList<GenreDataType>;
 
     enum PropertyType {
         DatabaseId,
         DisplayRole,
         SecondaryRole,
     };
 
     Q_ENUM(PropertyType)
 
     enum AlbumDiscsCount {
         SingleDiscAlbum,
         MultipleDiscsAlbum,
     };
 
     Q_ENUM(AlbumDiscsCount)
 
     explicit DatabaseInterface(QObject *parent = nullptr);
 
     ~DatabaseInterface() override;
 
     Q_INVOKABLE void init(const QString &dbName, const QString &databaseFileName = {});
 
     MusicAlbum albumFromTitleAndArtist(const QString &title, const QString &artist);
 
     ListTrackDataType allTracksData();
 
     ListAlbumDataType allAlbumsData();
 
+    ListTrackDataType albumData(qulonglong databaseId);
+
     ListArtistDataType allArtistsData();
 
     ListGenreDataType allGenresData();
 
-    DataType oneData(DataUtils::DataType aType, qulonglong databaseId);
+    DataType oneData(ElisaUtils::PlayListEntryType aType, qulonglong databaseId);
 
     QList<MusicAudioTrack> allTracks();
 
     QList<MusicAudioTrack> allTracksFromSource(const QString &musicSource);
 
     QList<MusicAlbum> allAlbums();
 
     QList<MusicAudioGenre> allGenres();
 
     ListTrackDataType tracksFromAuthor(const QString &artistName);
 
     TrackDataType trackDataFromDatabaseId(qulonglong id);
 
     MusicAudioTrack trackFromDatabaseId(qulonglong id);
 
     qulonglong trackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &artist, const QString &album,
                                                     int trackNumber, int discNumber);
 
     qulonglong trackIdFromFileName(const QUrl &fileName);
 
     void applicationAboutToQuit();
 
 Q_SIGNALS:
 
     void artistsAdded(const ListArtistDataType &newArtists);
 
     void composersAdded(const ListArtistDataType &newComposers);
 
     void lyricistsAdded(const ListArtistDataType &newLyricists);
 
     void albumsAdded(const ListAlbumDataType &newAlbums);
 
     void tracksAdded(const ListTrackDataType &allTracks);
 
     void genresAdded(const ListGenreDataType &allGenres);
 
     void artistRemoved(qulonglong removedArtistId);
 
     void albumRemoved(qulonglong removedAlbumId);
 
     void trackRemoved(qulonglong id);
 
     void albumModified(const AlbumDataType &modifiedAlbum, qulonglong modifiedAlbumId);
 
     void trackModified(const TrackDataType &modifiedTrack);
 
     void sentAlbumData(const MusicAlbum albumData);
 
     void requestsInitDone();
 
     void databaseError();
 
     void restoredTracks(const QString &musicSource, QHash<QUrl, QDateTime> allFiles);
 
 public Q_SLOTS:
 
     void insertTracksList(const QList<MusicAudioTrack> &tracks, const QHash<QString, QUrl> &covers, const QString &musicSource);
 
     void removeTracksList(const QList<QUrl> &removedTracks);
 
     void modifyTracksList(const QList<MusicAudioTrack> &modifiedTracks, const QHash<QString, QUrl> &covers, const QString &musicSource);
 
     void removeAllTracksFromSource(const QString &sourceName);
 
     void getAlbumFromAlbumId(qulonglong id);
 
     void askRestoredTracks(const QString &musicSource);
 
 private:
 
     enum class TrackFileInsertType {
         NewTrackFileInsert,
         ModifiedTrackFileInsert,
     };
 
     void initChangesTrackers();
 
     void recordModifiedTrack(qulonglong trackId);
 
     void recordModifiedAlbum(qulonglong albumId);
 
     bool startTransaction() const;
 
     bool finishTransaction() const;
 
     bool rollBackTransaction() const;
 
     QList<MusicAudioTrack> fetchTracks(qulonglong albumId);
 
     QList<qulonglong> fetchTrackIds(qulonglong albumId);
 
     MusicAlbum internalAlbumFromId(qulonglong albumId);
 
     MusicAlbum internalAlbumFromTitleAndArtist(const QString &title, const QString &artist);
 
     qulonglong internalAlbumIdFromTitleAndArtist(const QString &title, const QString &artist);
 
     MusicAudioTrack internalTrackFromDatabaseId(qulonglong id);
 
     qulonglong internalTrackIdFromTitleAlbumTracDiscNumber(const QString &title, const QString &artist, const QString &album,
                                                            int trackNumber, int discNumber);
 
     qulonglong getDuplicateTrackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &album,
                                                                 const QString &albumArtist, const QString &trackPath,
                                                                 int trackNumber, int discNumber);
 
     qulonglong internalTrackIdFromFileName(const QUrl &fileName);
 
     ListTrackDataType internalTracksFromAuthor(const QString &artistName);
 
     QList<qulonglong> internalAlbumIdsFromAuthor(const QString &artistName);
 
     void initDatabase();
 
     void initRequest();
 
     qulonglong insertAlbum(const QString &title, const QString &albumArtist, const QString &trackArtist,
                            const QString &trackPath, const QUrl &albumArtURI);
 
     bool updateAlbumFromId(qulonglong albumId, const QUrl &albumArtUri,
                            const MusicAudioTrack &currentTrack, const QString &albumPath);
 
     qulonglong insertArtist(const QString &name);
 
     qulonglong internalArtistIdFromName(const QString &name);
 
     qulonglong insertGenre(const QString &name);
 
     MusicAudioGenre internalGenreFromId(qulonglong genreId);
 
     void removeTrackInDatabase(qulonglong trackId);
 
     void updateTrackInDatabase(const MusicAudioTrack &oneTrack, const QString &albumPath);
 
     void removeAlbumInDatabase(qulonglong albumId);
 
     void removeArtistInDatabase(qulonglong artistId);
 
     void reloadExistingDatabase();
 
     qulonglong initialId(DataUtils::DataType aType);
 
     qulonglong genericInitialId(QSqlQuery &request);
 
     qulonglong insertMusicSource(const QString &name);
 
     void insertTrackOrigin(const QUrl &fileNameURI, const QDateTime &fileModifiedTime, qulonglong discoverId);
 
     void updateTrackOrigin(qulonglong trackId, const QUrl &fileName, const QDateTime &fileModifiedTime);
 
     int computeTrackPriority(qulonglong trackId, const QUrl &fileName);
 
     qulonglong internalInsertTrack(const MusicAudioTrack &oneModifiedTrack, const QHash<QString, QUrl> &covers,
                                    qulonglong originTrackId, TrackFileInsertType insertType);
 
     MusicAudioTrack buildTrackFromDatabaseRecord(const QSqlRecord &trackRecord) const;
 
     TrackDataType buildTrackDataFromDatabaseRecord(const QSqlRecord &trackRecord) const;
 
     void internalRemoveTracksList(const QList<QUrl> &removedTracks);
 
     void internalRemoveTracksList(const QHash<QUrl, QDateTime> &removedTracks, qulonglong sourceId);
 
     void internalRemoveTracksWithoutMapping();
 
     QUrl internalAlbumArtUriFromAlbumId(qulonglong albumId);
 
     bool isValidArtist(qulonglong albumId);
 
     qulonglong insertComposer(const QString &name);
 
     qulonglong insertLyricist(const QString &name);
 
     qulonglong internalSourceIdFromName(const QString &sourceName);
 
     QHash<QUrl, QDateTime> internalAllFileNameFromSource(qulonglong sourceId);
 
     bool internalGenericPartialData(QSqlQuery &query);
 
     ListArtistDataType internalAllArtistsPartialData();
 
     ArtistDataType internalOneArtistPartialData(qulonglong databaseId);
 
     ListAlbumDataType internalAllAlbumsPartialData();
 
     AlbumDataType internalOneAlbumPartialData(qulonglong databaseId);
 
     ListTrackDataType internalAllTracksPartialData();
 
     TrackDataType internalOneTrackPartialData(qulonglong databaseId);
 
     ListGenreDataType internalAllGenresPartialData();
 
     GenreDataType internalOneGenrePartialData(qulonglong databaseId);
 
     ListArtistDataType internalAllComposersPartialData();
 
     ArtistDataType internalOneComposerPartialData(qulonglong databaseId);
 
     ListArtistDataType internalAllLyricistsPartialData();
 
     ArtistDataType internalOneLyricistPartialData(qulonglong databaseId);
 
     bool prepareQuery(QSqlQuery &query, const QString &queryText) const;
 
     void updateAlbumArtist(qulonglong albumId, const QString &title, const QString &albumPath,
                            const QString &artistName);
 
     std::unique_ptr<DatabaseInterfacePrivate> d;
 
 };
 
 Q_DECLARE_METATYPE(DatabaseInterface::TrackDataType)
 Q_DECLARE_METATYPE(DatabaseInterface::AlbumDataType)
 Q_DECLARE_METATYPE(DatabaseInterface::ArtistDataType)
 Q_DECLARE_METATYPE(DatabaseInterface::GenreDataType)
 
 Q_DECLARE_METATYPE(DatabaseInterface::ListTrackDataType)
 Q_DECLARE_METATYPE(DatabaseInterface::ListAlbumDataType)
 Q_DECLARE_METATYPE(DatabaseInterface::ListArtistDataType)
 Q_DECLARE_METATYPE(DatabaseInterface::ListGenreDataType)
 
 #endif // DATABASEINTERFACE_H
diff --git a/src/elisaapplication.cpp b/src/elisaapplication.cpp
index 3ddc1450..b16eae5d 100644
--- a/src/elisaapplication.cpp
+++ b/src/elisaapplication.cpp
@@ -1,551 +1,575 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  * Copyright (C) 2012 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "elisaapplication.h"
 
 #include "musiclistenersmanager.h"
 #include "models/allalbumsproxymodel.h"
 #include "models/alltracksproxymodel.h"
 #include "models/allartistsproxymodel.h"
 #include "models/singleartistproxymodel.h"
 #include "models/singlealbumproxymodel.h"
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
 #include "models/filebrowserproxymodel.h"
 #endif
 
 #include "mediaplaylist.h"
 #include "audiowrapper.h"
 #include "manageaudioplayer.h"
 #include "managemediaplayercontrol.h"
 #include "manageheaderbar.h"
 
 #include "elisa_settings.h"
 #include <KConfigCore/KAuthorized>
 
 #if defined KF5ConfigWidgets_FOUND && KF5ConfigWidgets_FOUND
 #include <KConfigWidgets/KStandardAction>
 #endif
 
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
 #include <KXmlGui/KActionCollection>
 #include <KXmlGui/KAboutApplicationDialog>
 #include <KXmlGui/KHelpMenu>
 #include <KXmlGui/KBugReport>
 #include <KXmlGui/KShortcutsDialog>
 #endif
 
 #if defined KF5KCMUtils_FOUND && KF5KCMUtils_FOUND
 #include <KCMUtils/KCMultiDialog>
 #endif
 
 #include <KCoreAddons/KAboutData>
 
 #include <QCoreApplication>
 #include <QDesktopServices>
 #include <QDialog>
 #include <QPointer>
 #include <QIcon>
 #include <QAction>
 #include <QUrl>
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
 
 #include <memory>
 
 class ElisaApplicationPrivate
 {
 public:
 
     explicit ElisaApplicationPrivate(QObject *parent)
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
-          : mCollection(parent)
-#endif
+        : mCollection(parent)
+    #endif
     {
         Q_UNUSED(parent)
 
         auto configurationFileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
         configurationFileName += QStringLiteral("/elisarc");
         Elisa::ElisaConfiguration::instance(configurationFileName);
         Elisa::ElisaConfiguration::self()->load();
         Elisa::ElisaConfiguration::self()->save();
     }
 
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     KActionCollection mCollection;
 #endif
 
-    QStringList mArguments;
+    ElisaUtils::EntryDataList mArguments;
 
     std::unique_ptr<MusicListenersManager> mMusicManager;
 
     std::unique_ptr<AllAlbumsProxyModel> mAllAlbumsProxyModel;
 
     std::unique_ptr<AllArtistsProxyModel> mAllArtistsProxyModel;
 
     std::unique_ptr<AllTracksProxyModel> mAllTracksProxyModel;
 
     std::unique_ptr<AllArtistsProxyModel> mAllGenresProxyModel;
 
     std::unique_ptr<AllArtistsProxyModel> mAllComposersProxyModel;
 
     std::unique_ptr<AllArtistsProxyModel> mAllLyricistsProxyModel;
 
     std::unique_ptr<SingleArtistProxyModel> mSingleArtistProxyModel;
 
     std::unique_ptr<SingleAlbumProxyModel> mSingleAlbumProxyModel;
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
     std::unique_ptr<FileBrowserProxyModel> mFileBrowserProxyModel;
 #endif
 
     std::unique_ptr<MediaPlayList> mMediaPlayList;
 
     std::unique_ptr<AudioWrapper> mAudioWrapper;
 
     std::unique_ptr<ManageAudioPlayer> mAudioControl;
 
     std::unique_ptr<ManageMediaPlayerControl> mPlayerControl;
 
     std::unique_ptr<ManageHeaderBar> mManageHeaderBar;
 
 };
 
 ElisaApplication::ElisaApplication(QObject *parent) : QObject(parent), d(std::make_unique<ElisaApplicationPrivate>(this))
 {
 }
 
 ElisaApplication::~ElisaApplication()
 = default;
 
 void ElisaApplication::setupActions(const QString &actionName)
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     if (actionName == QStringLiteral("file_quit")) {
         auto quitAction = KStandardAction::quit(QCoreApplication::instance(), &QCoreApplication::quit, &d->mCollection);
         d->mCollection.addAction(actionName, quitAction);
     }
 
     if (actionName == QStringLiteral("help_contents") && KAuthorized::authorizeAction(actionName)) {
         auto handBookAction = KStandardAction::helpContents(this, &ElisaApplication::appHelpActivated, &d->mCollection);
         d->mCollection.addAction(handBookAction->objectName(), handBookAction);
     }
 
     if (actionName == QStringLiteral("help_report_bug") && KAuthorized::authorizeAction(actionName) && !KAboutData::applicationData().bugAddress().isEmpty()) {
         auto reportBugAction = KStandardAction::reportBug(this, &ElisaApplication::reportBug, &d->mCollection);
         d->mCollection.addAction(reportBugAction->objectName(), reportBugAction);
     }
 
     if (actionName == QStringLiteral("help_about_app") && KAuthorized::authorizeAction(actionName)) {
         auto aboutAppAction = KStandardAction::aboutApp(this, &ElisaApplication::aboutApplication, this);
         d->mCollection.addAction(aboutAppAction->objectName(), aboutAppAction);
     }
 
     if (actionName == QStringLiteral("options_configure") && KAuthorized::authorizeAction(actionName)) {
         auto preferencesAction = KStandardAction::preferences(this, &ElisaApplication::configureElisa, this);
         d->mCollection.addAction(preferencesAction->objectName(), preferencesAction);
     }
 
     if (actionName == QStringLiteral("options_configure_keybinding") && KAuthorized::authorizeAction(actionName)) {
         auto keyBindingsAction = KStandardAction::keyBindings(this, &ElisaApplication::configureShortcuts, this);
         d->mCollection.addAction(keyBindingsAction->objectName(), keyBindingsAction);
     }
 
     if (actionName == QStringLiteral("go_back") && KAuthorized::authorizeAction(actionName)) {
         auto goBackAction = KStandardAction::back(this, &ElisaApplication::goBack, this);
         d->mCollection.addAction(goBackAction->objectName(), goBackAction);
     }
 
     if (actionName == QStringLiteral("toggle_playlist") && KAuthorized::authorizeAction(actionName)) {
         auto togglePlaylistAction = d->mCollection.addAction(actionName, this, &ElisaApplication::togglePlaylist);
         togglePlaylistAction->setShortcut(QKeySequence(Qt::Key_F9));
         togglePlaylistAction->setText(QStringLiteral("Toggle Playlist"));
     }
 
     if (actionName == QStringLiteral("edit_find") && KAuthorized::authorizeAction(actionName)) {
         auto findAction = KStandardAction::find(this, &ElisaApplication::find, this);
         d->mCollection.addAction(findAction->objectName(), findAction);
     }
 
     d->mCollection.readSettings();
 #endif
 }
 
-void ElisaApplication::setArguments(const QStringList &newArguments)
+void ElisaApplication::setArguments(const ElisaUtils::EntryDataList &newArguments)
 {
     if (d->mArguments == newArguments) {
         return;
     }
 
     d->mArguments = checkFileListAndMakeAbsolute(newArguments, QDir::currentPath());
     Q_EMIT argumentsChanged();
 
     if (!d->mArguments.isEmpty()) {
-        Q_EMIT enqueue(d->mArguments);
+        Q_EMIT enqueue(d->mArguments, ElisaUtils::FileName,
+                       ElisaUtils::PlayListEnqueueMode::AppendPlayList,
+                       ElisaUtils::PlayListEnqueueTriggerPlay::TriggerPlay);
     }
 }
 
 void ElisaApplication::activateActionRequested(const QString &actionName, const QVariant &parameter)
 {
     Q_UNUSED(actionName)
     Q_UNUSED(parameter)
 }
 
 void ElisaApplication::activateRequested(const QStringList &arguments, const QString &workingDirectory)
 {
-    auto realArguments = arguments;
-    if (realArguments.size() > 1) {
-        realArguments.removeFirst();
-        Q_EMIT enqueue(checkFileListAndMakeAbsolute(realArguments, workingDirectory));
+    if (arguments.size() > 1) {
+        auto realArguments = ElisaUtils::EntryDataList{};
+
+        bool isFirst = true;
+        for (const auto &oneArgument : arguments) {
+            if (isFirst) {
+                isFirst = false;
+                continue;
+            }
+
+            realArguments.push_back({0, oneArgument});
+        }
+
+        Q_EMIT enqueue(checkFileListAndMakeAbsolute(realArguments, workingDirectory),
+                       ElisaUtils::FileName,
+                       ElisaUtils::PlayListEnqueueMode::AppendPlayList,
+                       ElisaUtils::PlayListEnqueueTriggerPlay::TriggerPlay);
     }
 }
 
 void ElisaApplication::openRequested(const QList<QUrl> &uris)
 {
     Q_UNUSED(uris)
 }
 
 void ElisaApplication::appHelpActivated()
 {
     QDesktopServices::openUrl(QUrl(QStringLiteral("help:/")));
 }
 
 void ElisaApplication::aboutApplication()
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     static QPointer<QDialog> dialog;
     if (!dialog) {
         dialog = new KAboutApplicationDialog(KAboutData::applicationData(), nullptr);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
     }
     dialog->show();
 #endif
 }
 
 void ElisaApplication::reportBug()
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     static QPointer<QDialog> dialog;
     if (!dialog) {
         dialog = new KBugReport(KAboutData::applicationData(), nullptr);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
     }
     dialog->show();
 #endif
 }
 
 void ElisaApplication::configureShortcuts()
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     KShortcutsDialog dlg(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, nullptr);
     dlg.setModal(true);
     dlg.addCollection(&d->mCollection);
     dlg.configure();
 #endif
 }
 
 void ElisaApplication::configureElisa()
 {
 #if defined KF5KCMUtils_FOUND && KF5KCMUtils_FOUND
     KCMultiDialog configurationDialog;
 
     configurationDialog.addModule(QStringLiteral("kcm_elisa_local_file"));
     configurationDialog.setModal(true);
     configurationDialog.exec();
 #endif
 }
 
 void ElisaApplication::goBack() {}
 
 void ElisaApplication::find() {}
 
 void ElisaApplication::togglePlaylist() {}
 
-QStringList ElisaApplication::checkFileListAndMakeAbsolute(const QStringList &filesList, const QString &workingDirectory) const
+ElisaUtils::EntryDataList ElisaApplication::checkFileListAndMakeAbsolute(const ElisaUtils::EntryDataList &filesList,
+                                                                            const QString &workingDirectory) const
 {
-    QStringList filesToOpen;
+    auto filesToOpen = ElisaUtils::EntryDataList{};
 
     for (const auto &oneFile : filesList) {
-        auto newFile = QFileInfo(oneFile);
+        auto newFile = QFileInfo(std::get<1>(oneFile));
 
         if (newFile.isRelative()) {
-            newFile = QFileInfo(workingDirectory + QStringLiteral("/") + oneFile);
+            newFile = QFileInfo(workingDirectory + QStringLiteral("/") + std::get<1>(oneFile));
         }
 
         if (newFile.exists()) {
-            filesToOpen.push_back(newFile.canonicalFilePath());
+            filesToOpen.push_back({0, newFile.canonicalFilePath()});
         }
     }
 
     return filesToOpen;
 }
 
 void ElisaApplication::initialize()
 {
     initializeModels();
     initializePlayer();
 
     Q_EMIT initializationDone();
 }
 
 void ElisaApplication::initializeModels()
 {
     d->mMusicManager = std::make_unique<MusicListenersManager>();
     Q_EMIT musicManagerChanged();
     d->mAllAlbumsProxyModel = std::make_unique<AllAlbumsProxyModel>();
     Q_EMIT allAlbumsProxyModelChanged();
     d->mAllArtistsProxyModel = std::make_unique<AllArtistsProxyModel>();
     Q_EMIT allArtistsProxyModelChanged();
     d->mAllGenresProxyModel = std::make_unique<AllArtistsProxyModel>();
     Q_EMIT allGenresProxyModelChanged();
     d->mAllComposersProxyModel = std::make_unique<AllArtistsProxyModel>();
     Q_EMIT allComposersProxyModelChanged();
     d->mAllLyricistsProxyModel = std::make_unique<AllArtistsProxyModel>();
     Q_EMIT allLyricistsProxyModelChanged();
     d->mAllTracksProxyModel = std::make_unique<AllTracksProxyModel>();
     Q_EMIT allTracksProxyModelChanged();
     d->mSingleArtistProxyModel = std::make_unique<SingleArtistProxyModel>();
     Q_EMIT singleArtistProxyModelChanged();
     d->mSingleAlbumProxyModel = std::make_unique<SingleAlbumProxyModel>();
     Q_EMIT singleAlbumProxyModelChanged();
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
     d->mFileBrowserProxyModel = std::make_unique<FileBrowserProxyModel>();
     Q_EMIT fileBrowserProxyModelChanged();
 #endif
 
     d->mMediaPlayList = std::make_unique<MediaPlayList>();
     Q_EMIT mediaPlayListChanged();
 
     d->mMusicManager->setElisaApplication(this);
 
     d->mMediaPlayList->setMusicListenersManager(d->mMusicManager.get());
-    QObject::connect(this, &ElisaApplication::enqueue, d->mMediaPlayList.get(), &MediaPlayList::enqueueAndPlay);
+    QObject::connect(this, &ElisaApplication::enqueue,
+                     d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const ElisaUtils::EntryDataList&,
+                                                                                  ElisaUtils::PlayListEntryType,
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     d->mAllAlbumsProxyModel->setSourceModel(d->mMusicManager->allAlbumsModel());
     d->mAllArtistsProxyModel->setSourceModel(d->mMusicManager->allArtistsModel());
     d->mAllGenresProxyModel->setSourceModel(d->mMusicManager->allGenresModel());
     d->mAllComposersProxyModel->setSourceModel(d->mMusicManager->allComposersModel());
     d->mAllLyricistsProxyModel->setSourceModel(d->mMusicManager->allLyricistsModel());
     d->mAllTracksProxyModel->setSourceModel(d->mMusicManager->allTracksModel());
     d->mSingleArtistProxyModel->setSourceModel(d->mMusicManager->allAlbumsModel());
     d->mSingleAlbumProxyModel->setSourceModel(d->mMusicManager->albumModel());
 
     QObject::connect(d->mAllAlbumsProxyModel.get(), &AllAlbumsProxyModel::albumToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAlbum> &,
-                                                                         ElisaUtils::PlayListEnqueueMode,
-                                                                         ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mAllArtistsProxyModel.get(), &AllArtistsProxyModel::artistToEnqueue,
-                     d->mMediaPlayList.get(), &MediaPlayList::enqueueArtists);
+                     d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const ElisaUtils::EntryDataList&,
+                                                                                  ElisaUtils::PlayListEntryType,
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mAllTracksProxyModel.get(), &AllTracksProxyModel::trackToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAudioTrack> &,
-                                                                         ElisaUtils::PlayListEnqueueMode,
-                                                                         ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mSingleArtistProxyModel.get(), &SingleArtistProxyModel::albumToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAlbum> &,
-                                                                         ElisaUtils::PlayListEnqueueMode,
-                                                                         ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
     QObject::connect(d->mSingleAlbumProxyModel.get(), &SingleAlbumProxyModel::trackToEnqueue,
                      d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAudioTrack> &,
-                                                                         ElisaUtils::PlayListEnqueueMode,
-                                                                         ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
-    QObject::connect(d->mFileBrowserProxyModel.get(), &FileBrowserProxyModel::replaceAndPlayFileByUrl,
-                     d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QUrl &)>(&MediaPlayList::replaceAndPlay));
     QObject::connect(d->mFileBrowserProxyModel.get(), &FileBrowserProxyModel::loadPlayListFromUrl,
                      d->mMediaPlayList.get(), &MediaPlayList::loadPlaylist);
     QObject::connect(d->mFileBrowserProxyModel.get(), &FileBrowserProxyModel::filesToEnqueue,
-                     d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<QUrl> &,
-                                                                         ElisaUtils::PlayListEnqueueMode,
-                                                                         ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
+                     d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const ElisaUtils::EntryDataList &,
+                                                                                  ElisaUtils::PlayListEntryType,
+                                                                                  ElisaUtils::PlayListEnqueueMode,
+                                                                                  ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
 #endif
 }
 
 void ElisaApplication::initializePlayer()
 {
     d->mAudioWrapper = std::make_unique<AudioWrapper>();
     Q_EMIT audioPlayerChanged();
     d->mAudioControl = std::make_unique<ManageAudioPlayer>();
     Q_EMIT audioControlChanged();
     d->mPlayerControl = std::make_unique<ManageMediaPlayerControl>();
     Q_EMIT playerControlChanged();
     d->mManageHeaderBar = std::make_unique<ManageHeaderBar>();
     Q_EMIT manageHeaderBarChanged();
 
     d->mAudioControl->setAlbumNameRole(MediaPlayList::AlbumRole);
     d->mAudioControl->setArtistNameRole(MediaPlayList::ArtistRole);
     d->mAudioControl->setTitleRole(MediaPlayList::TitleRole);
     d->mAudioControl->setUrlRole(MediaPlayList::ResourceRole);
     d->mAudioControl->setIsPlayingRole(MediaPlayList::IsPlayingRole);
     d->mAudioControl->setPlayListModel(d->mMediaPlayList.get());
 
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerPlay, d->mAudioWrapper.get(), &AudioWrapper::play);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerPause, d->mAudioWrapper.get(), &AudioWrapper::pause);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerStop, d->mAudioWrapper.get(), &AudioWrapper::stop);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::seek, d->mAudioWrapper.get(), &AudioWrapper::seek);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::skipNextTrack, d->mMediaPlayList.get(), &MediaPlayList::skipNextTrack);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::sourceInError, d->mMediaPlayList.get(), &MediaPlayList::trackInError);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::sourceInError, d->mMusicManager.get(), &MusicListenersManager::playBackError);
     QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerSourceChanged, d->mAudioWrapper.get(), &AudioWrapper::setSource);
 
     QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::ensurePlay, d->mAudioControl.get(), &ManageAudioPlayer::ensurePlay);
     QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::playListFinished, d->mAudioControl.get(), &ManageAudioPlayer::playListFinished);
     QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mAudioControl.get(), &ManageAudioPlayer::setCurrentTrack);
 
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::playbackStateChanged,
                      d->mAudioControl.get(), &ManageAudioPlayer::setPlayerPlaybackState);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::statusChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerStatus);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::errorChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerError);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::durationChanged, d->mAudioControl.get(), &ManageAudioPlayer::setAudioDuration);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::seekableChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerIsSeekable);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::positionChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerPosition);
 
     d->mPlayerControl->setPlayListModel(d->mMediaPlayList.get());
     QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mPlayerControl.get(), &ManageMediaPlayerControl::setCurrentTrack);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::playing, d->mPlayerControl.get(), &ManageMediaPlayerControl::playerPlaying);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::paused, d->mPlayerControl.get(), &ManageMediaPlayerControl::playerPaused);
     QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::stopped, d->mPlayerControl.get(), &ManageMediaPlayerControl::playerStopped);
 
     d->mManageHeaderBar->setTitleRole(MediaPlayList::TitleRole);
     d->mManageHeaderBar->setAlbumRole(MediaPlayList::AlbumRole);
     d->mManageHeaderBar->setArtistRole(MediaPlayList::ArtistRole);
     d->mManageHeaderBar->setImageRole(MediaPlayList::ImageUrlRole);
     d->mManageHeaderBar->setAlbumIdRole(MediaPlayList::AlbumIdRole);
     d->mManageHeaderBar->setIsValidRole(MediaPlayList::IsValidRole);
     d->mManageHeaderBar->setPlayListModel(d->mMediaPlayList.get());
     QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mManageHeaderBar.get(), &ManageHeaderBar::setCurrentTrack);
 
     if (!d->mArguments.isEmpty()) {
-        Q_EMIT enqueue(d->mArguments);
+        Q_EMIT enqueue(d->mArguments, ElisaUtils::FileName,
+                       ElisaUtils::PlayListEnqueueMode::AppendPlayList,
+                       ElisaUtils::PlayListEnqueueTriggerPlay::TriggerPlay);
     }
 }
 
 QAction * ElisaApplication::action(const QString& name)
 {
 #if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
     auto resultAction = d->mCollection.action(name);
 
     if (!resultAction) {
         setupActions(name);
         resultAction = d->mCollection.action(name);
     }
 
     return resultAction;
 #else
     Q_UNUSED(name);
 
     return new QAction();
 #endif
 }
 
 QString ElisaApplication::iconName(const QIcon& icon)
 {
     return icon.name();
 }
 
-const QStringList &ElisaApplication::arguments() const
+const ElisaUtils::EntryDataList &ElisaApplication::arguments() const
 {
     return d->mArguments;
 }
 
 MusicListenersManager *ElisaApplication::musicManager() const
 {
     return d->mMusicManager.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::allAlbumsProxyModel() const
 {
     return d->mAllAlbumsProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::allArtistsProxyModel() const
 {
     return d->mAllArtistsProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::allGenresProxyModel() const
 {
     return d->mAllGenresProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::allComposersProxyModel() const
 {
     return d->mAllComposersProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::allLyricistsProxyModel() const
 {
     return d->mAllLyricistsProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::allTracksProxyModel() const
 {
     return d->mAllTracksProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::singleArtistProxyModel() const
 {
     return d->mSingleArtistProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::singleAlbumProxyModel() const
 {
     return d->mSingleAlbumProxyModel.get();
 }
 
 QSortFilterProxyModel *ElisaApplication::fileBrowserProxyModel() const
 {
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
     return d->mFileBrowserProxyModel.get();
 #else
     return nullptr;
 #endif
 }
 
 MediaPlayList *ElisaApplication::mediaPlayList() const
 {
     return d->mMediaPlayList.get();
 }
 
 AudioWrapper *ElisaApplication::audioPlayer() const
 {
     return d->mAudioWrapper.get();
 }
 
 ManageAudioPlayer *ElisaApplication::audioControl() const
 {
     return d->mAudioControl.get();
 }
 
 ManageMediaPlayerControl *ElisaApplication::playerControl() const
 {
     return d->mPlayerControl.get();
 }
 
 ManageHeaderBar *ElisaApplication::manageHeaderBar() const
 {
     return d->mManageHeaderBar.get();
 }
 
 #include "moc_elisaapplication.cpp"
diff --git a/src/elisaapplication.h b/src/elisaapplication.h
index b0c6e62f..c1fc1a33 100644
--- a/src/elisaapplication.h
+++ b/src/elisaapplication.h
@@ -1,234 +1,240 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef ELISAAPPLICATION_H
 #define ELISAAPPLICATION_H
 
 #include "elisaLib_export.h"
 
 #include "config-upnp-qt.h"
 
+#include "elisautils.h"
+
 #include <QObject>
 #include <QString>
 
 #include <memory>
 
 class QIcon;
 class QAction;
 class MusicListenersManager;
 class QSortFilterProxyModel;
 class MediaPlayList;
 class AudioWrapper;
 class ManageAudioPlayer;
 class ManageMediaPlayerControl;
 class ManageHeaderBar;
 class ElisaApplicationPrivate;
 
 class ELISALIB_EXPORT ElisaApplication : public QObject
 {
 
     Q_OBJECT
 
-    Q_PROPERTY(QStringList arguments
+    Q_PROPERTY(ElisaUtils::EntryDataList arguments
                READ arguments
                WRITE setArguments
                NOTIFY argumentsChanged)
 
     Q_PROPERTY(MusicListenersManager *musicManager
                READ musicManager
                NOTIFY musicManagerChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* allAlbumsProxyModel
                READ allAlbumsProxyModel
                NOTIFY allAlbumsProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* allArtistsProxyModel
                READ allArtistsProxyModel
                NOTIFY allArtistsProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* allTracksProxyModel
                READ allTracksProxyModel
                NOTIFY allTracksProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* allGenresProxyModel
                READ allGenresProxyModel
                NOTIFY allGenresProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* allComposersProxyModel
                READ allComposersProxyModel
                NOTIFY allComposersProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* allLyricistsProxyModel
                READ allLyricistsProxyModel
                NOTIFY allLyricistsProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* singleArtistProxyModel
                READ singleArtistProxyModel
                NOTIFY singleArtistProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* singleAlbumProxyModel
                READ singleAlbumProxyModel
                NOTIFY singleAlbumProxyModelChanged)
 
     Q_PROPERTY(QSortFilterProxyModel* fileBrowserProxyModel
                READ fileBrowserProxyModel
                NOTIFY fileBrowserProxyModelChanged)
 
     Q_PROPERTY(MediaPlayList *mediaPlayList
                READ mediaPlayList
                NOTIFY mediaPlayListChanged)
 
     Q_PROPERTY(AudioWrapper *audioPlayer
                READ audioPlayer
                NOTIFY audioPlayerChanged)
 
     Q_PROPERTY(ManageAudioPlayer *audioControl
                READ audioControl
                NOTIFY audioControlChanged)
 
     Q_PROPERTY(ManageMediaPlayerControl *playerControl
                READ playerControl
                NOTIFY playerControlChanged)
 
     Q_PROPERTY(ManageHeaderBar *manageHeaderBar
                READ manageHeaderBar
                NOTIFY manageHeaderBarChanged)
 
 public:
     explicit ElisaApplication(QObject *parent = nullptr);
 
     ~ElisaApplication() override;
 
     Q_INVOKABLE QAction* action(const QString& name);
 
     Q_INVOKABLE QString iconName(const QIcon& icon);
 
-    const QStringList &arguments() const;
+    const ElisaUtils::EntryDataList &arguments() const;
 
     MusicListenersManager *musicManager() const;
 
     QSortFilterProxyModel *allAlbumsProxyModel() const;
 
     QSortFilterProxyModel *allArtistsProxyModel() const;
 
     QSortFilterProxyModel *allGenresProxyModel() const;
 
     QSortFilterProxyModel *allComposersProxyModel() const;
 
     QSortFilterProxyModel *allLyricistsProxyModel() const;
 
     QSortFilterProxyModel *allTracksProxyModel() const;
 
     QSortFilterProxyModel *singleArtistProxyModel() const;
 
     QSortFilterProxyModel *singleAlbumProxyModel() const;
 
     QSortFilterProxyModel *fileBrowserProxyModel() const;
 
     MediaPlayList *mediaPlayList() const;
 
     AudioWrapper *audioPlayer() const;
 
     ManageAudioPlayer *audioControl() const;
 
     ManageMediaPlayerControl *playerControl() const;
 
     ManageHeaderBar *manageHeaderBar() const;
 
 Q_SIGNALS:
 
     void argumentsChanged();
 
     void musicManagerChanged();
 
     void allAlbumsProxyModelChanged();
 
     void allArtistsProxyModelChanged();
 
     void allGenresProxyModelChanged();
 
     void allComposersProxyModelChanged();
 
     void allLyricistsProxyModelChanged();
 
     void allTracksProxyModelChanged();
 
     void singleArtistProxyModelChanged();
 
     void singleAlbumProxyModelChanged();
 
     void fileBrowserProxyModelChanged();
 
     void mediaPlayListChanged();
 
     void audioPlayerChanged();
 
     void audioControlChanged();
 
     void playerControlChanged();
 
     void manageHeaderBarChanged();
 
-    void enqueue(const QStringList &files);
+    void enqueue(const ElisaUtils::EntryDataList &newEntries,
+                 ElisaUtils::PlayListEntryType databaseIdType,
+                 ElisaUtils::PlayListEnqueueMode enqueueMode,
+                 ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
     void initializationDone();
 
 public Q_SLOTS:
 
     void appHelpActivated();
 
     void aboutApplication();
 
     void reportBug();
 
     void configureShortcuts();
 
     void configureElisa();
 
-    void setArguments(const QStringList &newArguments);
+    void setArguments(const ElisaUtils::EntryDataList &newArguments);
 
     void activateActionRequested(const QString &actionName, const QVariant &parameter);
 
     void activateRequested(const QStringList &arguments, const QString &workingDirectory);
 
     void openRequested(const QList< QUrl > &uris);
 
     void initialize();
 
 private Q_SLOTS:
 
     void goBack();
 
     void find();
 
     void togglePlaylist();
 
 private:
 
     void initializeModels();
 
     void initializePlayer();
 
     void setupActions(const QString &actionName);
 
-    QStringList checkFileListAndMakeAbsolute(const QStringList &filesList, const QString &workingDirectory) const;
+    ElisaUtils::EntryDataList checkFileListAndMakeAbsolute(const ElisaUtils::EntryDataList &filesList,
+                                                              const QString &workingDirectory) const;
 
     std::unique_ptr<ElisaApplicationPrivate> d;
 
 };
 
 #endif // ELISAAPPLICATION_H
diff --git a/src/elisaqmlplugin.cpp b/src/elisaqmlplugin.cpp
index 6745d734..c9647600 100644
--- a/src/elisaqmlplugin.cpp
+++ b/src/elisaqmlplugin.cpp
@@ -1,169 +1,174 @@
 /*
  * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "elisaqmlplugin.h"
 
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
 #include "upnp/upnpcontrolconnectionmanager.h"
 #include "upnp/upnpcontrolmediaserver.h"
 #include "upnp/upnpcontrolcontentdirectory.h"
 #include "upnp/upnpcontentdirectorymodel.h"
 #include "upnpdevicedescription.h"
 #include "upnp/didlparser.h"
 #include "upnp/upnpdiscoverallmusic.h"
 
 #include "upnpssdpengine.h"
 #include "upnpabstractservice.h"
 #include "upnpcontrolabstractdevice.h"
 #include "upnpcontrolabstractservice.h"
 #include "upnpbasictypes.h"
 #endif
 
+#include "elisautils.h"
 #include "elisaapplication.h"
 #include "progressindicator.h"
 #include "mediaplaylist.h"
 #include "managemediaplayercontrol.h"
 #include "manageheaderbar.h"
 #include "manageaudioplayer.h"
 #include "musicaudiotrack.h"
 #include "musicaudiogenre.h"
 #include "musiclistenersmanager.h"
 #include "models/allalbumsmodel.h"
 #include "models/albummodel.h"
 #include "models/allartistsmodel.h"
 #include "models/alltracksmodel.h"
 #include "models/allalbumsproxymodel.h"
 #include "models/alltracksproxymodel.h"
 #include "models/allartistsproxymodel.h"
 #include "models/singleartistproxymodel.h"
 #include "models/singlealbumproxymodel.h"
 #include "models/genericdatamodel.h"
 #include "embeddedcoverageimageprovider.h"
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
 #include "models/filebrowserproxymodel.h"
 #endif
 
 #include "audiowrapper.h"
 #include "notificationitem.h"
 #include "topnotificationmanager.h"
 #include "trackdatahelper.h"
 #include "elisautils.h"
 #include "datatype.h"
 
 #if defined Qt5DBus_FOUND && Qt5DBus_FOUND
 #include "mpris2/mpris2.h"
 #include "mpris2/mediaplayer2player.h"
 #endif
 
 #include <QSortFilterProxyModel>
 
 #include <QAction>
 #include <QStandardPaths>
 
 #include <QQmlExtensionPlugin>
 #include <QQmlEngine>
 #include <QQmlContext>
 
 void ElisaQmlTestPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     QQmlExtensionPlugin::initializeEngine(engine, uri);
     engine->addImageProvider(QStringLiteral("cover"), new EmbeddedCoverageImageProvider);
 }
 
 void ElisaQmlTestPlugin::registerTypes(const char *uri)
 {
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
     qmlRegisterType<UpnpSsdpEngine>(uri, 1, 0, "UpnpSsdpEngine");
     qmlRegisterType<UpnpDiscoverAllMusic>(uri, 1, 0, "UpnpDiscoverAllMusic");
 
     qmlRegisterType<UpnpAbstractDevice>(uri, 1, 0, "UpnpAbstractDevice");
     qmlRegisterType<UpnpAbstractService>(uri, 1, 0, "UpnpAbstractService");
     qmlRegisterType<UpnpControlAbstractDevice>(uri, 1, 0, "UpnpControlAbstractDevice");
     qmlRegisterType<UpnpControlAbstractService>(uri, 1, 0, "UpnpControlAbstractService");
     qmlRegisterType<UpnpControlConnectionManager>(uri, 1, 0, "UpnpControlConnectionManager");
     qmlRegisterType<UpnpControlMediaServer>(uri, 1, 0, "UpnpControlMediaServer");
     qmlRegisterType<UpnpContentDirectoryModel>(uri, 1, 0, "UpnpContentDirectoryModel");
     qmlRegisterType<DidlParser>(uri, 1, 0, "DidlParser");
     qmlRegisterType<UpnpControlContentDirectory>(uri, 1, 0, "UpnpControlContentDirectory");
     qmlRegisterType<UpnpDeviceDescription>(uri, 1, 0, "UpnpDeviceDescription");
 
     qRegisterMetaType<A_ARG_TYPE_InstanceID>();
     qRegisterMetaType<QPointer<UpnpAbstractDevice> >();
     qRegisterMetaType<UpnpControlConnectionManager*>();
     qRegisterMetaType<UpnpContentDirectoryModel*>();
     qRegisterMetaType<UpnpDeviceDescription*>();
 #endif
     qRegisterMetaType<DataUtils::DataType>("DataUtils::DataType");
 
     qmlRegisterType<MediaPlayList>(uri, 1, 0, "MediaPlayList");
     qmlRegisterType<ManageMediaPlayerControl>(uri, 1, 0, "ManageMediaPlayerControl");
     qmlRegisterType<ManageHeaderBar>(uri, 1, 0, "ManageHeaderBar");
     qmlRegisterType<ManageAudioPlayer>(uri, 1, 0, "ManageAudioPlayer");
     qmlRegisterType<ProgressIndicator>(uri, 1, 0, "ProgressIndicator");
     qmlRegisterType<MusicListenersManager>(uri, 1, 0, "MusicListenersManager");
     qmlRegisterType<AllAlbumsProxyModel>(uri, 1, 0, "AllAlbumsProxyModel");
     qmlRegisterType<AllArtistsProxyModel>(uri, 1, 0, "AllArtistsProxyModel");
     qmlRegisterType<AllTracksProxyModel>(uri, 1, 0, "AllTracksProxyModel");
     qmlRegisterType<SingleAlbumProxyModel>(uri, 1, 0, "SingleAlbumProxyModel");
     qmlRegisterType<SingleArtistProxyModel>(uri, 1, 0, "SingleArtistProxyModel");
     qmlRegisterType<GenericDataModel>(uri, 1, 0, "GenericDataModel");
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
     qmlRegisterType<FileBrowserProxyModel>(uri, 1, 0, "FileBrowserProxyModel");
 #endif
 
     qmlRegisterType<AudioWrapper>(uri, 1, 0, "AudioWrapper");
     qmlRegisterType<TopNotificationManager>(uri, 1, 0, "TopNotificationManager");
     qmlRegisterType<TrackDataHelper>(uri, 1, 0, "TrackDataHelper");
     qmlRegisterUncreatableMetaObject(DataUtils::staticMetaObject, uri, 1, 0, "DataUtils", QStringLiteral("Only enums"));
 
 #if defined Qt5DBus_FOUND && Qt5DBus_FOUND
     qmlRegisterType<Mpris2>(uri, 1, 0, "Mpris2");
     qRegisterMetaType<MediaPlayer2Player*>();
 #endif
 
     qRegisterMetaType<AbstractMediaProxyModel*>();
     qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
     qRegisterMetaType<QHash<QUrl,QDateTime>>("QHash<QUrl,QDateTime>");
     qRegisterMetaType<QList<MusicAudioTrack>>("QList<MusicAudioTrack>");
     qRegisterMetaType<QList<MusicAudioTrack>>("QVector<MusicAudioTrack>");
     qRegisterMetaType<QList<MusicAlbum>>("QList<MusicAlbum>");
     qRegisterMetaType<QList<MusicAudioGenre>>("QList<MusicAudioGenre>");
     qRegisterMetaType<QVector<qulonglong>>("QVector<qulonglong>");
     qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
     qRegisterMetaType<MusicAlbum>("MusicAlbum");
     qRegisterMetaType<DatabaseInterface::ListTrackDataType>("ListTrackDataType");
     qRegisterMetaType<DatabaseInterface::ListAlbumDataType>("ListAlbumDataType");
     qRegisterMetaType<DatabaseInterface::ListArtistDataType>("ListArtistDataType");
     qRegisterMetaType<DatabaseInterface::ListGenreDataType>("ListGenreDataType");
     qRegisterMetaType<QMap<QString, int>>();
     qRegisterMetaType<QAction*>();
     qRegisterMetaType<QSortFilterProxyModel*>();
     qRegisterMetaType<NotificationItem>("NotificationItem");
     qRegisterMetaType<QMap<QString,int>>("QMap<QString,int>");
-    qRegisterMetaType<ElisaUtils::PlayListEnqueueMode>("ElisaUtils::PlayListEnqueueMode");
-    qRegisterMetaType<ElisaUtils::PlayListEnqueueTriggerPlay>("ElisaUtils::PlayListEnqueueTriggerPlay");
+    qRegisterMetaType<ElisaUtils::PlayListEnqueueMode>("PlayListEnqueueMode");
+    qRegisterMetaType<ElisaUtils::PlayListEnqueueTriggerPlay>("PlayListEnqueueTriggerPlay");
+    qRegisterMetaType<ElisaUtils::PlayListEntryType>("PlayListEntryType");
+    qRegisterMetaType<ElisaUtils::EntryData>("EntryData");
+    qRegisterMetaType<ElisaUtils::EntryDataList>("EntryDataList");
     qRegisterMetaType<DatabaseInterface::TrackDataType>("TrackDataType");
     qRegisterMetaType<DatabaseInterface::AlbumDataType>("AlbumDataType");
     qRegisterMetaType<DatabaseInterface::ArtistDataType>("ArtistDataType");
     qRegisterMetaType<DatabaseInterface::GenreDataType>("GenreDataType");
 
     qRegisterMetaTypeStreamOperators<ManageMediaPlayerControl::PlayerState>("PlayListControler::PlayerState");
 
     qmlRegisterUncreatableType<ElisaApplication>(uri, 1, 0, "ElisaApplication", QStringLiteral("only one and done in c++"));
+    qmlRegisterUncreatableMetaObject(ElisaUtils::staticMetaObject, uri, 1, 0, "ElisaUtils", QStringLiteral("Namespace ElisaUtils"));
 }
diff --git a/src/elisautils.h b/src/elisautils.h
index ad0572e1..e7b915e5 100644
--- a/src/elisautils.h
+++ b/src/elisautils.h
@@ -1,58 +1,67 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef ELISAUTILS_H
 #define ELISAUTILS_H
 
 #include "elisaLib_export.h"
 
+#include <QList>
+#include <QString>
 #include <QMetaObject>
+#include <QMetaType>
 
 namespace ElisaUtils {
 
 Q_NAMESPACE
 
 enum PlayListEnqueueMode {
     AppendPlayList,
     ReplacePlayList,
 };
 
 Q_ENUM_NS(PlayListEnqueueMode)
 
 enum PlayListEnqueueTriggerPlay {
     DoNotTriggerPlay,
     TriggerPlay,
 };
 
 Q_ENUM_NS(PlayListEnqueueTriggerPlay)
 
 using EntryData = std::tuple<qulonglong, QString>;
+using EntryDataList = QList<EntryData>;
 
 enum PlayListEntryType {
     Album,
     Artist,
     Genre,
+    Lyricist,
+    Composer,
     Track,
     FileName,
     Unknown,
 };
 
 Q_ENUM_NS(PlayListEntryType)
 
 }
 
+Q_DECLARE_METATYPE(ElisaUtils::EntryData)
+Q_DECLARE_METATYPE(ElisaUtils::EntryDataList)
+
 #endif // ELISAUTILS_H
diff --git a/src/main.cpp b/src/main.cpp
index 9e85533c..f3bf6a78 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,157 +1,164 @@
 /*
  * Copyright 2015-2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "config-upnp-qt.h"
 
 #include "elisaapplication.h"
 #include "elisa_settings.h"
 
 //#define QT_QML_DEBUG
 
 #if defined KF5Declarative_FOUND && KF5Declarative_FOUND
 #include <KDeclarative/KDeclarative>
 #endif
 
 #include <KI18n/KLocalizedString>
 #include <KI18n/KLocalizedContext>
 
 #include <KCoreAddons/KAboutData>
 
 #if defined KF5Crash_FOUND && KF5Crash_FOUND
 #include <KCrash>
 #endif
 
 #if defined KF5DBusAddons_FOUND && KF5DBusAddons_FOUND
 #include <KDBusService>
 #endif
 
 #include <QSortFilterProxyModel>
 
 #include <QIcon>
 
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QtGlobal>
 #include <QStandardPaths>
 
 #include <QQmlApplicationEngine>
 #include <QQmlEngine>
 #include <QQmlFileSelector>
 #include <QQmlDebuggingEnabler>
 #include <QQmlContext>
 #include <QQuickStyle>
 #include <QScreen>
 
 #include <memory>
 
 #if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
 #include <QAndroidJniObject>
 #include <QtAndroid>
 #endif
 
 #if defined Q_OS_ANDROID
 int __attribute__((visibility("default"))) main(int argc, char *argv[])
 #else
 int main(int argc, char *argv[])
 #endif
 {
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 
     qputenv("QT_GSTREAMER_USE_PLAYBIN_VOLUME", "true");
 
     QApplication app(argc, argv);
 
 #if defined KF5Crash_FOUND && KF5Crash_FOUND
     KCrash::initialize();
 #endif
 
     QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("elisa")));
 
     KLocalizedString::setApplicationDomain("elisa");
 
     KAboutData aboutData( QStringLiteral("elisa"),
                           i18n("Elisa"),
                           QStringLiteral("0.3.80"),
                           i18n("A Simple Music Player written with KDE Frameworks"),
                           KAboutLicense::LGPL_V3,
                           i18n("(c) 2015-2018, Elisa contributors"));
 
     aboutData.addAuthor(QStringLiteral("Matthieu Gallien"),i18n("Creator"), QStringLiteral("mgallien@mgallien.fr"));
     aboutData.addAuthor(QStringLiteral("Alexander Stippich"), i18n("Author"), QStringLiteral("a.stippich@gmx.net"));
 
     aboutData.addCredit(QStringLiteral("Andrew Lake"), i18n("Concept and design work"), QStringLiteral("jamboarder@gmail.com"));
     aboutData.addCredit(QStringLiteral("Luigi Toscano"), i18n("Localization support"), QStringLiteral("luigi.toscano@tiscali.it"));
     aboutData.addCredit(QStringLiteral("Safa Alfulaij"), i18n("Right to left support in interface"), QStringLiteral("safa1996alfulaij@gmail.com"));
     aboutData.addCredit(QStringLiteral("Diego Gangl"), i18n("Various improvements to the interface"), QStringLiteral("diego@sinestesia.co"));
 
     KAboutData::setApplicationData(aboutData);
 
     KLocalizedString::setApplicationDomain("elisa");
 
     QCommandLineParser parser;
     parser.addHelpOption();
     parser.addVersionOption();
     aboutData.setupCommandLine(&parser);
     parser.process(app);
     aboutData.processCommandLine(&parser);
 
 #if defined Qt5AndroidExtras_FOUND && Qt5AndroidExtras_FOUND
     qDebug() << QCoreApplication::arguments();
 
     QAndroidJniObject::callStaticMethod<void>("com/kde/elisa/ElisaService",
                                               "startMyService",
                                               "(Landroid/content/Context;)V",
                                               QtAndroid::androidContext().object());
 #endif
 
     QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
     QQuickStyle::setFallbackStyle(QStringLiteral("Fusion"));
 
     QQmlApplicationEngine engine;
     engine.addImportPath(QStringLiteral("qrc:/imports"));
     QQmlFileSelector selector(&engine);
 
 #if defined KF5Declarative_FOUND && KF5Declarative_FOUND
     KDeclarative::KDeclarative decl;
     decl.setDeclarativeEngine(&engine);
     decl.setupEngine(&engine);
     decl.setupContext();
 #endif
 
     engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
     engine.rootContext()->setContextProperty(QStringLiteral("logicalDpi"), QGuiApplication::primaryScreen()->logicalDotsPerInch());
 
 #if defined KF5DBusAddons_FOUND && KF5DBusAddons_FOUND
     KDBusService elisaService(KDBusService::Unique);
 #endif
 
     std::unique_ptr<ElisaApplication> myApp = std::make_unique<ElisaApplication>();
 
 #if defined KF5DBusAddons_FOUND && KF5DBusAddons_FOUND
     QObject::connect(&elisaService, &KDBusService::activateActionRequested, myApp.get(), &ElisaApplication::activateActionRequested);
     QObject::connect(&elisaService, &KDBusService::activateRequested, myApp.get(), &ElisaApplication::activateRequested);
     QObject::connect(&elisaService, &KDBusService::openRequested, myApp.get(), &ElisaApplication::openRequested);
 #endif
 
-    myApp->setArguments(parser.positionalArguments());
+    auto arguments = ElisaUtils::EntryDataList{};
+    auto realArgumentsList = parser.positionalArguments();
+
+    for (auto oneArgument : realArgumentsList) {
+        arguments.push_back({0, oneArgument});
+    }
+
+    myApp->setArguments(arguments);
 
     engine.rootContext()->setContextProperty(QStringLiteral("elisa"), myApp.release());
 
     engine.load(QUrl(QStringLiteral("qrc:/qml/ElisaMainWindow.qml")));
 
     return app.exec();
 }
diff --git a/src/mediaplaylist.cpp b/src/mediaplaylist.cpp
index 51554cd6..419e4177 100644
--- a/src/mediaplaylist.cpp
+++ b/src/mediaplaylist.cpp
@@ -1,1313 +1,1297 @@
 /*
  * Copyright 2015-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "mediaplaylist.h"
 #include "databaseinterface.h"
 #include "musicaudiotrack.h"
 #include "musiclistenersmanager.h"
 
 #include <QUrl>
 #include <QPersistentModelIndex>
 #include <QList>
 #include <QMediaPlaylist>
 #include <QFileInfo>
 #include <QDebug>
 
 #include <algorithm>
 
 class MediaPlayListPrivate
 {
 public:
 
     QList<MediaPlayListEntry> mData;
 
     QList<DatabaseInterface::TrackDataType> mTrackData;
 
     MusicListenersManager* mMusicListenersManager = nullptr;
 
     QPersistentModelIndex mCurrentTrack;
 
     QVariantMap mPersistentState;
 
     QMediaPlaylist mLoadPlaylist;
 
     int mCurrentPlayListPosition = 0;
 
     bool mRandomPlay = false;
 
     bool mRepeatPlay = false;
 
 };
 
 MediaPlayList::MediaPlayList(QObject *parent) : QAbstractListModel(parent), d(new MediaPlayListPrivate)
 {
     connect(&d->mLoadPlaylist, &QMediaPlaylist::loaded, this, &MediaPlayList::loadPlayListLoaded);
     connect(&d->mLoadPlaylist, &QMediaPlaylist::loadFailed, this, &MediaPlayList::loadPlayListLoadFailed);
 
     auto currentMsecTime = QTime::currentTime().msec();
 
     if (currentMsecTime != -1) {
         seedRandomGenerator(static_cast<unsigned int>(currentMsecTime));
     }
 }
 
 MediaPlayList::~MediaPlayList()
 = default;
 
 int MediaPlayList::rowCount(const QModelIndex &parent) const
 {
     if (parent.isValid()) {
         return 0;
     }
 
     return d->mData.size();
 }
 
 QHash<int, QByteArray> MediaPlayList::roleNames() const
 {
     auto roles = QAbstractItemModel::roleNames();
 
     roles[static_cast<int>(ColumnsRoles::IsValidRole)] = "isValid";
     roles[static_cast<int>(ColumnsRoles::TitleRole)] = "title";
     roles[static_cast<int>(ColumnsRoles::DurationRole)] = "duration";
     roles[static_cast<int>(ColumnsRoles::ArtistRole)] = "artist";
     roles[static_cast<int>(ColumnsRoles::AlbumArtistRole)] = "albumArtist";
     roles[static_cast<int>(ColumnsRoles::AlbumRole)] = "album";
     roles[static_cast<int>(ColumnsRoles::TrackNumberRole)] = "trackNumber";
     roles[static_cast<int>(ColumnsRoles::DiscNumberRole)] = "discNumber";
     roles[static_cast<int>(ColumnsRoles::RatingRole)] = "rating";
     roles[static_cast<int>(ColumnsRoles::GenreRole)] = "genre";
     roles[static_cast<int>(ColumnsRoles::LyricistRole)] = "lyricist";
     roles[static_cast<int>(ColumnsRoles::ComposerRole)] = "composer";
     roles[static_cast<int>(ColumnsRoles::CommentRole)] = "comment";
     roles[static_cast<int>(ColumnsRoles::YearRole)] = "year";
     roles[static_cast<int>(ColumnsRoles::ChannelsRole)] = "channels";
     roles[static_cast<int>(ColumnsRoles::BitRateRole)] = "bitRate";
     roles[static_cast<int>(ColumnsRoles::SampleRateRole)] = "sampleRate";
     roles[static_cast<int>(ColumnsRoles::CountRole)] = "count";
     roles[static_cast<int>(ColumnsRoles::IsPlayingRole)] = "isPlaying";
     roles[static_cast<int>(ColumnsRoles::HasAlbumHeader)] = "hasAlbumHeader";
     roles[static_cast<int>(ColumnsRoles::IsSingleDiscAlbumRole)] = "isSingleDiscAlbum";
     roles[static_cast<int>(ColumnsRoles::SecondaryTextRole)] = "secondaryText";
     roles[static_cast<int>(ColumnsRoles::ImageUrlRole)] = "imageUrl";
     roles[static_cast<int>(ColumnsRoles::ShadowForImageRole)] = "shadowForImage";
     roles[static_cast<int>(ColumnsRoles::ResourceRole)] = "trackResource";
     roles[static_cast<int>(ColumnsRoles::TrackDataRole)] = "trackData";
     roles[static_cast<int>(ColumnsRoles::AlbumIdRole)] = "albumId";
 
     return roles;
 }
 
 QVariant MediaPlayList::data(const QModelIndex &index, int role) const
 {
     auto result = QVariant();
 
     if (!index.isValid()) {
         return result;
     }
 
     if (index.row() < 0 || index.row() >= d->mData.size()) {
         return result;
     }
 
     if (d->mData[index.row()].mIsValid) {
         switch(role)
         {
         case ColumnsRoles::IsValidRole:
             result = d->mData[index.row()].mIsValid;
             break;
         case ColumnsRoles::HasAlbumHeader:
             result = rowHasHeader(index.row());
             break;
         case ColumnsRoles::IsPlayingRole:
             result = d->mData[index.row()].mIsPlaying;
             break;
         default:
             result = d->mTrackData[index.row()][static_cast<TrackDataType::key_type>(role)];
         }
     } else {
         switch(role)
         {
         case ColumnsRoles::IsValidRole:
             result = d->mData[index.row()].mIsValid;
             break;
         case ColumnsRoles::TitleRole:
             result = d->mData[index.row()].mTitle;
             break;
         case ColumnsRoles::IsPlayingRole:
             result = d->mData[index.row()].mIsPlaying;
             break;
         case ColumnsRoles::ArtistRole:
             result = d->mData[index.row()].mArtist;
             break;
         case ColumnsRoles::AlbumArtistRole:
             result = d->mData[index.row()].mArtist;
             break;
         case ColumnsRoles::AlbumRole:
             result = d->mData[index.row()].mAlbum;
             break;
         case ColumnsRoles::TrackNumberRole:
             result = -1;
             break;
         case ColumnsRoles::HasAlbumHeader:
             result = rowHasHeader(index.row());
             break;
         case ColumnsRoles::IsSingleDiscAlbumRole:
             result = false;
             break;
         case Qt::DisplayRole:
             result = d->mData[index.row()].mTitle;
             break;
         case ColumnsRoles::ImageUrlRole:
             result = QUrl(QStringLiteral("image://icon/error"));
             break;
         case ColumnsRoles::ShadowForImageRole:
             result = false;
             break;
         default:
             result = {};
         }
     }
 
     return result;
 }
 
 bool MediaPlayList::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     bool modelModified = false;
 
     if (!index.isValid()) {
         return modelModified;
     }
 
     if (index.row() < 0 || index.row() >= d->mData.size()) {
         return modelModified;
     }
 
     if (role < ColumnsRoles::IsValidRole || role > ColumnsRoles::HasAlbumHeader) {
         return modelModified;
     }
 
     auto convertedRole = static_cast<ColumnsRoles>(role);
 
     switch(convertedRole)
     {
     case ColumnsRoles::IsPlayingRole:
     {
         modelModified = true;
         auto newState = static_cast<PlayState>(value.toInt());
         d->mData[index.row()].mIsPlaying = newState;
         Q_EMIT dataChanged(index, index, {role});
 
         if (!d->mCurrentTrack.isValid()) {
             resetCurrentTrack();
         }
 
         break;
     }
     default:
         modelModified = false;
     }
 
     return modelModified;
 }
 
 bool MediaPlayList::removeRows(int row, int count, const QModelIndex &parent)
 {
     beginRemoveRows(parent, row, row + count - 1);
 
     bool hadAlbumHeader = false;
 
     if (rowCount() > row + count) {
         hadAlbumHeader = rowHasHeader(row + count);
     }
 
     for (int i = row, cpt = 0; cpt < count; ++i, ++cpt) {
         d->mData.removeAt(i);
         d->mTrackData.removeAt(i);
     }
     endRemoveRows();
 
     if (!d->mCurrentTrack.isValid()) {
         d->mCurrentTrack = index(d->mCurrentPlayListPosition, 0);
 
         if (d->mCurrentTrack.isValid()) {
             notifyCurrentTrackChanged();
         }
 
         if (!d->mCurrentTrack.isValid()) {
             Q_EMIT playListFinished();
             resetCurrentTrack();
             if (!d->mCurrentTrack.isValid()) {
                 notifyCurrentTrackChanged();
             }
         }
     }
 
     if (!d->mCurrentTrack.isValid() && rowCount(parent) <= row) {
         resetCurrentTrack();
     }
 
     Q_EMIT tracksCountChanged();
 
     if (hadAlbumHeader != rowHasHeader(row)) {
         Q_EMIT dataChanged(index(row, 0), index(row, 0), {ColumnsRoles::HasAlbumHeader});
 
         if (!d->mCurrentTrack.isValid()) {
             resetCurrentTrack();
         }
     }
 
     Q_EMIT persistentStateChanged();
 
     return false;
 }
 
 bool MediaPlayList::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild)
 {
     if (sourceParent != destinationParent) {
         return false;
     }
 
     if (!beginMoveRows(sourceParent, sourceRow, sourceRow + count - 1, destinationParent, destinationChild)) {
         return false;
     }
 
     auto firstMovedTrackHasHeader = rowHasHeader(sourceRow);
     auto nextTrackHasHeader = rowHasHeader(sourceRow + count);
     auto futureNextTrackHasHeader = rowHasHeader(destinationChild);
     if (sourceRow < destinationChild) {
         nextTrackHasHeader = rowHasHeader(sourceRow + count);
     }
 
     for (auto cptItem = 0; cptItem < count; ++cptItem) {
         if (sourceRow < destinationChild) {
             d->mData.move(sourceRow, destinationChild - 1);
             d->mTrackData.move(sourceRow, destinationChild - 1);
         } else {
             d->mData.move(sourceRow, destinationChild);
             d->mTrackData.move(sourceRow, destinationChild);
         }
     }
 
     endMoveRows();
 
     if (sourceRow < destinationChild) {
         if (firstMovedTrackHasHeader != rowHasHeader(destinationChild - count)) {
             Q_EMIT dataChanged(index(destinationChild - count, 0), index(destinationChild - count, 0), {ColumnsRoles::HasAlbumHeader});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
         }
     } else {
         if (firstMovedTrackHasHeader != rowHasHeader(destinationChild)) {
             Q_EMIT dataChanged(index(destinationChild, 0), index(destinationChild, 0), {ColumnsRoles::HasAlbumHeader});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
         }
     }
 
     if (sourceRow < destinationChild) {
         if (nextTrackHasHeader != rowHasHeader(sourceRow)) {
             Q_EMIT dataChanged(index(sourceRow, 0), index(sourceRow, 0), {ColumnsRoles::HasAlbumHeader});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
         }
     } else {
         if (nextTrackHasHeader != rowHasHeader(sourceRow + count)) {
             Q_EMIT dataChanged(index(sourceRow + count, 0), index(sourceRow + count, 0), {ColumnsRoles::HasAlbumHeader});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
         }
     }
 
     if (sourceRow < destinationChild) {
         if (futureNextTrackHasHeader != rowHasHeader(destinationChild + count - 1)) {
             Q_EMIT dataChanged(index(destinationChild + count - 1, 0), index(destinationChild + count - 1, 0), {ColumnsRoles::HasAlbumHeader});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
         }
     } else {
         if (futureNextTrackHasHeader != rowHasHeader(destinationChild + count)) {
             Q_EMIT dataChanged(index(destinationChild + count, 0), index(destinationChild + count, 0), {ColumnsRoles::HasAlbumHeader});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
         }
     }
 
     Q_EMIT persistentStateChanged();
 
     return true;
 }
 
 void MediaPlayList::move(int from, int to, int n)
 {
     if (from < to) {
         moveRows({}, from, n, {}, to + 1);
     } else {
         moveRows({}, from, n, {}, to);
     }
 }
 
 void MediaPlayList::enqueue(const TrackDataType &newTrack)
 {
     enqueue(MediaPlayListEntry(newTrack), newTrack);
 }
 
 void MediaPlayList::enqueue(const MediaPlayListEntry &newEntry, const TrackDataType &audioTrack)
 {
     beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size());
     d->mData.push_back(newEntry);
     if (!audioTrack.isEmpty()) {
         d->mTrackData.push_back(audioTrack);
     } else {
         d->mTrackData.push_back({});
     }
     endInsertRows();
 
     restorePlayListPosition();
     if (!d->mCurrentTrack.isValid()) {
         resetCurrentTrack();
     }
 
     Q_EMIT tracksCountChanged();
     Q_EMIT persistentStateChanged();
 
     if (!newEntry.mIsValid) {
         if (newEntry.mTrackUrl.isValid()) {
             qDebug() << "MediaPlayList::enqueue" << "newTrackByFileNameInList" << newEntry.mTrackUrl;
             auto entryURL = newEntry.mTrackUrl.toUrl();
             if (entryURL.isLocalFile()) {
-                QFileInfo newTrackFile(entryURL.toLocalFile());
+                auto entryString =  entryURL.toLocalFile();
+                QFileInfo newTrackFile(entryString);
                 if (newTrackFile.exists()) {
                     d->mData.last().mIsValid = true;
                 }
-                Q_EMIT newTrackByFileNameInList(entryURL);
+                Q_EMIT newEntryInList(0, entryString, ElisaUtils::FileName);
             }
         } else {
             Q_EMIT newTrackByNameInList(newEntry.mTitle.toString(),
                                         newEntry.mArtist.toString(),
                                         newEntry.mAlbum.toString(),
                                         newEntry.mTrackNumber.toInt(),
                                         newEntry.mDiscNumber.toInt());
         }
     } else {
         Q_EMIT newEntryInList(newEntry.mId, {}, ElisaUtils::Track);
     }
 
-    Q_EMIT trackHasBeenAdded(data(index(d->mData.size() - 1, 0), ColumnsRoles::TitleRole).toString(), data(index(d->mData.size() - 1, 0), ColumnsRoles::ImageUrlRole).toUrl());
-
     if (!newEntry.mIsValid) {
         Q_EMIT dataChanged(index(rowCount() - 1, 0), index(rowCount() - 1, 0), {MediaPlayList::HasAlbumHeader});
 
         if (!d->mCurrentTrack.isValid()) {
             resetCurrentTrack();
         }
     }
 }
 
 void MediaPlayList::enqueue(const MusicAlbum &album)
 {
     enqueue(album.tracksList(), ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
 }
 
 void MediaPlayList::enqueueArtist(const QString &artistName)
 {
     beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size());
     d->mData.push_back(MediaPlayListEntry{artistName});
     d->mTrackData.push_back({});
     endInsertRows();
 
     restorePlayListPosition();
     if (!d->mCurrentTrack.isValid()) {
         resetCurrentTrack();
     }
 
     Q_EMIT tracksCountChanged();
     Q_EMIT newEntryInList(0, artistName, ElisaUtils::Artist);
     Q_EMIT persistentStateChanged();
 }
 
-void MediaPlayList::enqueue(const QUrl &fileName)
+void MediaPlayList::enqueueFilesList(const ElisaUtils::EntryDataList &newEntries)
 {
-    enqueue(MediaPlayListEntry(fileName));
-}
+    beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + newEntries.size() - 1);
+    for (const auto &oneTrackUrl : newEntries) {
+        auto newEntry = MediaPlayListEntry(QUrl::fromLocalFile(std::get<1>(oneTrackUrl)));
+        d->mData.push_back(newEntry);
+        d->mTrackData.push_back({});
+        if (newEntry.mTrackUrl.isValid()) {
+            qDebug() << "MediaPlayList::enqueue" << "newTrackByFileNameInList" << std::get<1>(oneTrackUrl);
+            auto entryURL = newEntry.mTrackUrl.toUrl();
+            if (entryURL.isLocalFile()) {
+                auto entryString =  entryURL.toLocalFile();
+                QFileInfo newTrackFile(entryString);
+                if (newTrackFile.exists()) {
+                    d->mData.last().mIsValid = true;
+                }
+                Q_EMIT newEntryInList(0, entryString, ElisaUtils::FileName);
+            }
+        }
+    }
+    endInsertRows();
 
-void MediaPlayList::enqueueFilesList(const QList<ElisaUtils::EntryData> &newEntries)
-{
-    QList<QUrl> fileUrls;
-    for (const auto &file : newEntries) {
-        fileUrls.append(QUrl::fromLocalFile(std::get<1>(file)));
+    restorePlayListPosition();
+    if (!d->mCurrentTrack.isValid()) {
+        resetCurrentTrack();
     }
-    enqueue(fileUrls, ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
+
+    Q_EMIT tracksCountChanged();
+    Q_EMIT persistentStateChanged();
+
+    Q_EMIT dataChanged(index(rowCount() - 1, 0), index(rowCount() - 1, 0), {MediaPlayList::HasAlbumHeader});
 }
 
-void MediaPlayList::enqueueTracksListById(const QList<ElisaUtils::EntryData> &newEntries)
+void MediaPlayList::enqueueTracksListById(const ElisaUtils::EntryDataList &newEntries)
 {
     beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + newEntries.size() - 1);
     for (const auto &newTrack : newEntries) {
         d->mData.push_back(MediaPlayListEntry{std::get<0>(newTrack)});
         d->mTrackData.push_back({});
         Q_EMIT newEntryInList(std::get<0>(newTrack), std::get<1>(newTrack), ElisaUtils::Track);
     }
     endInsertRows();
 
     restorePlayListPosition();
     if (!d->mCurrentTrack.isValid()) {
         resetCurrentTrack();
     }
 
     Q_EMIT tracksCountChanged();
     Q_EMIT persistentStateChanged();
 
     Q_EMIT dataChanged(index(rowCount() - 1, 0), index(rowCount() - 1, 0), {MediaPlayList::HasAlbumHeader});
 }
 
-void MediaPlayList::enqueueAndPlay(const QStringList &files)
+void MediaPlayList::enqueueOneEntry(const ElisaUtils::EntryData &entryData, ElisaUtils::PlayListEntryType type)
 {
-    if (files.size() > 0) {
-        int previousTrackNumber = tracksCount();
-        auto newEntries = QList<ElisaUtils::EntryData>{};
-        for (const auto &oneFile : files) {
-            newEntries.push_back({0, oneFile});
-        }
-        enqueueFilesList(newEntries);
-        switchTo(previousTrackNumber);
-        Q_EMIT ensurePlay();
+    beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size());
+    d->mData.push_back(MediaPlayListEntry{std::get<0>(entryData), std::get<1>(entryData), type});
+    d->mTrackData.push_back({});
+    Q_EMIT newEntryInList(std::get<0>(entryData), std::get<1>(entryData), type);
+    endInsertRows();
+
+    Q_EMIT tracksCountChanged();
+    Q_EMIT persistentStateChanged();
+}
+
+void MediaPlayList::enqueueMultipleEntries(const ElisaUtils::EntryDataList &entriesData, ElisaUtils::PlayListEntryType type)
+{
+    beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + entriesData.size() - 1);
+    for (const auto &entryData : entriesData) {
+        d->mData.push_back(MediaPlayListEntry{std::get<0>(entryData), std::get<1>(entryData), type});
+        d->mTrackData.push_back({});
+        Q_EMIT newEntryInList(std::get<0>(entryData), std::get<1>(entryData), type);
     }
+    endInsertRows();
+
+    Q_EMIT tracksCountChanged();
+    Q_EMIT persistentStateChanged();
 }
 
-void MediaPlayList::replaceAndPlay(ElisaUtils::EntryData newEntry,
+void MediaPlayList::replaceAndPlay(const ElisaUtils::EntryData &newEntry,
                                    ElisaUtils::PlayListEntryType databaseIdType)
 {
+    enqueue(newEntry, databaseIdType, ElisaUtils::PlayListEnqueueMode::ReplacePlayList, ElisaUtils::PlayListEnqueueTriggerPlay::TriggerPlay);
 }
 
 void MediaPlayList::enqueue(const QList<MusicAlbum> &albums,
                             ElisaUtils::PlayListEnqueueMode enqueueMode,
                             ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
     if (albums.isEmpty()) {
         return;
     }
 
     auto tracksCount = 0;
     for (const auto &oneAlbum : albums) {
         for (auto oneTrackIndex = 0; oneTrackIndex < oneAlbum.tracksCount(); ++oneTrackIndex) {
             ++tracksCount;
         }
     }
 
     if (enqueueMode == ElisaUtils::ReplacePlayList) {
         clearPlayList();
     }
 
     beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + tracksCount - 1);
     for (const auto &oneAlbum : albums) {
         for (auto oneTrackIndex = 0; oneTrackIndex < oneAlbum.tracksCount(); ++oneTrackIndex) {
             const auto &oneTrack = oneAlbum.trackFromIndex(oneTrackIndex);
             d->mData.push_back(MediaPlayListEntry{oneTrack.databaseId()});
 
             auto oneData = DatabaseInterface::TrackDataType{};
 
             oneData[DatabaseInterface::TrackDataType::key_type::TitleRole] = oneTrack.title();
             oneData[DatabaseInterface::TrackDataType::key_type::ArtistRole] = oneTrack.artist();
             oneData[DatabaseInterface::TrackDataType::key_type::AlbumRole] = oneTrack.albumName();
             oneData[DatabaseInterface::TrackDataType::key_type::AlbumIdRole] = oneTrack.albumId();
             oneData[DatabaseInterface::TrackDataType::key_type::TrackNumberRole] = oneTrack.trackNumber();
             oneData[DatabaseInterface::TrackDataType::key_type::DiscNumberRole] = oneTrack.discNumber();
             oneData[DatabaseInterface::TrackDataType::key_type::DurationRole] = oneTrack.duration();
             oneData[DatabaseInterface::TrackDataType::key_type::MilliSecondsDurationRole] = oneTrack.duration().msecsSinceStartOfDay();
             oneData[DatabaseInterface::TrackDataType::key_type::ResourceRole] = oneTrack.resourceURI();
             oneData[DatabaseInterface::TrackDataType::key_type::ImageUrlRole] = oneTrack.albumCover();
 
             d->mTrackData.push_back(oneData);
         }
     }
     endInsertRows();
 
     restorePlayListPosition();
     if (!d->mCurrentTrack.isValid()) {
         resetCurrentTrack();
     }
 
     Q_EMIT tracksCountChanged();
     Q_EMIT persistentStateChanged();
 
     Q_EMIT dataChanged(index(rowCount() - 1, 0), index(rowCount() - 1, 0), {MediaPlayList::HasAlbumHeader});
 
     if (triggerPlay == ElisaUtils::TriggerPlay) {
         Q_EMIT ensurePlay();
     }
 }
 
 void MediaPlayList::enqueue(const QList<MusicAudioTrack> &tracks,
                             ElisaUtils::PlayListEnqueueMode enqueueMode,
                             ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
     if (tracks.isEmpty()) {
         return;
     }
 
     if (enqueueMode == ElisaUtils::ReplacePlayList) {
         clearPlayList();
     }
 
     beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + tracks.size() - 1);
     for (const auto &oneTrack : tracks) {
         d->mData.push_back(MediaPlayListEntry{oneTrack.databaseId()});
 
         auto oneData = DatabaseInterface::TrackDataType{};
 
         oneData[DatabaseInterface::TrackDataType::key_type::TitleRole] = oneTrack.title();
         oneData[DatabaseInterface::TrackDataType::key_type::ArtistRole] = oneTrack.artist();
         oneData[DatabaseInterface::TrackDataType::key_type::AlbumRole] = oneTrack.albumName();
         oneData[DatabaseInterface::TrackDataType::key_type::AlbumIdRole] = oneTrack.albumId();
         oneData[DatabaseInterface::TrackDataType::key_type::TrackNumberRole] = oneTrack.trackNumber();
         oneData[DatabaseInterface::TrackDataType::key_type::DiscNumberRole] = oneTrack.discNumber();
         oneData[DatabaseInterface::TrackDataType::key_type::DurationRole] = oneTrack.duration();
         oneData[DatabaseInterface::TrackDataType::key_type::MilliSecondsDurationRole] = oneTrack.duration().msecsSinceStartOfDay();
         oneData[DatabaseInterface::TrackDataType::key_type::ResourceRole] = oneTrack.resourceURI();
         oneData[DatabaseInterface::TrackDataType::key_type::ImageUrlRole] = oneTrack.albumCover();
 
         d->mTrackData.push_back(oneData);
     }
     endInsertRows();
 
     restorePlayListPosition();
     if (!d->mCurrentTrack.isValid()) {
         resetCurrentTrack();
     }
 
     Q_EMIT tracksCountChanged();
     Q_EMIT persistentStateChanged();
 
     Q_EMIT dataChanged(index(rowCount() - 1, 0), index(rowCount() - 1, 0), {MediaPlayList::HasAlbumHeader});
 
     if (triggerPlay == ElisaUtils::TriggerPlay) {
         Q_EMIT ensurePlay();
     }
 }
 
-void MediaPlayList::enqueueArtists(const QList<QString> &artistNames,
-                                   ElisaUtils::PlayListEnqueueMode enqueueMode,
-                                   ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
-{
-    if (artistNames.isEmpty()) {
-        return;
-    }
-
-    if (enqueueMode == ElisaUtils::ReplacePlayList) {
-        clearPlayList();
-    }
-
-    beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + artistNames.size() - 1);
-    for (const auto &artistName : artistNames) {
-        d->mData.push_back(MediaPlayListEntry{artistName});
-        d->mTrackData.push_back({});
-        Q_EMIT newEntryInList(0, artistName, ElisaUtils::Artist);
-    }
-    endInsertRows();
-
-    restorePlayListPosition();
-    if (!d->mCurrentTrack.isValid()) {
-        resetCurrentTrack();
-    }
-
-    Q_EMIT tracksCountChanged();
-    Q_EMIT persistentStateChanged();
-
-    if (triggerPlay == ElisaUtils::TriggerPlay) {
-        Q_EMIT ensurePlay();
-    }
-}
-
-void MediaPlayList::enqueue(const QList<QUrl> &trackUrls,
-                            ElisaUtils::PlayListEnqueueMode enqueueMode,
-                            ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
-{
-    if (trackUrls.isEmpty()) {
-        return;
-    }
-
-    if (enqueueMode == ElisaUtils::ReplacePlayList) {
-        clearPlayList();
-    }
-
-    beginInsertRows(QModelIndex(), d->mData.size(), d->mData.size() + trackUrls.size() - 1);
-    for (const auto &oneTrackUrl : trackUrls) {
-        auto newEntry = MediaPlayListEntry(oneTrackUrl);
-        d->mData.push_back(newEntry);
-        d->mTrackData.push_back({});
-        if (newEntry.mTrackUrl.isValid()) {
-            qDebug() << "MediaPlayList::enqueue" << "newTrackByFileNameInList" << oneTrackUrl;
-            auto entryURL = newEntry.mTrackUrl.toUrl();
-            if (entryURL.isLocalFile()) {
-                QFileInfo newTrackFile(entryURL.toLocalFile());
-                if (newTrackFile.exists()) {
-                    d->mData.last().mIsValid = true;
-                }
-                Q_EMIT newTrackByFileNameInList(entryURL);
-            }
-        }
-    }
-    endInsertRows();
-
-    restorePlayListPosition();
-    if (!d->mCurrentTrack.isValid()) {
-        resetCurrentTrack();
-    }
-
-    Q_EMIT tracksCountChanged();
-    Q_EMIT persistentStateChanged();
-
-    Q_EMIT dataChanged(index(rowCount() - 1, 0), index(rowCount() - 1, 0), {MediaPlayList::HasAlbumHeader});
-
-    if (triggerPlay == ElisaUtils::TriggerPlay) {
-        Q_EMIT ensurePlay();
-    }
-}
-
-void MediaPlayList::replaceAndPlay(qulonglong newTrackId)
-{
-    clearPlayList();
-    enqueue(MediaPlayListEntry(newTrackId));
-    Q_EMIT ensurePlay();
-}
-
 void MediaPlayList::replaceAndPlay(const TrackDataType &newTrack)
 {
     clearPlayList();
     enqueue(newTrack);
     Q_EMIT ensurePlay();
 }
 
 void MediaPlayList::replaceAndPlay(const MusicAlbum &album)
 {
     clearPlayList();
     enqueue(album);
     Q_EMIT ensurePlay();
 }
 
-void MediaPlayList::replaceAndPlay(const QString &artistName)
-{
-    clearPlayList();
-    enqueueArtist(artistName);
-    Q_EMIT ensurePlay();
-}
-
-void MediaPlayList::replaceAndPlay(const QUrl &fileName)
-{
-    clearPlayList();
-    enqueue(fileName);
-    Q_EMIT ensurePlay();
-}
-
 void MediaPlayList::clearPlayList()
 {
     if (d->mData.isEmpty()) {
         return;
     }
 
     beginRemoveRows({}, 0, d->mData.count() - 1);
     d->mData.clear();
     d->mTrackData.clear();
     endRemoveRows();
 
     d->mCurrentPlayListPosition = 0;
     d->mCurrentTrack = QPersistentModelIndex{};
     notifyCurrentTrackChanged();
 
     Q_EMIT tracksCountChanged();
 }
 
 void MediaPlayList::loadPlaylist(const QUrl &fileName)
 {
     d->mLoadPlaylist.clear();
     d->mLoadPlaylist.load(fileName, "m3u");
 }
 
+void MediaPlayList::enqueue(const ElisaUtils::EntryData &newEntry, ElisaUtils::PlayListEntryType databaseIdType)
+{
+    enqueue(newEntry, databaseIdType, ElisaUtils::PlayListEnqueueMode::AppendPlayList, ElisaUtils::PlayListEnqueueTriggerPlay::DoNotTriggerPlay);
+}
+
+void MediaPlayList::enqueue(const ElisaUtils::EntryDataList &newEntries, ElisaUtils::PlayListEntryType databaseIdType)
+{
+    enqueue(newEntries, databaseIdType, ElisaUtils::PlayListEnqueueMode::AppendPlayList, ElisaUtils::PlayListEnqueueTriggerPlay::DoNotTriggerPlay);
+}
+
 void MediaPlayList::enqueue(qulonglong newEntryDatabaseId,
                             const QString &newEntryTitle,
-                            ElisaUtils::PlayListEntryType databaseIdType)
+                            ElisaUtils::PlayListEntryType databaseIdType,
+                            ElisaUtils::PlayListEnqueueMode enqueueMode,
+                            ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
-    enqueue({newEntryDatabaseId, newEntryTitle}, databaseIdType);
+    enqueue({newEntryDatabaseId, newEntryTitle}, databaseIdType, enqueueMode, triggerPlay);
 }
 
 void MediaPlayList::enqueue(ElisaUtils::EntryData newEntry,
-                            ElisaUtils::PlayListEntryType databaseIdType)
+                            ElisaUtils::PlayListEntryType databaseIdType,
+                            ElisaUtils::PlayListEnqueueMode enqueueMode,
+                            ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
+    if (enqueueMode == ElisaUtils::ReplacePlayList) {
+        clearPlayList();
+    }
+
     switch (databaseIdType)
     {
+    case ElisaUtils::Album:
     case ElisaUtils::Artist:
-        enqueueArtist(std::get<1>(newEntry));
+    case ElisaUtils::Genre:
+        enqueueOneEntry(newEntry, databaseIdType);
         break;
     case ElisaUtils::Track:
         enqueue(MediaPlayListEntry{std::get<0>(newEntry)});
         break;
+    case ElisaUtils::FileName:
+        enqueueFilesList({newEntry});
+        break;
+    case ElisaUtils::Unknown:
+        break;
+    }
+
+    if (triggerPlay == ElisaUtils::TriggerPlay) {
+        Q_EMIT ensurePlay();
     }
 }
 
-void MediaPlayList::enqueue(const QList<ElisaUtils::EntryData> &newEntries,
-                            ElisaUtils::PlayListEntryType databaseIdType)
+void MediaPlayList::enqueue(const ElisaUtils::EntryDataList &newEntries,
+                            ElisaUtils::PlayListEntryType databaseIdType,
+                            ElisaUtils::PlayListEnqueueMode enqueueMode,
+                            ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
     if (newEntries.isEmpty()) {
         return;
     }
 
+    if (enqueueMode == ElisaUtils::ReplacePlayList) {
+        clearPlayList();
+    }
+
     switch (databaseIdType)
     {
     case ElisaUtils::Track:
         enqueueTracksListById(newEntries);
         break;
     case ElisaUtils::FileName:
         enqueueFilesList(newEntries);
         break;
+    case ElisaUtils::Album:
+    case ElisaUtils::Artist:
+    case ElisaUtils::Genre:
+        enqueueMultipleEntries(newEntries, databaseIdType);
+        break;
+    case ElisaUtils::Unknown:
+        break;
+    }
+
+    if (triggerPlay == ElisaUtils::TriggerPlay) {
+        Q_EMIT ensurePlay();
     }
 }
 
 bool MediaPlayList::savePlaylist(const QUrl &fileName)
 {
     QMediaPlaylist savePlaylist;
 
     for (int i = 0; i < d->mData.size(); ++i) {
         const auto &oneTrack = d->mData.at(i);
         const auto &oneTrackData = d->mTrackData.at(i);
         if (oneTrack.mIsValid) {
             savePlaylist.addMedia(oneTrackData.resourceURI());
         }
     }
 
     return savePlaylist.save(fileName, "m3u");
 }
 
 QVariantMap MediaPlayList::persistentState() const
 {
     auto currentState = QVariantMap();
     auto result = QList<QVariant>();
 
     for (int trackIndex = 0; trackIndex < d->mData.size(); ++trackIndex) {
         auto oneData = QList<QString>();
         const auto &oneEntry = d->mData[trackIndex];
         if (oneEntry.mIsValid) {
             const auto &oneTrack = d->mTrackData[trackIndex];
 
             oneData.push_back(oneTrack.title());
             oneData.push_back(oneTrack.artist());
             oneData.push_back(oneTrack.album());
             oneData.push_back(QString::number(oneTrack.trackNumber()));
             oneData.push_back(QString::number(oneTrack.discNumber()));
 
             result.push_back(QVariant(oneData));
         }
     }
 
     currentState[QStringLiteral("playList")] = result;
     currentState[QStringLiteral("currentTrack")] = d->mCurrentPlayListPosition;
     currentState[QStringLiteral("randomPlay")] = d->mRandomPlay;
     currentState[QStringLiteral("repeatPlay")] = d->mRepeatPlay;
 
     return currentState;
 }
 
 MusicListenersManager *MediaPlayList::musicListenersManager() const
 {
     return d->mMusicListenersManager;
 }
 
 int MediaPlayList::tracksCount() const
 {
     return rowCount();
 }
 
 QPersistentModelIndex MediaPlayList::currentTrack() const
 {
     return d->mCurrentTrack;
 }
 
 int MediaPlayList::currentTrackRow() const
 {
     return d->mCurrentTrack.row();
 }
 
 bool MediaPlayList::randomPlay() const
 {
     return d->mRandomPlay;
 }
 
 bool MediaPlayList::repeatPlay() const
 {
     return d->mRepeatPlay;
 }
 
 void MediaPlayList::setPersistentState(const QVariantMap &persistentStateValue)
 {
     if (d->mPersistentState == persistentStateValue) {
         return;
     }
 
     qDebug() << "MediaPlayList::setPersistentState" << persistentStateValue;
 
     d->mPersistentState = persistentStateValue;
 
     auto persistentState = d->mPersistentState[QStringLiteral("playList")].toList();
 
     for (auto &oneData : persistentState) {
         auto trackData = oneData.toStringList();
         if (trackData.size() != 5) {
             continue;
         }
 
         auto restoredTitle = trackData[0];
         auto restoredArtist = trackData[1];
         auto restoredAlbum = trackData[2];
         auto restoredTrackNumber = trackData[3].toInt();
         auto restoredDiscNumber = trackData[4].toInt();
 
         enqueue({restoredTitle, restoredArtist, restoredAlbum, restoredTrackNumber, restoredDiscNumber});
     }
 
     restorePlayListPosition();
     restoreRandomPlay();
     restoreRepeatPlay();
 
     Q_EMIT persistentStateChanged();
 }
 
 void MediaPlayList::removeSelection(QList<int> selection)
 {
     std::sort(selection.begin(), selection.end());
     std::reverse(selection.begin(), selection.end());
     for (auto oneItem : selection) {
         removeRow(oneItem);
     }
 }
 
-void MediaPlayList::albumAdded(const ListTrackDataType &tracks)
+void MediaPlayList::tracksListAdded(qulonglong newDatabaseId,
+                                    const QString &entryTitle,
+                                    ElisaUtils::PlayListEntryType databaseIdType,
+                                    const ListTrackDataType &tracks)
 {
     for (int playListIndex = 0; playListIndex < d->mData.size(); ++playListIndex) {
         auto &oneEntry = d->mData[playListIndex];
-        if (oneEntry.mEntryType != ElisaUtils::Artist || oneEntry.mIsValid) {
+        if (oneEntry.mEntryType != databaseIdType) {
+            continue;
+        }
+
+        if (oneEntry.mTitle != entryTitle) {
             continue;
         }
 
-        if (oneEntry.mArtist != tracks.first().artist()) {
+        if (newDatabaseId != 0 && oneEntry.mId != newDatabaseId) {
             continue;
         }
 
         d->mTrackData[playListIndex] = tracks.first();
         oneEntry.mId = tracks.first().databaseId();
         oneEntry.mIsValid = true;
         oneEntry.mEntryType = ElisaUtils::Track;
 
         Q_EMIT dataChanged(index(playListIndex, 0), index(playListIndex, 0), {});
 
         if (!d->mCurrentTrack.isValid()) {
             resetCurrentTrack();
         }
 
         if (tracks.size() > 1) {
             beginInsertRows(QModelIndex(), playListIndex + 1, playListIndex - 1 + tracks.size());
             for (int trackIndex = 1; trackIndex < tracks.size(); ++trackIndex) {
                 d->mData.push_back(MediaPlayListEntry{tracks[trackIndex].databaseId()});
                 d->mTrackData.push_back(tracks[trackIndex]);
             }
             endInsertRows();
 
             restorePlayListPosition();
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
 
             Q_EMIT tracksCountChanged();
         }
         Q_EMIT persistentStateChanged();
     }
 }
 
 void MediaPlayList::trackChanged(const TrackDataType &track)
 {
     for (int i = 0; i < d->mData.size(); ++i) {
         auto &oneEntry = d->mData[i];
 
         if (oneEntry.mEntryType != ElisaUtils::Artist && oneEntry.mIsValid) {
             if (oneEntry.mTrackUrl.toUrl().isValid() && track.resourceURI() != oneEntry.mTrackUrl.toUrl()) {
                 continue;
             }
 
             if (!oneEntry.mTrackUrl.toUrl().isValid() && (oneEntry.mId == 0 || track.databaseId() != oneEntry.mId)) {
                 continue;
             }
 
             const auto &trackData = d->mTrackData[i];
 
             if (!trackData.empty()) {
                 bool sameData = true;
                 for (const auto &oneKey : track.keys()) {
                     if (trackData[oneKey] != track[oneKey]) {
                         sameData = false;
                         break;
                     }
                 }
                 if (sameData) {
                     continue;
                 }
             }
 
             d->mTrackData[i] = track;
 
             Q_EMIT dataChanged(index(i, 0), index(i, 0), {});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
             continue;
         } else if (oneEntry.mEntryType != ElisaUtils::Artist && !oneEntry.mIsValid && !oneEntry.mTrackUrl.isValid()) {
             if (track.title() != oneEntry.mTitle) {
                 continue;
             }
 
             if (track.album() != oneEntry.mAlbum) {
                 continue;
             }
 
             if (track.trackNumber() != oneEntry.mTrackNumber) {
                 continue;
             }
 
             if (track.discNumber() != oneEntry.mDiscNumber) {
                 continue;
             }
 
             d->mTrackData[i] = track;
             oneEntry.mId = track.databaseId();
             oneEntry.mIsValid = true;
 
             Q_EMIT dataChanged(index(i, 0), index(i, 0), {});
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
 
             break;
         } else if (oneEntry.mEntryType != ElisaUtils::Artist && !oneEntry.mIsValid && oneEntry.mTrackUrl.isValid()) {
             qDebug() << "MediaPlayList::trackChanged" << oneEntry << track;
             qDebug() << "MediaPlayList::trackChanged" << track.resourceURI() << oneEntry.mTrackUrl;
             if (track.resourceURI() != oneEntry.mTrackUrl) {
                 continue;
             }
 
             d->mTrackData[i] = track;
             oneEntry.mId = track.databaseId();
             oneEntry.mIsValid = true;
 
             Q_EMIT dataChanged(index(i, 0), index(i, 0), {});
 
             restorePlayListPosition();
 
             if (!d->mCurrentTrack.isValid()) {
                 resetCurrentTrack();
             }
 
             break;
         }
     }
 }
 
 void MediaPlayList::trackRemoved(qulonglong trackId)
 {
     for (int i = 0; i < d->mData.size(); ++i) {
         auto &oneEntry = d->mData[i];
 
         if (oneEntry.mIsValid) {
             if (oneEntry.mId == trackId) {
                 oneEntry.mIsValid = false;
                 oneEntry.mTitle = d->mTrackData[i].title();
                 oneEntry.mArtist = d->mTrackData[i].artist();
                 oneEntry.mAlbum = d->mTrackData[i].album();
                 oneEntry.mTrackNumber = d->mTrackData[i].trackNumber();
                 oneEntry.mDiscNumber = d->mTrackData[i].discNumber();
 
                 Q_EMIT dataChanged(index(i, 0), index(i, 0), {});
 
                 if (!d->mCurrentTrack.isValid()) {
                     resetCurrentTrack();
                 }
             }
         }
     }
 }
 
 void MediaPlayList::setMusicListenersManager(MusicListenersManager *musicListenersManager)
 {
     if (d->mMusicListenersManager == musicListenersManager) {
         return;
     }
 
     d->mMusicListenersManager = musicListenersManager;
 
     if (d->mMusicListenersManager) {
         d->mMusicListenersManager->subscribeForTracks(this);
     }
 
     Q_EMIT musicListenersManagerChanged();
 }
 
 void MediaPlayList::setRandomPlay(bool value)
 {
     d->mRandomPlay = value;
     Q_EMIT randomPlayChanged();
 }
 
 void MediaPlayList::setRepeatPlay(bool value)
 {
     d->mRepeatPlay = value;
     Q_EMIT repeatPlayChanged();
 }
 
 void MediaPlayList::skipNextTrack()
 {
     if (!d->mCurrentTrack.isValid()) {
         return;
     }
 
     if (!d->mRandomPlay && (d->mCurrentTrack.row() >= (rowCount() - 1))) {
         if (!d->mRepeatPlay) {
             Q_EMIT playListFinished();
         }
 
         if (rowCount() == 1) {
             d->mCurrentTrack = QPersistentModelIndex{};
             notifyCurrentTrackChanged();
         }
 
         resetCurrentTrack();
 
         return;
     }
 
     if (d->mRandomPlay) {
         int randomValue = qrand();
         randomValue = randomValue % (rowCount());
         d->mCurrentTrack = index(randomValue, 0);
     } else {
         d->mCurrentTrack = index(d->mCurrentTrack.row() + 1, 0);
     }
 
     notifyCurrentTrackChanged();
 }
 
 void MediaPlayList::skipPreviousTrack()
 {
     if (!d->mCurrentTrack.isValid()) {
         return;
     }
 
     if (!d->mRandomPlay && !d->mRepeatPlay && d->mCurrentTrack.row() <= 0) {
         return;
     }
 
     if (d->mRandomPlay) {
         int randomValue = qrand();
         randomValue = randomValue % (rowCount());
         d->mCurrentTrack = index(randomValue, 0);
     } else {
         if (d->mRepeatPlay) {
             if (d->mCurrentTrack.row() == 0) {
                 d->mCurrentTrack = index(rowCount() - 1, 0);
             } else {
                 d->mCurrentTrack = index(d->mCurrentTrack.row() - 1, 0);
             }
         } else {
             d->mCurrentTrack = index(d->mCurrentTrack.row() - 1, d->mCurrentTrack.column(), d->mCurrentTrack.parent());
         }
     }
     notifyCurrentTrackChanged();
 }
 
 void MediaPlayList::seedRandomGenerator(uint seed)
 {
     qsrand(seed);
 }
 
 void MediaPlayList::switchTo(int row)
 {
     if (!d->mCurrentTrack.isValid()) {
         return;
     }
 
     d->mCurrentTrack = index(row, 0);
 
     notifyCurrentTrackChanged();
 }
 
 void MediaPlayList::trackInError(const QUrl &sourceInError, QMediaPlayer::Error playerError)
 {
     Q_UNUSED(playerError)
 
     for (int i = 0; i < d->mData.size(); ++i) {
         auto &oneTrack = d->mData[i];
         if (oneTrack.mIsValid) {
             const auto &oneTrackData = d->mTrackData.at(i);
 
             if (oneTrackData.resourceURI() == sourceInError) {
                 oneTrack.mIsValid = false;
                 Q_EMIT dataChanged(index(i, 0), index(i, 0), {ColumnsRoles::IsValidRole});
             }
         }
     }
 }
 
 bool MediaPlayList::rowHasHeader(int row) const
 {
     if (row >= rowCount()) {
         return false;
     }
 
     if (row < 0) {
         return false;
     }
 
     if (row - 1 < 0) {
         return true;
     }
 
     auto currentAlbumTitle = QString();
     auto currentAlbumArtist = QString();
     if (d->mData[row].mIsValid) {
         currentAlbumTitle = d->mTrackData[row].album();
         currentAlbumArtist = d->mTrackData[row].albumArtist();
     } else {
         currentAlbumTitle = d->mData[row].mAlbum.toString();
         currentAlbumArtist = d->mData[row].mArtist.toString();
     }
 
     auto previousAlbumTitle = QString();
     auto previousAlbumArtist = QString();
     if (d->mData[row - 1].mIsValid) {
         previousAlbumTitle = d->mTrackData[row - 1].album();
         previousAlbumArtist = d->mTrackData[row - 1].albumArtist();
     } else {
         previousAlbumTitle = d->mData[row - 1].mAlbum.toString();
         previousAlbumArtist = d->mData[row - 1].mArtist.toString();
     }
 
     if (currentAlbumTitle == previousAlbumTitle && currentAlbumArtist == previousAlbumArtist) {
         return false;
     }
 
     return true;
 }
 
 void MediaPlayList::loadPlayListLoaded()
 {
     clearPlayList();
 
     for (int i = 0; i < d->mLoadPlaylist.mediaCount(); ++i) {
-        enqueue(d->mLoadPlaylist.media(i).canonicalUrl());
+        enqueue(MediaPlayListEntry{d->mLoadPlaylist.media(i).canonicalUrl()});
     }
 
     restorePlayListPosition();
     restoreRandomPlay();
     restoreRepeatPlay();
 
     Q_EMIT persistentStateChanged();
 
     d->mLoadPlaylist.clear();
     Q_EMIT playListLoaded();
 }
 
 void MediaPlayList::loadPlayListLoadFailed()
 {
     d->mLoadPlaylist.clear();
     Q_EMIT playListLoadFailed();
 }
 
 void MediaPlayList::resetCurrentTrack()
 {
     for(int row = 0; row < rowCount(); ++row) {
         auto candidateTrack = index(row, 0);
 
         if (candidateTrack.isValid() && candidateTrack.data(ColumnsRoles::IsValidRole).toBool()) {
             d->mCurrentTrack = candidateTrack;
             notifyCurrentTrackChanged();
             break;
         }
     }
 }
 
 void MediaPlayList::notifyCurrentTrackChanged()
 {
     Q_EMIT currentTrackChanged(d->mCurrentTrack);
     Q_EMIT currentTrackRowChanged();
     bool currentTrackIsValid = d->mCurrentTrack.isValid();
     if (currentTrackIsValid) {
         d->mCurrentPlayListPosition = d->mCurrentTrack.row();
     }
 }
 
 void MediaPlayList::restorePlayListPosition()
 {
     auto playerCurrentTrack = d->mPersistentState.find(QStringLiteral("currentTrack"));
     if (playerCurrentTrack != d->mPersistentState.end()) {
         auto newIndex = index(playerCurrentTrack->toInt(), 0);
         if (newIndex.isValid() && (newIndex != d->mCurrentTrack)) {
             d->mCurrentTrack = newIndex;
             notifyCurrentTrackChanged();
 
             if (d->mCurrentTrack.isValid()) {
                 d->mPersistentState.erase(playerCurrentTrack);
             }
         }
     }
 }
 
 void MediaPlayList::restoreRandomPlay()
 {
     auto randomPlayStoredValue = d->mPersistentState.find(QStringLiteral("randomPlay"));
     if (randomPlayStoredValue != d->mPersistentState.end()) {
         setRandomPlay(randomPlayStoredValue->toBool());
         d->mPersistentState.erase(randomPlayStoredValue);
     }
 }
 
 void MediaPlayList::restoreRepeatPlay()
 {
     auto repeatPlayStoredValue = d->mPersistentState.find(QStringLiteral("repeatPlay"));
     if (repeatPlayStoredValue != d->mPersistentState.end()) {
         setRepeatPlay(repeatPlayStoredValue->toBool());
         d->mPersistentState.erase(repeatPlayStoredValue);
     }
 }
 
-QDebug operator<<(QDebug stream, const MediaPlayListEntry &data)
+QDebug operator<<(const QDebug &stream, const MediaPlayListEntry &data)
 {
     stream << data.mTitle << data.mAlbum << data.mArtist << data.mTrackUrl << data.mTrackNumber << data.mDiscNumber << data.mId << data.mIsValid;
     return stream;
 }
 
 #include "moc_mediaplaylist.cpp"
diff --git a/src/mediaplaylist.h b/src/mediaplaylist.h
index b7765658..57182acc 100644
--- a/src/mediaplaylist.h
+++ b/src/mediaplaylist.h
@@ -1,370 +1,368 @@
 /*
  * Copyright 2015-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef MEDIAPLAYLIST_H
 #define MEDIAPLAYLIST_H
 
 #include "elisaLib_export.h"
 
 #include "musicaudiotrack.h"
 #include "musicalbum.h"
 #include "elisautils.h"
 #include "databaseinterface.h"
 
 #include <QAbstractListModel>
 #include <QVector>
 #include <QMediaPlayer>
 
 #include <utility>
 #include <tuple>
 
 class MediaPlayListPrivate;
 class MusicListenersManager;
 class MediaPlayListEntry;
 class QDebug;
 
 class ELISALIB_EXPORT MediaPlayList : public QAbstractListModel
 {
     Q_OBJECT
 
     Q_PROPERTY(QVariantMap persistentState
                READ persistentState
                WRITE setPersistentState
                NOTIFY persistentStateChanged)
 
     Q_PROPERTY(MusicListenersManager* musicListenersManager
                READ musicListenersManager
                WRITE setMusicListenersManager
                NOTIFY musicListenersManagerChanged)
 
     Q_PROPERTY(int tracksCount
                READ tracksCount
                NOTIFY tracksCountChanged)
 
     Q_PROPERTY(QPersistentModelIndex currentTrack
                READ currentTrack
                NOTIFY currentTrackChanged)
 
     Q_PROPERTY(int currentTrackRow
                READ currentTrackRow
                NOTIFY currentTrackRowChanged)
 
     Q_PROPERTY(bool randomPlay
                READ randomPlay
                WRITE setRandomPlay
                NOTIFY randomPlayChanged)
 
     Q_PROPERTY(bool repeatPlay
                READ repeatPlay
                WRITE setRepeatPlay
                NOTIFY repeatPlayChanged)
 
 public:
 
     enum ColumnsRoles {
         TitleRole = DatabaseInterface::TitleRole,
         SecondaryTextRole,
         ImageUrlRole,
         ShadowForImageRole,
         ChildModelRole,
         DurationRole,
         MilliSecondsDurationRole,
         ArtistRole,
         AllArtistsRole,
         HighestTrackRating,
         AlbumRole,
         AlbumArtistRole,
         TrackNumberRole,
         DiscNumberRole,
         RatingRole,
         GenreRole,
         LyricistRole,
         ComposerRole,
         CommentRole,
         YearRole,
         ChannelsRole,
         BitRateRole,
         SampleRateRole,
         ResourceRole,
         IdRole,
         DatabaseIdRole,
         IsSingleDiscAlbumRole,
         ContainerDataRole,
         IsPartialDataRole,
         AlbumIdRole,
         IsValidRole,
         TrackDataRole,
         CountRole,
         IsPlayingRole,
         HasAlbumHeader,
     };
 
     Q_ENUM(ColumnsRoles)
 
     enum PlayState {
         NotPlaying,
         IsPlaying,
         IsPaused,
     };
 
     Q_ENUM(PlayState)
 
     using ListTrackDataType = DatabaseInterface::ListTrackDataType;
 
     using TrackDataType = DatabaseInterface::TrackDataType;
 
     explicit MediaPlayList(QObject *parent = nullptr);
 
     ~MediaPlayList() override;
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
 
     QHash<int, QByteArray> roleNames() const override;
 
     Q_INVOKABLE bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
 
     Q_INVOKABLE bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override;
 
     Q_INVOKABLE void move(int from, int to, int n);
 
     Q_INVOKABLE void clearPlayList();
 
     Q_INVOKABLE bool savePlaylist(const QUrl &fileName);
 
     QVariantMap persistentState() const;
 
     MusicListenersManager* musicListenersManager() const;
 
     int tracksCount() const;
 
     QPersistentModelIndex currentTrack() const;
 
     int currentTrackRow() const;
 
     bool randomPlay() const;
 
     bool repeatPlay() const;
 
 Q_SIGNALS:
 
     void newTrackByNameInList(const QString &title, const QString &artist, const QString &album, int trackNumber, int discNumber);
 
-    void newTrackByFileNameInList(const QUrl &fileName);
-
     void newEntryInList(qulonglong newDatabaseId,
                         const QString &entryTitle,
                         ElisaUtils::PlayListEntryType databaseIdType);
 
-    void trackHasBeenAdded(const QString &title, const QUrl &image);
-
     void persistentStateChanged();
 
     void musicListenersManagerChanged();
 
     void tracksCountChanged();
 
     void currentTrackChanged(QPersistentModelIndex currentTrack);
 
     void currentTrackRowChanged();
 
     void randomPlayChanged();
 
     void repeatPlayChanged();
 
     void playListFinished();
 
     void playListLoaded();
 
     void playListLoadFailed();
 
     void ensurePlay();
 
 public Q_SLOTS:
 
     void setPersistentState(const QVariantMap &persistentState);
 
     void removeSelection(QList<int> selection);
 
-    void albumAdded(const ListTrackDataType &tracks);
+    void tracksListAdded(qulonglong newDatabaseId,
+                         const QString &entryTitle,
+                         ElisaUtils::PlayListEntryType databaseIdType,
+                         const ListTrackDataType &tracks);
 
     void trackChanged(const TrackDataType &track);
 
     void trackRemoved(qulonglong trackId);
 
     void setMusicListenersManager(MusicListenersManager* musicListenersManager);
 
     void setRandomPlay(bool value);
 
     void setRepeatPlay(bool value);
 
     void skipNextTrack();
 
     void skipPreviousTrack();
 
     void seedRandomGenerator(uint seed);
 
     void switchTo(int row);
 
     void loadPlaylist(const QUrl &fileName);
 
-    void enqueue(qulonglong newEntryDatabaseId, const QString &newEntryTitle, ElisaUtils::PlayListEntryType databaseIdType);
+    void enqueue(const ElisaUtils::EntryData &newEntry, ElisaUtils::PlayListEntryType databaseIdType);
+
+    void enqueue(const ElisaUtils::EntryDataList &newEntries, ElisaUtils::PlayListEntryType databaseIdType);
+
+    void enqueue(qulonglong newEntryDatabaseId, const QString &newEntryTitle,
+                 ElisaUtils::PlayListEntryType databaseIdType,
+                 ElisaUtils::PlayListEnqueueMode enqueueMode,
+                 ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
-    void enqueue(ElisaUtils::EntryData newEntry, ElisaUtils::PlayListEntryType databaseIdType);
+    void enqueue(ElisaUtils::EntryData newEntry,
+                 ElisaUtils::PlayListEntryType databaseIdType,
+                 ElisaUtils::PlayListEnqueueMode enqueueMode,
+                 ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
-    void enqueue(const QList<ElisaUtils::EntryData> &newEntries, ElisaUtils::PlayListEntryType databaseIdType);
+    void enqueue(const ElisaUtils::EntryDataList &newEntries,
+                 ElisaUtils::PlayListEntryType databaseIdType,
+                 ElisaUtils::PlayListEnqueueMode enqueueMode,
+                 ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
     void enqueue(const TrackDataType &newTrack);
 
     void enqueue(const MediaPlayListEntry &newEntry, const TrackDataType &audioTrack = {});
 
     void enqueue(const MusicAlbum &album);
 
     void enqueue(const QList<MusicAlbum> &albums,
                  ElisaUtils::PlayListEnqueueMode enqueueMode,
                  ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
     void enqueue(const QList<MusicAudioTrack> &tracks,
                  ElisaUtils::PlayListEnqueueMode enqueueMode,
                  ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
-    void enqueueArtists(const QList<QString> &artistName,
-                        ElisaUtils::PlayListEnqueueMode enqueueMode,
-                        ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
-
-    void enqueue(const QList<QUrl> &tracks,
-                 ElisaUtils::PlayListEnqueueMode enqueueMode,
-                 ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
-
-    void enqueueAndPlay(const QStringList &files);
-
-    void replaceAndPlay(ElisaUtils::EntryData newEntry, ElisaUtils::PlayListEntryType databaseIdType);
-
-    void replaceAndPlay(qulonglong newTrackId);
+    void replaceAndPlay(const ElisaUtils::EntryData &newEntry, ElisaUtils::PlayListEntryType databaseIdType);
 
     void replaceAndPlay(const TrackDataType &newTrack);
 
     void replaceAndPlay(const MusicAlbum &album);
 
-    void replaceAndPlay(const QString &artistName);
-
-    void replaceAndPlay(const QUrl &fileName);
-
     void trackInError(const QUrl &sourceInError, QMediaPlayer::Error playerError);
 
 private Q_SLOTS:
 
     void loadPlayListLoaded();
 
     void loadPlayListLoadFailed();
 
 private:
 
     bool rowHasHeader(int row) const;
 
     void resetCurrentTrack();
 
     void notifyCurrentTrackChanged();
 
     void restorePlayListPosition();
 
     void restoreRandomPlay();
 
     void restoreRepeatPlay();
 
     void enqueueArtist(const QString &artistName);
 
-    void enqueue(const QUrl &fileName);
+    void enqueueFilesList(const ElisaUtils::EntryDataList &newEntries);
+
+    void enqueueTracksListById(const ElisaUtils::EntryDataList &newEntries);
 
-    void enqueueFilesList(const QList<ElisaUtils::EntryData> &newEntries);
+    void enqueueOneEntry(const ElisaUtils::EntryData &entryData, ElisaUtils::PlayListEntryType type);
 
-    void enqueueTracksListById(const QList<ElisaUtils::EntryData> &newEntries);
+    void enqueueMultipleEntries(const ElisaUtils::EntryDataList &entriesData, ElisaUtils::PlayListEntryType type);
 
     std::unique_ptr<MediaPlayListPrivate> d;
 
 };
 
 class MediaPlayListEntry
 {
 public:
 
     MediaPlayListEntry() = default;
 
     explicit MediaPlayListEntry(qulonglong id) : mId(id), mIsValid(true) {
     }
 
     MediaPlayListEntry(QString title, QString artist, QString album, int trackNumber, int discNumber)
         : mTitle(std::move(title)), mAlbum(std::move(album)), mArtist(std::move(artist)),
           mTrackNumber(trackNumber), mDiscNumber(discNumber) {
     }
 
     explicit MediaPlayListEntry(const MusicAudioTrack &track)
         : mTitle(track.title()), mAlbum(track.albumName()), mTrackNumber(track.trackNumber()),
           mDiscNumber(track.discNumber()), mId(track.databaseId()), mIsValid(true) {
     }
 
     explicit MediaPlayListEntry(const MediaPlayList::TrackDataType &track)
         : mTitle(track[DatabaseInterface::TitleRole]),
           mAlbum(track[DatabaseInterface::AlbumRole]),
           mTrackNumber(track[DatabaseInterface::TrackNumberRole]),
           mDiscNumber(track[DatabaseInterface::DiscNumberRole]),
           mId(track[DatabaseInterface::DatabaseIdRole].toULongLong()),
           mIsValid(true) {
     }
 
     explicit MediaPlayListEntry(QString artist) : mArtist(std::move(artist)), mEntryType(ElisaUtils::Artist) {
     }
 
     explicit MediaPlayListEntry(QUrl fileName) : mTrackUrl(std::move(fileName)) {
     }
 
     explicit MediaPlayListEntry(qulonglong id,
                                 const QString &entryTitle,
                                 ElisaUtils::PlayListEntryType type)
         : mTitle(entryTitle), mId(id), mIsValid(type == ElisaUtils::Track), mEntryType(type) {
     }
 
     QVariant mTitle;
 
     QVariant mAlbum;
 
     QVariant mArtist;
 
     QVariant mTrackUrl;
 
     QVariant mTrackNumber = -1;
 
     QVariant mDiscNumber = -1;
 
     qulonglong mId = 0;
 
     bool mIsValid = false;
 
     ElisaUtils::PlayListEntryType mEntryType = ElisaUtils::PlayListEntryType::Unknown;
 
     MediaPlayList::PlayState mIsPlaying = MediaPlayList::NotPlaying;
 
 };
 
-QDebug operator<<(QDebug stream, const MediaPlayListEntry &data);
+QDebug operator<<(const QDebug &stream, const MediaPlayListEntry &data);
 
 
 
 #endif // MEDIAPLAYLIST_H
diff --git a/src/models/allartistsproxymodel.cpp b/src/models/allartistsproxymodel.cpp
index 55a902b3..6bcc518c 100644
--- a/src/models/allartistsproxymodel.cpp
+++ b/src/models/allartistsproxymodel.cpp
@@ -1,112 +1,106 @@
 /*
  * Copyright 2017 Alexander Stippich <a.stippich@gmx.net>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "allartistsproxymodel.h"
 
 #include "elisautils.h"
 #include "databaseinterface.h"
 
 #include <QStringList>
 #include <QReadLocker>
 #include <QtConcurrentRun>
 #include <Qt>
 
 AllArtistsProxyModel::AllArtistsProxyModel(QObject *parent) : AbstractMediaProxyModel(parent)
 {
     this->setSortRole(Qt::DisplayRole);
     this->setSortCaseSensitivity(Qt::CaseInsensitive);
     this->sortModel(Qt::AscendingOrder);
 }
 
-AllArtistsProxyModel::~AllArtistsProxyModel()
-{
-}
+AllArtistsProxyModel::~AllArtistsProxyModel() = default;
 
 bool AllArtistsProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     bool result = false;
 
     for (int column = 0, columnCount = sourceModel()->columnCount(source_parent); column < columnCount; ++column) {
         auto currentIndex = sourceModel()->index(source_row, column, source_parent);
 
         const auto &genreValue = sourceModel()->data(currentIndex, DatabaseInterface::ColumnsRoles::GenreRole);
 
         if (!genreFilterText().isNull() && !genreValue.isValid()) {
             continue;
         }
 
         if (!genreFilterText().isNull() && !genreValue.canConvert<QStringList>()) {
             continue;
         }
 
         if (!genreFilterText().isNull() && !genreValue.toStringList().contains(genreFilterText())) {
             continue;
         }
 
         const auto &artistValue = sourceModel()->data(currentIndex, Qt::DisplayRole).toString();
 
         if (mFilterExpression.match(artistValue).hasMatch()) {
             result = true;
             continue;
         }
 
         if (result) {
             continue;
         }
 
         if (!result) {
             break;
         }
     }
 
     return result;
 }
 
-void AllArtistsProxyModel::enqueueToPlayList()
+void AllArtistsProxyModel::genericEnqueueToPlayList(ElisaUtils::PlayListEnqueueMode enqueueMode,
+                                                    ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
     QtConcurrent::run(&mThreadPool, [=] () {
         QReadLocker locker(&mDataLock);
-        auto allArtists = QStringList();
+        auto allArtists = ElisaUtils::EntryDataList{};
         allArtists.reserve(rowCount());
         for (int rowIndex = 0, maxRowCount = rowCount(); rowIndex < maxRowCount; ++rowIndex) {
             auto currentIndex = index(rowIndex, 0);
-            allArtists.push_back(data(currentIndex, Qt::DisplayRole).toString());
+            allArtists.push_back({data(currentIndex, DatabaseInterface::DatabaseIdRole).toULongLong(), data(currentIndex, Qt::DisplayRole).toString()});
         }
         Q_EMIT artistToEnqueue(allArtists,
-                               ElisaUtils::AppendPlayList,
-                               ElisaUtils::DoNotTriggerPlay);
+                               ElisaUtils::Artist,
+                               enqueueMode,
+                               triggerPlay);
     });
 }
 
+void AllArtistsProxyModel::enqueueToPlayList()
+{
+    genericEnqueueToPlayList(ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
+}
+
 void AllArtistsProxyModel::replaceAndPlayOfPlayList()
 {
-    QtConcurrent::run(&mThreadPool, [=] () {
-        QReadLocker locker(&mDataLock);
-        auto allArtists = QStringList();
-        allArtists.reserve(rowCount());
-        for (int rowIndex = 0, maxRowCount = rowCount(); rowIndex < maxRowCount; ++rowIndex) {
-            auto currentIndex = index(rowIndex, 0);
-            allArtists.push_back(data(currentIndex, Qt::DisplayRole).toString());
-        }
-        Q_EMIT artistToEnqueue(allArtists,
-                               ElisaUtils::ReplacePlayList,
-                               ElisaUtils::TriggerPlay);
-    });
+    genericEnqueueToPlayList(ElisaUtils::ReplacePlayList, ElisaUtils::TriggerPlay);
 }
 
 
 #include "moc_allartistsproxymodel.cpp"
diff --git a/src/models/allartistsproxymodel.h b/src/models/allartistsproxymodel.h
index 92a37d7f..46b4320a 100644
--- a/src/models/allartistsproxymodel.h
+++ b/src/models/allartistsproxymodel.h
@@ -1,56 +1,62 @@
 /*
  * Copyright 2017 Alexander Stippich <a.stippich@gmx.net>
  * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef ALLARTISTSPROXYMODEL_H
 #define ALLARTISTSPROXYMODEL_H
 
 #include "elisaLib_export.h"
 
 #include "abstractmediaproxymodel.h"
 #include "elisautils.h"
 
 class ELISALIB_EXPORT AllArtistsProxyModel : public AbstractMediaProxyModel
 {
     Q_OBJECT
 
 public:
 
     explicit AllArtistsProxyModel(QObject *parent = nullptr);
 
     ~AllArtistsProxyModel() override;
 
 Q_SIGNALS:
 
-    void artistToEnqueue(QList<QString> artistNames,
+    void artistToEnqueue(const ElisaUtils::EntryDataList &newEntries,
+                         ElisaUtils::PlayListEntryType databaseIdType,
                          ElisaUtils::PlayListEnqueueMode enqueueMode,
                          ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
 public Q_SLOTS:
 
     void enqueueToPlayList();
 
     void replaceAndPlayOfPlayList();
 
 protected:
 
     bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
 
+private:
+
+    void genericEnqueueToPlayList(ElisaUtils::PlayListEnqueueMode enqueueMode,
+                                  ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
+
 };
 
 
 #endif // ALLARTISTSPROXYMODEL_H
diff --git a/src/models/filebrowserproxymodel.cpp b/src/models/filebrowserproxymodel.cpp
index f760eeb7..095c6280 100644
--- a/src/models/filebrowserproxymodel.cpp
+++ b/src/models/filebrowserproxymodel.cpp
@@ -1,198 +1,203 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  * Copyright 2018 Alexander Stippich <a.stippich@gmx.net>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "filebrowserproxymodel.h"
 
 #include "filebrowsermodel.h"
 
 #include <QReadLocker>
 #include <QtConcurrentRun>
 #include <QDir>
 #include <KIOWidgets/KDirLister>
 #include "elisautils.h"
 
 FileBrowserProxyModel::FileBrowserProxyModel(QObject *parent) : KDirSortFilterProxyModel(parent)
 {
     setFilterCaseSensitivity(Qt::CaseInsensitive);
     mThreadPool.setMaxThreadCount(1);
     mFileModel = std::make_unique<FileBrowserModel>();
     setSourceModel(mFileModel.get());
     setSortFoldersFirst(true);
     sort(Qt::AscendingOrder);
     connect(mFileModel.get(), &FileBrowserModel::urlChanged,this, &FileBrowserProxyModel::urlChanged);
     mTopFolder = QDir::homePath();
     openFolder(mTopFolder, true);
 }
 
 FileBrowserProxyModel::~FileBrowserProxyModel() = default;
 
 QString FileBrowserProxyModel::filterText() const
 {
     return mFilterText;
 }
 
 void FileBrowserProxyModel::setFilterText(const QString &filterText)
 {
     QWriteLocker writeLocker(&mDataLock);
 
     if (mFilterText == filterText)
         return;
 
     mFilterText = filterText;
 
     mFilterExpression.setPattern(mFilterText);
     mFilterExpression.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
     mFilterExpression.optimize();
 
     invalidate();
 
     Q_EMIT filterTextChanged(mFilterText);
 }
 
 bool FileBrowserProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     bool result = false;
 
     for (int column = 0, columnCount = sourceModel()->columnCount(source_parent); column < columnCount; ++column) {
         auto currentIndex = sourceModel()->index(source_row, column, source_parent);
 
         const auto &nameValue = sourceModel()->data(currentIndex, FileBrowserModel::NameRole).toString();
 
         if (mFilterExpression.match(nameValue).hasMatch()) {
             result = true;
             continue;
         }
 
         if (result) {
             continue;
         }
 
         if (!result) {
             break;
         }
     }
 
     return result;
 }
 
 void FileBrowserProxyModel::enqueueToPlayList()
 {
     QtConcurrent::run(&mThreadPool, [=] () {
         QReadLocker locker(&mDataLock);
-        auto allTrackUrls = QList<QUrl>();
+        auto allTrackUrls = ElisaUtils::EntryDataList{};
         for (int rowIndex = 0, maxRowCount = rowCount(); rowIndex < maxRowCount; ++rowIndex) {
             auto currentIndex = index(rowIndex, 0);
             if (!data(currentIndex, FileBrowserModel::DirectoryRole).toBool()) {
-                allTrackUrls.push_back(data(currentIndex, FileBrowserModel::ContainerDataRole).toUrl());
+                allTrackUrls.push_back({0, data(currentIndex, FileBrowserModel::ContainerDataRole).toString()});
             }
         }
         Q_EMIT filesToEnqueue(allTrackUrls,
+                              ElisaUtils::FileName,
                               ElisaUtils::AppendPlayList,
                               ElisaUtils::DoNotTriggerPlay);
     });
 }
 
 void FileBrowserProxyModel::replaceAndPlayOfPlayList()
 {
     QtConcurrent::run(&mThreadPool, [=] () {
         QReadLocker locker(&mDataLock);
-        auto allTrackUrls = QList<QUrl>();
+        auto allTrackUrls = ElisaUtils::EntryDataList{};
         for (int rowIndex = 0, maxRowCount = rowCount(); rowIndex < maxRowCount; ++rowIndex) {
             auto currentIndex = index(rowIndex, 0);
             if (!data(currentIndex, FileBrowserModel::DirectoryRole).toBool()) {
-                allTrackUrls.push_back(data(currentIndex, FileBrowserModel::ContainerDataRole).toUrl());
+                allTrackUrls.push_back({0, data(currentIndex, FileBrowserModel::ContainerDataRole).toString()});
             }
         }
         Q_EMIT filesToEnqueue(allTrackUrls,
+                              ElisaUtils::FileName,
                               ElisaUtils::ReplacePlayList,
                               ElisaUtils::TriggerPlay);
     });
 }
 
 void FileBrowserProxyModel::replaceAndPlayOfUrl(const QUrl &fileUrl)
 {
     if (mMimeDb.mimeTypeForUrl(fileUrl).inherits(QStringLiteral("audio/x-mpegurl")))
     {
         Q_EMIT loadPlayListFromUrl(fileUrl);
     } else {
-        Q_EMIT replaceAndPlayFileByUrl(fileUrl);
+        Q_EMIT filesToEnqueue({{0, fileUrl.toString()}},
+                              ElisaUtils::FileName,
+                              ElisaUtils::ReplacePlayList,
+                              ElisaUtils::TriggerPlay);
     }
 }
 
 QString FileBrowserProxyModel::parentFolder() const
 {
     //return to the top folder if parent directory does not exist
     QDir dir(mFileModel->dirLister()->url().toLocalFile());
     if (dir.cdUp()) {
         return dir.path();
     } else {
         return mTopFolder;
     }
 }
 
 void FileBrowserProxyModel::openParentFolder()
 {
     if (canGoBack()) {
         QString parent = parentFolder();
         mFileModel->setUrl(parent);
         if (parent == mTopFolder) {
             Q_EMIT canGoBackChanged();
         }
     }
 }
 
 bool FileBrowserProxyModel::canGoBack() const
 {
     return mFileModel->dirLister()->url().toLocalFile() != mTopFolder;
 }
 
 void FileBrowserProxyModel::openFolder(const QString &folder, bool isDisplayRoot)
 {
     if (folder.isEmpty()) {
         return;
     }
     mFileModel->setUrl(folder);
     if (!isDisplayRoot) {
         Q_EMIT canGoBackChanged();
     }
 }
 
 MusicAudioTrack FileBrowserProxyModel::loadMetaDataFromUrl(const QUrl &url)
 {
     auto newTrack = mFileScanner.scanOneFile(url, mMimeDb);
     qDebug() << "loaded metadata " << url << newTrack;
     return newTrack;
 }
 
 QString FileBrowserProxyModel::url() const
 {
     return mFileModel->dirLister()->url().toLocalFile();
 }
 
 bool FileBrowserProxyModel::sortedAscending() const
 {
     return sortOrder() ? false : true;
 }
 
 void FileBrowserProxyModel::sortModel(Qt::SortOrder order)
 {
     this->sort(0,order);
     Q_EMIT sortedAscendingChanged();
 }
 
 #include "moc_filebrowserproxymodel.cpp"
diff --git a/src/models/filebrowserproxymodel.h b/src/models/filebrowserproxymodel.h
index 2750b943..a7ced0c1 100644
--- a/src/models/filebrowserproxymodel.h
+++ b/src/models/filebrowserproxymodel.h
@@ -1,133 +1,132 @@
 /*
  * Copyright 2016-2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  * Copyright 2018 Alexander Stippich <a.stippich@gmx.net>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef FILEBROWSERPROXYMODEL_H
 #define FILEBROWSERPROXYMODEL_H
 
 #include "elisaLib_export.h"
 
 #include "filebrowsermodel.h"
 #include "musicaudiotrack.h"
 #include "filescanner.h"
 #include "elisautils.h"
 
 #include <KIOFileWidgets/KDirSortFilterProxyModel>
 #include <QRegularExpression>
 #include <QReadWriteLock>
 #include <QThreadPool>
 
 #include <memory>
 
 class ELISALIB_EXPORT FileBrowserProxyModel : public KDirSortFilterProxyModel
 {
     Q_OBJECT
 
     Q_PROPERTY(QString filterText
                READ filterText
                WRITE setFilterText
                NOTIFY filterTextChanged)
 
     Q_PROPERTY(bool canGoBack
                READ canGoBack
                NOTIFY canGoBackChanged)
 
     Q_PROPERTY(QString url
                READ url
                NOTIFY urlChanged)
 
     Q_PROPERTY(bool sortedAscending
                READ sortedAscending
                NOTIFY sortedAscendingChanged)
 
 public:
 
     explicit FileBrowserProxyModel(QObject *parent = nullptr);
 
     ~FileBrowserProxyModel() override;
 
     QString filterText() const;
 
     QString url() const;
 
     bool canGoBack() const;
 
     Q_INVOKABLE MusicAudioTrack loadMetaDataFromUrl(const QUrl &url);
 
     bool sortedAscending() const;
 
 public Q_SLOTS:
 
     void enqueueToPlayList();
 
     void replaceAndPlayOfPlayList();
 
     void setFilterText(const QString &filterText);
 
     void openParentFolder();
 
     void openFolder(const QString &folder, bool isDisplayRoot = false);
 
     void sortModel(Qt::SortOrder order);
 
     void replaceAndPlayOfUrl(const QUrl &fileUrl);
 
 Q_SIGNALS:
 
-    void filesToEnqueue(QList<QUrl> newFiles,
+    void filesToEnqueue(const ElisaUtils::EntryDataList &newFiles,
+                        ElisaUtils::PlayListEntryType databaseIdType,
                         ElisaUtils::PlayListEnqueueMode enqueueMode,
                         ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
 
     void urlChanged();
 
     void canGoBackChanged();
 
     void filterTextChanged(const QString &filterText);
 
     void sortedAscendingChanged();
 
-    void replaceAndPlayFileByUrl(const QUrl &fileUrl);
-
     void loadPlayListFromUrl(const QUrl &playListUrl);
 
 protected:
 
     bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
 
 private:
 
     QString parentFolder() const;
 
     QString mTopFolder;
 
     FileScanner mFileScanner;
 
     QMimeDatabase mMimeDb;
 
     QString mFilterText;
 
     QRegularExpression mFilterExpression;
 
     QReadWriteLock mDataLock;
 
     QThreadPool mThreadPool;
 
     std::unique_ptr<FileBrowserModel> mFileModel;
 
 };
 
 #endif // FILEBROWSERPROXYMODEL_H
diff --git a/src/musiclistenersmanager.cpp b/src/musiclistenersmanager.cpp
index 7e33298a..93278269 100644
--- a/src/musiclistenersmanager.cpp
+++ b/src/musiclistenersmanager.cpp
@@ -1,487 +1,486 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "musiclistenersmanager.h"
 
 #include "config-upnp-qt.h"
 
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
 #include "upnp/upnplistener.h"
 #endif
 
 #if defined KF5Baloo_FOUND && KF5Baloo_FOUND
 #include "baloo/baloolistener.h"
 #endif
 
 #include "databaseinterface.h"
 #include "mediaplaylist.h"
 #include "file/filelistener.h"
 #include "file/localfilelisting.h"
 #include "trackslistener.h"
 #include "notificationitem.h"
 #include "elisaapplication.h"
 #include "elisa_settings.h"
 #include "models/albummodel.h"
 #include "models/abstractmediaproxymodel.h"
 #include "models/allalbumsproxymodel.h"
 #include "models/allartistsproxymodel.h"
 #include "models/alltracksproxymodel.h"
 #include "models/singleartistproxymodel.h"
 #include "models/singlealbumproxymodel.h"
 #include "models/allalbumsmodel.h"
 #include "models/allartistsmodel.h"
 #include "models/alltracksmodel.h"
 #include "models/allgenresmodel.h"
 
 #include <KI18n/KLocalizedString>
 
 #include <QThread>
 #include <QMutex>
 #include <QStandardPaths>
 #include <QDir>
 #include <QCoreApplication>
 #include <QList>
 #include <QScopedPointer>
 #include <QPointer>
 #include <QFileSystemWatcher>
 
 #include <QAction>
 
 #include <list>
 
 class MusicListenersManagerPrivate
 {
 public:
 
     QThread mDatabaseThread;
 
     QThread mListenerThread;
 
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
     UpnpListener mUpnpListener;
 #endif
 
 #if defined KF5Baloo_FOUND && KF5Baloo_FOUND
     std::unique_ptr<BalooListener> mBalooListener;
 #endif
 
     std::list<std::unique_ptr<FileListener>> mFileListener;
 
     DatabaseInterface mDatabaseInterface;
 
     std::unique_ptr<TracksListener> mTracksListener;
 
     QFileSystemWatcher mConfigFileWatcher;
 
     ElisaApplication *mElisaApplication = nullptr;
 
     AllAlbumsModel mAllAlbumsModel;
 
     AllArtistsModel mAllArtistsModel;
 
     AllTracksModel mAllTracksModel;
 
     AllGenresModel mAllGenresModel;
 
     //GenericDataModel mAllComposersModel;
 
     //GenericDataModel mAllLyricistsModel;
 
     AlbumModel mAlbumModel;
 
     int mImportedTracksCount = 0;
 
     int mActiveMusicListenersCount = 0;
 
     bool mIndexingRunning = false;
 
     bool mIndexerBusy = false;
 
 };
 
 MusicListenersManager::MusicListenersManager(QObject *parent)
     : QObject(parent), d(std::make_unique<MusicListenersManagerPrivate>())
 {
     d->mListenerThread.start();
     d->mDatabaseThread.start();
 
     d->mDatabaseInterface.moveToThread(&d->mDatabaseThread);
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::requestsInitDone,
             this, &MusicListenersManager::databaseReady);
 
     const auto &localDataPaths = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
     auto databaseFileName = QString();
     if (!localDataPaths.isEmpty()) {
         QDir myDataDirectory;
         myDataDirectory.mkpath(localDataPaths.first());
         databaseFileName = localDataPaths.first() + QStringLiteral("/elisaDatabase.db");
     }
 
     QMetaObject::invokeMethod(&d->mDatabaseInterface, "init", Qt::QueuedConnection,
                               Q_ARG(QString, QStringLiteral("listeners")), Q_ARG(QString, databaseFileName));
 
     connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
             this, &MusicListenersManager::applicationAboutToQuit);
 
     connect(Elisa::ElisaConfiguration::self(), &Elisa::ElisaConfiguration::configChanged,
             this, &MusicListenersManager::configChanged);
 
     connect(&d->mConfigFileWatcher, &QFileSystemWatcher::fileChanged,
             this, &MusicListenersManager::configChanged);
 
     auto initialRootPath = Elisa::ElisaConfiguration::rootPath();
     if (initialRootPath.isEmpty()) {
         auto systemMusicPaths = QStandardPaths::standardLocations(QStandardPaths::MusicLocation);
         for (const auto &musicPath : qAsConst(systemMusicPaths)) {
             initialRootPath.push_back(musicPath);
         }
 
         Elisa::ElisaConfiguration::setRootPath(initialRootPath);
         Elisa::ElisaConfiguration::self()->save();
     }
 
     d->mConfigFileWatcher.addPath(Elisa::ElisaConfiguration::self()->config()->name());
 
     d->mAllAlbumsModel.setAllArtists(&d->mAllArtistsModel);
     d->mAllArtistsModel.setAllAlbums(&d->mAllAlbumsModel);
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::albumsAdded,
             &d->mAllAlbumsModel, &AllAlbumsModel::albumsAdded);
     connect(&d->mDatabaseInterface, &DatabaseInterface::albumModified,
             &d->mAllAlbumsModel, &AllAlbumsModel::albumModified);
     connect(&d->mDatabaseInterface, &DatabaseInterface::albumRemoved,
             &d->mAllAlbumsModel, &AllAlbumsModel::albumRemoved);
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::artistsAdded,
             &d->mAllArtistsModel, &AllArtistsModel::artistsAdded);
     connect(&d->mDatabaseInterface, &DatabaseInterface::artistRemoved,
             &d->mAllArtistsModel, &AllArtistsModel::artistRemoved);
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::tracksAdded,
             &d->mAllTracksModel, &AllTracksModel::tracksAdded);
     connect(&d->mDatabaseInterface, &DatabaseInterface::trackModified,
             &d->mAllTracksModel, &AllTracksModel::trackModified);
     connect(&d->mDatabaseInterface, &DatabaseInterface::trackRemoved,
             &d->mAllTracksModel, &AllTracksModel::trackRemoved);
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::genresAdded,
             &d->mAllGenresModel, &AllGenresModel::genresAdded);
     /*connect(&d->mDatabaseInterface, &DatabaseInterface::trackModified,
             &d->mAllGenresModel, &AllTracksModel::trackModified);
     connect(&d->mDatabaseInterface, &DatabaseInterface::trackRemoved,
             &d->mAllGenresModel, &AllTracksModel::trackRemoved);*/
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::albumModified,
             &d->mAlbumModel, &AlbumModel::albumModified);
     connect(&d->mDatabaseInterface, &DatabaseInterface::albumRemoved,
             &d->mAlbumModel, &AlbumModel::albumRemoved);
     connect(&d->mAlbumModel, &AlbumModel::requestAlbumData,
             &d->mDatabaseInterface, &DatabaseInterface::getAlbumFromAlbumId);
     connect(&d->mDatabaseInterface, &DatabaseInterface::sentAlbumData,
             &d->mAlbumModel, &AlbumModel::setAlbumData);
 
     connect(&d->mDatabaseInterface, &DatabaseInterface::tracksAdded,
             this, &MusicListenersManager::increaseImportedTracksCount);
 }
 
 MusicListenersManager::~MusicListenersManager()
 = default;
 
 DatabaseInterface *MusicListenersManager::viewDatabase() const
 {
     return &d->mDatabaseInterface;
 }
 
 void MusicListenersManager::subscribeForTracks(MediaPlayList *client)
 {
     createTracksListener();
     connect(d->mTracksListener.get(), &TracksListener::trackHasChanged, client, &MediaPlayList::trackChanged);
     connect(d->mTracksListener.get(), &TracksListener::trackHasBeenRemoved, client, &MediaPlayList::trackRemoved);
-    connect(d->mTracksListener.get(), &TracksListener::albumAdded, client, &MediaPlayList::albumAdded);
+    connect(d->mTracksListener.get(), &TracksListener::tracksListAdded, client, &MediaPlayList::tracksListAdded);
     connect(client, &MediaPlayList::newEntryInList, d->mTracksListener.get(), &TracksListener::newEntryInList);
     connect(client, &MediaPlayList::newTrackByNameInList, d->mTracksListener.get(), &TracksListener::trackByNameInList);
-    connect(client, &MediaPlayList::newTrackByFileNameInList, d->mTracksListener.get(), &TracksListener::trackByFileNameInList);
 }
 
 int MusicListenersManager::importedTracksCount() const
 {
     return d->mImportedTracksCount;
 }
 
 bool MusicListenersManager::isIndexingRunning() const
 {
     return d->mIndexingRunning;
 }
 
 ElisaApplication *MusicListenersManager::elisaApplication() const
 {
     return d->mElisaApplication;
 }
 
 QAbstractItemModel *MusicListenersManager::allAlbumsModel() const
 {
     return &d->mAllAlbumsModel;
 }
 
 QAbstractItemModel *MusicListenersManager::allArtistsModel() const
 {
     return &d->mAllArtistsModel;
 }
 
 QAbstractItemModel *MusicListenersManager::allTracksModel() const
 {
     return &d->mAllTracksModel;
 }
 
 QAbstractItemModel *MusicListenersManager::allGenresModel() const
 {
     return &d->mAllGenresModel;
 }
 
 QAbstractItemModel *MusicListenersManager::allLyricistsModel() const
 {
     return nullptr;/*&d->mAllLyricistsModel;*/
 }
 
 QAbstractItemModel *MusicListenersManager::allComposersModel() const
 {
     return nullptr;/*&d->mAllComposersModel;*/
 }
 
 QAbstractItemModel *MusicListenersManager::albumModel() const
 {
     return &d->mAlbumModel;
 }
 
 bool MusicListenersManager::indexerBusy() const
 {
     return d->mIndexerBusy;
 }
 
 void MusicListenersManager::databaseReady()
 {
     d->mIndexerBusy = true;
     Q_EMIT indexerBusyChanged();
 
     configChanged();
 }
 
 void MusicListenersManager::applicationAboutToQuit()
 {
     d->mDatabaseInterface.applicationAboutToQuit();
 
     Q_EMIT applicationIsTerminating();
 
     d->mDatabaseThread.exit();
     d->mDatabaseThread.wait();
 
     d->mListenerThread.exit();
     d->mListenerThread.wait();
 }
 
 void MusicListenersManager::showConfiguration()
 {
     auto configureAction = d->mElisaApplication->action(QStringLiteral("options_configure"));
 
     configureAction->trigger();
 }
 
 void MusicListenersManager::setElisaApplication(ElisaApplication *elisaApplication)
 {
     if (d->mElisaApplication == elisaApplication) {
         return;
     }
 
     d->mElisaApplication = elisaApplication;
     emit elisaApplicationChanged();
 }
 
-void MusicListenersManager::playBackError(QUrl sourceInError, QMediaPlayer::Error playerError)
+void MusicListenersManager::playBackError(const QUrl &sourceInError, QMediaPlayer::Error playerError)
 {
     qDebug() << "MusicListenersManager::playBackError" << sourceInError;
 
     if (playerError == QMediaPlayer::ResourceError) {
         Q_EMIT removeTracksInError({sourceInError});
 
         if (sourceInError.isLocalFile()) {
             Q_EMIT displayTrackError(sourceInError.toLocalFile());
         } else {
             Q_EMIT displayTrackError(sourceInError.toString());
         }
     }
 }
 
 void MusicListenersManager::configChanged()
 {
     auto currentConfiguration = Elisa::ElisaConfiguration::self();
 
     d->mConfigFileWatcher.addPath(currentConfiguration->config()->name());
 
     currentConfiguration->load();
 
 #if defined KF5Baloo_FOUND && KF5Baloo_FOUND
     if (currentConfiguration->balooIndexer() && !d->mBalooListener) {
         d->mBalooListener = std::make_unique<BalooListener>();
         d->mBalooListener->moveToThread(&d->mListenerThread);
         d->mBalooListener->setDatabaseInterface(&d->mDatabaseInterface);
         connect(this, &MusicListenersManager::applicationIsTerminating,
                 d->mBalooListener.get(), &BalooListener::applicationAboutToQuit, Qt::DirectConnection);
         connect(d->mBalooListener.get(), &BalooListener::indexingStarted,
                 this, &MusicListenersManager::monitorStartingListeners);
         connect(d->mBalooListener.get(), &BalooListener::indexingFinished,
                 this, &MusicListenersManager::monitorEndingListeners);
         connect(d->mBalooListener.get(), &BalooListener::clearDatabase,
                 &d->mDatabaseInterface, &DatabaseInterface::removeAllTracksFromSource);
         connect(d->mBalooListener.get(), &BalooListener::newNotification,
                 this, &MusicListenersManager::newNotification);
         connect(d->mBalooListener.get(), &BalooListener::closeNotification,
                 this, &MusicListenersManager::closeNotification);
     } else if (!currentConfiguration->balooIndexer() && d->mBalooListener) {
         QMetaObject::invokeMethod(d->mBalooListener.get(), "quitListener", Qt::QueuedConnection);
         d->mBalooListener.reset();
     }
 #endif
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
     d->mUpnpListener.setDatabaseInterface(&d->mDatabaseInterface);
     d->mUpnpListener.moveToThread(&d->mDatabaseThread);
     connect(this, &MusicListenersManager::applicationIsTerminating,
             &d->mUpnpListener, &UpnpListener::applicationAboutToQuit, Qt::DirectConnection);
 #endif
 
     if (currentConfiguration->elisaFilesIndexer())
     {
         const auto &allRootPaths = currentConfiguration->rootPath();
         for (auto itFileListener = d->mFileListener.begin(); itFileListener != d->mFileListener.end(); ) {
             const auto &currentRootPath = (*itFileListener)->localFileIndexer().rootPath();
             auto itPath = std::find(allRootPaths.begin(), allRootPaths.end(), currentRootPath);
 
             if (itPath == allRootPaths.end()) {
                 d->mDatabaseInterface.removeAllTracksFromSource((*itFileListener)->fileListing()->sourceName());
                 itFileListener = d->mFileListener.erase(itFileListener);
             } else {
                 ++itFileListener;
             }
         }
 
         for (const auto &oneRootPath : allRootPaths) {
             auto itPath = std::find_if(d->mFileListener.begin(), d->mFileListener.end(),
                                        [&oneRootPath](const auto &value)->bool {return value->localFileIndexer().rootPath() == oneRootPath;});
             if (itPath == d->mFileListener.end()) {
                 auto newFileIndexer = std::make_unique<FileListener>();
 
                 newFileIndexer->setDatabaseInterface(&d->mDatabaseInterface);
                 newFileIndexer->moveToThread(&d->mListenerThread);
                 connect(this, &MusicListenersManager::applicationIsTerminating,
                         newFileIndexer.get(), &FileListener::applicationAboutToQuit, Qt::DirectConnection);
                 connect(newFileIndexer.get(), &FileListener::indexingStarted,
                         this, &MusicListenersManager::monitorStartingListeners);
                 connect(newFileIndexer.get(), &FileListener::indexingFinished,
                         this, &MusicListenersManager::monitorEndingListeners);
                 connect(newFileIndexer.get(), &FileListener::newNotification,
                         this, &MusicListenersManager::newNotification);
                 connect(newFileIndexer.get(), &FileListener::closeNotification,
                         this, &MusicListenersManager::closeNotification);
 
                 newFileIndexer->setRootPath(oneRootPath);
 
                 d->mFileListener.emplace_back(std::move(newFileIndexer));
             }
         }
     }
 }
 
 void MusicListenersManager::increaseImportedTracksCount(const DatabaseInterface::ListTrackDataType &allTracks)
 {
     d->mImportedTracksCount += allTracks.size();
 
     if (d->mImportedTracksCount && d->mIndexerBusy) {
         d->mIndexerBusy = false;
         Q_EMIT indexerBusyChanged();
     }
 
     if (d->mImportedTracksCount >= 4) {
         Q_EMIT closeNotification(QStringLiteral("notEnoughTracks"));
     }
 
     Q_EMIT importedTracksCountChanged();
 }
 
 void MusicListenersManager::decreaseImportedTracksCount()
 {
     --d->mImportedTracksCount;
 
     Q_EMIT importedTracksCountChanged();
 }
 
 void MusicListenersManager::monitorStartingListeners()
 {
     if (d->mActiveMusicListenersCount == 0) {
         d->mIndexingRunning = true;
         Q_EMIT indexingRunningChanged();
     }
 
     ++d->mActiveMusicListenersCount;
 }
 
 void MusicListenersManager::monitorEndingListeners()
 {
     --d->mActiveMusicListenersCount;
 
     if (d->mActiveMusicListenersCount == 0) {
         if (d->mImportedTracksCount < 4 && d->mElisaApplication) {
             NotificationItem notEnoughTracks;
 
             notEnoughTracks.setNotificationId(QStringLiteral("notEnoughTracks"));
 
             notEnoughTracks.setTargetObject(this);
 
             notEnoughTracks.setMessage(i18nc("No track found message", "No track have been found"));
 
             auto configureAction = d->mElisaApplication->action(QStringLiteral("options_configure"));
 
             notEnoughTracks.setMainButtonText(configureAction->text());
             notEnoughTracks.setMainButtonIconName(configureAction->icon().name());
             notEnoughTracks.setMainButtonMethodName(QStringLiteral("showConfiguration"));
 
             Q_EMIT newNotification(notEnoughTracks);
         }
 
         d->mIndexingRunning = false;
         Q_EMIT indexingRunningChanged();
 
         //QMetaObject::invokeMethod(&d->mDatabaseInterface, "cleanInvalidTracks", Qt::QueuedConnection);
     }
 }
 
 void MusicListenersManager::createTracksListener()
 {
     if (!d->mTracksListener) {
         d->mTracksListener = std::make_unique<TracksListener>(&d->mDatabaseInterface);
         d->mTracksListener->moveToThread(&d->mDatabaseThread);
 
         connect(this, &MusicListenersManager::removeTracksInError,
                 &d->mDatabaseInterface, &DatabaseInterface::removeTracksList);
 
         connect(&d->mDatabaseInterface, &DatabaseInterface::trackRemoved, d->mTracksListener.get(), &TracksListener::trackRemoved);
         connect(&d->mDatabaseInterface, &DatabaseInterface::tracksAdded, d->mTracksListener.get(), &TracksListener::tracksAdded);
         connect(&d->mDatabaseInterface, &DatabaseInterface::trackModified, d->mTracksListener.get(), &TracksListener::trackModified);
     }
 }
 
 
 #include "moc_musiclistenersmanager.cpp"
diff --git a/src/musiclistenersmanager.h b/src/musiclistenersmanager.h
index aca92298..dbb30c6b 100644
--- a/src/musiclistenersmanager.h
+++ b/src/musiclistenersmanager.h
@@ -1,178 +1,178 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef MUSICLISTENERSMANAGER_H
 #define MUSICLISTENERSMANAGER_H
 
 #include "elisaLib_export.h"
 
 #include "notificationitem.h"
 #include "databaseinterface.h"
 
 #include <QObject>
 #include <QMediaPlayer>
 
 #include <memory>
 
 class MusicListenersManagerPrivate;
 class MediaPlayList;
 class NotificationItem;
 class ElisaApplication;
 class QAbstractItemModel;
 class AbstractMediaProxyModel;
 
 class ELISALIB_EXPORT MusicListenersManager : public QObject
 {
 
     Q_OBJECT
 
     Q_PROPERTY(DatabaseInterface* viewDatabase
                READ viewDatabase
                NOTIFY viewDatabaseChanged)
 
     Q_PROPERTY(int importedTracksCount
                READ importedTracksCount
                NOTIFY importedTracksCountChanged)
 
     Q_PROPERTY(bool indexingRunning
                READ isIndexingRunning
                NOTIFY indexingRunningChanged)
 
     Q_PROPERTY(ElisaApplication* elisaApplication
                READ elisaApplication
                WRITE setElisaApplication
                NOTIFY elisaApplicationChanged)
 
     Q_PROPERTY(QAbstractItemModel* allAlbumsModel
                READ allAlbumsModel
                CONSTANT)
 
     Q_PROPERTY(QAbstractItemModel* allArtistsModel
                READ allArtistsModel
                CONSTANT)
 
     Q_PROPERTY(QAbstractItemModel* allTracksModel
                READ allTracksModel
                CONSTANT)
 
     Q_PROPERTY(QAbstractItemModel* allGenresModel
                READ allGenresModel
                CONSTANT)
 
     Q_PROPERTY(QAbstractItemModel* allLyricistsModel
                READ allLyricistsModel
                CONSTANT)
 
     Q_PROPERTY(QAbstractItemModel* allComposersModel
                READ allComposersModel
                CONSTANT)
 
     Q_PROPERTY(QAbstractItemModel* albumModel
                READ albumModel
                CONSTANT)
 
     Q_PROPERTY(bool indexerBusy
                READ indexerBusy
                NOTIFY indexerBusyChanged)
 
 public:
 
     explicit MusicListenersManager(QObject *parent = nullptr);
 
     ~MusicListenersManager() override;
 
     DatabaseInterface* viewDatabase() const;
 
     void subscribeForTracks(MediaPlayList *client);
 
     int importedTracksCount() const;
 
     bool isIndexingRunning() const;
 
     ElisaApplication* elisaApplication() const;
 
     QAbstractItemModel *allAlbumsModel() const;
 
     QAbstractItemModel *allArtistsModel() const;
 
     QAbstractItemModel *allTracksModel() const;
 
     QAbstractItemModel *allGenresModel() const;
 
     QAbstractItemModel *allLyricistsModel() const;
 
     QAbstractItemModel *allComposersModel() const;
 
     QAbstractItemModel *albumModel() const;
 
     bool indexerBusy() const;
 
 Q_SIGNALS:
 
     void viewDatabaseChanged();
 
     void applicationIsTerminating();
 
     void importedTracksCountChanged();
 
     void indexingRunningChanged();
 
     void newNotification(NotificationItem notification);
 
     void closeNotification(QString notificationId);
 
     void elisaApplicationChanged();
 
     void removeTracksInError(QList<QUrl> tracks);
 
     void displayTrackError(const QString &fileName);
 
     void indexerBusyChanged();
 
 public Q_SLOTS:
 
     void databaseReady();
 
     void applicationAboutToQuit();
 
     void showConfiguration();
 
     void setElisaApplication(ElisaApplication* elisaApplication);
 
-    void playBackError(QUrl sourceInError, QMediaPlayer::Error playerError);
+    void playBackError(const QUrl &sourceInError, QMediaPlayer::Error playerError);
 
 private Q_SLOTS:
 
     void configChanged();
 
     void increaseImportedTracksCount(const DatabaseInterface::ListTrackDataType &allTracks);
 
     void decreaseImportedTracksCount();
 
     void monitorStartingListeners();
 
     void monitorEndingListeners();
 
 private:
 
     std::unique_ptr<MusicListenersManagerPrivate> d;
 
     void createTracksListener();
 
 };
 
 #endif // MUSICLISTENERSMANAGER_H
diff --git a/src/trackslistener.cpp b/src/trackslistener.cpp
index ecdac0e3..3d0aa9c1 100644
--- a/src/trackslistener.cpp
+++ b/src/trackslistener.cpp
@@ -1,216 +1,226 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "trackslistener.h"
 
 #include "databaseinterface.h"
 #include "filescanner.h"
 
 #include <QMimeDatabase>
 #include <QSet>
 #include <QList>
 #include <QDebug>
 
 #include <array>
 #include <algorithm>
 
 class TracksListenerPrivate
 {
 public:
 
     QSet<qulonglong> mTracksByIdSet;
 
     QList<std::tuple<QString, QString, QString, int, int>> mTracksByNameSet;
 
     QList<QUrl> mTracksByFileNameSet;
 
     DatabaseInterface *mDatabase = nullptr;
 
     FileScanner mFileScanner;
 
     QMimeDatabase mMimeDb;
 
 };
 
 TracksListener::TracksListener(DatabaseInterface *database, QObject *parent) : QObject(parent), d(std::make_unique<TracksListenerPrivate>())
 {
     d->mDatabase = database;
 }
 
 TracksListener::~TracksListener()
 = default;
 
 void TracksListener::tracksAdded(const ListTrackDataType &allTracks)
 {
     for (const auto &oneTrack : allTracks) {
         if (d->mTracksByIdSet.contains(oneTrack.databaseId())) {
             Q_EMIT trackHasChanged(oneTrack);
         }
 
         if (d->mTracksByNameSet.isEmpty()) {
             return;
         }
 
         for (auto itTrack = d->mTracksByNameSet.begin(); itTrack != d->mTracksByNameSet.end(); ) {
             if (std::get<0>(*itTrack) != oneTrack.title()) {
                 ++itTrack;
                 continue;
             }
 
             if (std::get<1>(*itTrack) != oneTrack.artist()) {
                 ++itTrack;
                 continue;
             }
 
             if (std::get<2>(*itTrack) != oneTrack.album()) {
                 ++itTrack;
                 continue;
             }
 
             if (std::get<3>(*itTrack) != oneTrack.trackNumber()) {
                 ++itTrack;
                 continue;
             }
 
             if (std::get<4>(*itTrack) != oneTrack.discNumber()) {
                 ++itTrack;
                 continue;
             }
 
             Q_EMIT trackHasChanged(TrackDataType(oneTrack));
 
             d->mTracksByIdSet.insert(oneTrack.databaseId());
             itTrack = d->mTracksByNameSet.erase(itTrack);
         }
     }
 }
 
 void TracksListener::trackRemoved(qulonglong id)
 {
     if (d->mTracksByIdSet.contains(id)) {
         Q_EMIT trackHasBeenRemoved(id);
     }
 }
 
 void TracksListener::trackModified(const TrackDataType &modifiedTrack)
 {
     if (d->mTracksByIdSet.contains(modifiedTrack.databaseId())) {
         Q_EMIT trackHasChanged(modifiedTrack);
     }
 }
 
 void TracksListener::trackByNameInList(const QString &title, const QString &artist, const QString &album, int trackNumber, int discNumber)
 {
     auto newTrackId = d->mDatabase->trackIdFromTitleAlbumTrackDiscNumber(title, artist, album, trackNumber, discNumber);
     if (newTrackId == 0) {
         auto newTrack = std::tuple<QString, QString, QString, int, int>(title, artist, album, trackNumber, discNumber);
         d->mTracksByNameSet.push_back(newTrack);
 
         return;
     }
 
     d->mTracksByIdSet.insert(newTrackId);
 
     auto newTrack = d->mDatabase->trackDataFromDatabaseId(newTrackId);
 
     if (!newTrack.isEmpty()) {
         Q_EMIT trackHasChanged(newTrack);
     }
 }
 
 void TracksListener::trackByFileNameInList(const QUrl &fileName)
 {
     auto newTrackId = d->mDatabase->trackIdFromFileName(fileName);
     if (newTrackId == 0) {
         auto newTrack = scanOneFile(fileName);
 
         if (newTrack.isValid()) {
             auto oneData = DatabaseInterface::TrackDataType{};
 
             oneData[DatabaseInterface::TrackDataType::key_type::TitleRole] = newTrack.title();
             oneData[DatabaseInterface::TrackDataType::key_type::ArtistRole] = newTrack.artist();
             oneData[DatabaseInterface::TrackDataType::key_type::AlbumRole] = newTrack.albumName();
             oneData[DatabaseInterface::TrackDataType::key_type::AlbumIdRole] = newTrack.albumId();
             oneData[DatabaseInterface::TrackDataType::key_type::TrackNumberRole] = newTrack.trackNumber();
             oneData[DatabaseInterface::TrackDataType::key_type::DiscNumberRole] = newTrack.discNumber();
             oneData[DatabaseInterface::TrackDataType::key_type::DurationRole] = newTrack.duration();
             oneData[DatabaseInterface::TrackDataType::key_type::MilliSecondsDurationRole] = newTrack.duration().msecsSinceStartOfDay();
             oneData[DatabaseInterface::TrackDataType::key_type::ResourceRole] = newTrack.resourceURI();
             oneData[DatabaseInterface::TrackDataType::key_type::ImageUrlRole] = newTrack.albumCover();
 
             Q_EMIT trackHasChanged(oneData);
 
             return;
         }
 
         d->mTracksByFileNameSet.push_back(fileName);
 
         return;
     }
 
     d->mTracksByIdSet.insert(newTrackId);
 
     auto newTrack = d->mDatabase->trackDataFromDatabaseId(newTrackId);
 
     if (!newTrack.isEmpty()) {
         Q_EMIT trackHasChanged({newTrack});
     }
 }
 
+void TracksListener::newAlbumInList(qulonglong newDatabaseId, const QString &entryTitle)
+{
+    Q_EMIT tracksListAdded(newDatabaseId, entryTitle, ElisaUtils::Album, d->mDatabase->albumData(newDatabaseId));
+}
+
 void TracksListener::newEntryInList(qulonglong newDatabaseId,
                                     const QString &entryTitle,
                                     ElisaUtils::PlayListEntryType databaseIdType)
 {
     switch (databaseIdType)
     {
     case ElisaUtils::Track:
     {
         d->mTracksByIdSet.insert(newDatabaseId);
 
         auto newTrack = d->mDatabase->trackDataFromDatabaseId(newDatabaseId);
         if (!newTrack.isEmpty()) {
             Q_EMIT trackHasChanged(newTrack);
         }
         break;
     }
     case ElisaUtils::Artist:
         newArtistInList(entryTitle);
         break;
+    case ElisaUtils::FileName:
+        trackByFileNameInList(QUrl::fromLocalFile(entryTitle));
+        break;
+    case ElisaUtils::Album:
+        newAlbumInList(newDatabaseId, entryTitle);
     }
 }
 
 void TracksListener::newArtistInList(const QString &artist)
 {
     auto newTracks = d->mDatabase->tracksFromAuthor(artist);
     if (newTracks.isEmpty()) {
         return;
     }
 
     for (const auto &oneTrack : newTracks) {
         d->mTracksByIdSet.insert(oneTrack.databaseId());
     }
 
-    Q_EMIT albumAdded(newTracks);
+    Q_EMIT tracksListAdded(0, artist, ElisaUtils::Artist, newTracks);
 }
 
 MusicAudioTrack TracksListener::scanOneFile(const QUrl &scanFile)
 {
     return d->mFileScanner.scanOneFile(scanFile, d->mMimeDb);
 }
 
 
 #include "moc_trackslistener.cpp"
diff --git a/src/trackslistener.h b/src/trackslistener.h
index db7b7af2..360415e2 100644
--- a/src/trackslistener.h
+++ b/src/trackslistener.h
@@ -1,81 +1,87 @@
 /*
  * Copyright 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This program 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 3 of the License, or (at your option) any later version.
  *
  * This program 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 program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef TRACKSLISTENER_H
 #define TRACKSLISTENER_H
 
 #include "elisaLib_export.h"
 
 #include "databaseinterface.h"
 #include "musicaudiotrack.h"
 #include "elisautils.h"
 
 #include <QObject>
 
 #include <memory>
 
 class TracksListenerPrivate;
 
 class ELISALIB_EXPORT TracksListener : public QObject
 {
     Q_OBJECT
 
 public:
 
     using ListTrackDataType = DatabaseInterface::ListTrackDataType;
 
     using TrackDataType = DatabaseInterface::TrackDataType;
 
     explicit TracksListener(DatabaseInterface *database, QObject *parent = nullptr);
 
     ~TracksListener() override;
 
 Q_SIGNALS:
 
     void trackHasChanged(const TrackDataType &audioTrack);
 
     void trackHasBeenRemoved(qulonglong id);
 
-    void albumAdded(const ListTrackDataType &tracks);
+    void tracksListAdded(qulonglong newDatabaseId,
+                         const QString &entryTitle,
+                         ElisaUtils::PlayListEntryType databaseIdType,
+                         const ListTrackDataType &tracks);
 
 public Q_SLOTS:
 
     void tracksAdded(const ListTrackDataType &allTracks);
 
     void trackRemoved(qulonglong id);
 
     void trackModified(const TrackDataType &modifiedTrack);
 
     void trackByNameInList(const QString &title, const QString &artist, const QString &album, int trackNumber, int discNumber);
 
-    void trackByFileNameInList(const QUrl &fileName);
-
     void newEntryInList(qulonglong newDatabaseId,
                         const QString &entryTitle,
                         ElisaUtils::PlayListEntryType databaseIdType);
 
 private:
 
     MusicAudioTrack scanOneFile(const QUrl &scanFile);
 
     void newArtistInList(const QString &artist);
 
+    void trackByFileNameInList(const QUrl &fileName);
+
+    void newAlbumInList(qulonglong newDatabaseId,
+                        const QString &entryTitle);
+
     std::unique_ptr<TracksListenerPrivate> d;
 
 };
 
 #endif // TRACKSLISTENER_H