Better file export (rebased #3572 with Windows build fixes)

CMakeLists.txt

@@ -863,7 +863,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/export/coverartcopyworker.cpp
   src/library/export/dlgtrackexport.ui
   src/library/export/trackexportdlg.cpp
-  src/library/export/trackexportwizard.cpp
   src/library/export/trackexportworker.cpp
   src/library/externaltrackcollection.cpp
   src/library/hiddentablemodel.cpp
@@ -921,7 +920,9 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/trackset/crate/cratefeaturehelper.cpp
   src/library/trackset/crate/cratestorage.cpp
   src/library/trackset/crate/cratetablemodel.cpp
+  src/library/trackset/crate/cratesummary.cpp
   src/library/trackset/playlistfeature.cpp
+  src/library/trackset/playlistsummary.cpp
   src/library/trackset/setlogfeature.cpp
   src/library/trackset/tracksettablemodel.cpp
   src/library/traktor/traktorfeature.cpp
@@ -1087,9 +1088,11 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/util/experiment.cpp
   src/util/file.cpp
   src/util/imagefiledata.cpp
+  src/util/fileutils.cpp
   src/util/fileaccess.cpp
   src/util/fileinfo.cpp
   src/util/filename.cpp
+  src/util/formatter.cpp
   src/util/imagefiledata.cpp
   src/util/imageutils.cpp
   src/util/indexrange.cpp
@@ -1865,6 +1868,8 @@ add_executable(mixxx-test
   src/test/enginemixertest.cpp
   src/test/enginemicrophonetest.cpp
   src/test/enginesynctest.cpp
+  src/test/formatter_test.cpp
+  src/test/fileutils_test.cpp
   src/test/fileinfo_test.cpp
   src/test/frametest.cpp
   src/test/globaltrackcache_test.cpp
@@ -2307,6 +2312,44 @@ elseif(GNU_GCC OR LLVM_CLANG)
 endif()
 target_link_libraries(mixxx-lib PRIVATE FpClassify)
 
+# Grantlee5 (5.3.0 is the first version with Qt6 support)
+find_package(Grantlee5 5.3.0 NAMES grantlee grantlee5 )
+
+if(NOT Grantlee5_FOUND)
+      message(FATAL_ERROR "No Grantlee5 for Qt6 available")
+else()
+    # An existing installation of Grantlee5 is available.
+    message(STATUS "Use existing system installation of Grantlee5")
+endif()
+
+target_link_libraries(mixxx-lib PUBLIC
+  Grantlee5::Templates
+  Grantlee5::TextDocument
+)
+
+# grantlee plugin
+add_dependencies(mixxx-lib mixxxformatter)
+add_library(mixxxformatter MODULE
+  src/util/formatterplugin/mixxxformatter.cpp
+  src/util/fileutils.cpp
+)
+
+set_target_properties(mixxxformatter PROPERTIES AUTOMOC ON)
+target_include_directories(mixxxformatter PRIVATE src)
+
+grantlee_adjust_plugin_name(mixxxformatter)
+
+target_link_libraries(mixxxformatter
+  Grantlee5::Templates
+)
+
+add_custom_command(TARGET mixxxformatter POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Grantlee5::defaulttags> $<TARGET_FILE_DIR:mixxxformatter>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Grantlee5::defaultfilters> $<TARGET_FILE_DIR:mixxxformatter>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Grantlee5::loadertags> $<TARGET_FILE_DIR:mixxxformatter>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Grantlee5::Templates> $<TARGET_FILE_DIR:mixxxformatter>"/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}"
+)
+
 # LAME
 find_package(mp3lame REQUIRED)
 target_link_libraries(mixxx-lib PRIVATE mp3lame::mp3lame)
@@ -2543,6 +2586,16 @@ else()
       RUNTIME_DEPENDENCY_SET mixxx
       COMPONENT applocal)
 
+    install(IMPORTED_RUNTIME_ARTIFACTS
+      mixxxformatter
+      Grantlee5::defaulttags
+      Grantlee5::defaultfilters
+      Grantlee5::loadertags
+      Grantlee5::Templates
+      DESTINATION "${MIXXX_INSTALL_DATADIR}/grantlee/${Grantlee5_VERSION_MAJOR}.${Grantlee5_VERSION_MINOR}"
+      RUNTIME_DEPENDENCY_SET mixxx
+      COMPONENT applocal)
+
     if(WIN32)
       install(IMPORTED_RUNTIME_ARTIFACTS Qt${QT_VERSION_MAJOR}::QWindowsIntegrationPlugin
         DESTINATION "${MIXXX_INSTALL_DATADIR}/platforms"

packaging/debian/control.in

@@ -27,6 +27,7 @@ Build-Depends: debhelper (>= 11),
 # Only needed for running tests that use SQLite.
                libqt5sql5-sqlite,
                libqt5x11extras5-dev,
+               libgrantlee5-dev,
                cmake (>= 3.13),
                libjack-dev,
                portaudio19-dev,

src/library/dao/playlistdao.cpp

@@ -21,6 +21,32 @@ PlaylistDAO::PlaylistDAO()
 void PlaylistDAO::initialize(const QSqlDatabase& database) {
     DAO::initialize(database);
     populatePlaylistMembershipCache();
+
+    // create temporary views
+    QString queryString = QLatin1String(
+            "CREATE TEMPORARY VIEW IF NOT EXISTS PlaylistsCountsDurations "
+            "AS SELECT "
+            "  Playlists.id AS id, "
+            "  Playlists.name AS name, "
+            "  LOWER(Playlists.name) AS sort_name, "
+            "  COUNT(case library.mixxx_deleted when 0 then 1 else null end) "
+            "    AS count, "
+            "  SUM(case library.mixxx_deleted "
+            "    when 0 then library.duration else 0 end) AS durationSeconds "
+            "FROM Playlists "
+            "LEFT JOIN PlaylistTracks "
+            "  ON PlaylistTracks.playlist_id = Playlists.id "
+            "LEFT JOIN library "
+            "  ON PlaylistTracks.track_id = library.id "
+            "  WHERE Playlists.hidden = 0 "
+            "  GROUP BY Playlists.id");
+    queryString.append(
+            mixxx::DbConnection::collateLexicographically(
+                    " ORDER BY sort_name"));
+    QSqlQuery query(m_database);
+    if (!query.exec(queryString)) {
+        LOG_FAILED_QUERY(query);
+    }
 }
 
 void PlaylistDAO::populatePlaylistMembershipCache() {
@@ -472,8 +498,8 @@ unsigned int PlaylistDAO::playlistCount() const {
 }
 
 QList<QPair<int, QString>> PlaylistDAO::getPlaylists(const HiddenType hidden) const {
-    //qDebug() << "PlaylistDAO::getPlaylists(hidden =" << hidden
-    //         << QThread::currentThread() << m_database.connectionName();
+    // qDebug() << "PlaylistDAO::getPlaylists(hidden =" << hidden
+    //          << QThread::currentThread() << m_database.connectionName();
 
     QSqlQuery query(m_database);
     query.prepare(
@@ -1272,6 +1298,122 @@ void PlaylistDAO::getPlaylistsTrackIsIn(TrackId trackId,
     }
 }
 
+QList<PlaylistSummary> PlaylistDAO::createPlaylistSummaryForTracks(const QList<TrackId>& tracks) {
+    QSet<int> allPlaylistIds;
+    QSet<int> playlistIds;
+    QMap<int, int> trackCount;
+    for (TrackId trackId : tracks) {
+        PlaylistDAO::getPlaylistsTrackIsIn(trackId, &playlistIds);
+        allPlaylistIds += playlistIds;
+        for (int playlistId : qAsConst(playlistIds)) {
+            trackCount[playlistId] = trackCount.value(playlistId, 0) + 1;
+        }
+    }
+    QList<PlaylistSummary> summaries = PlaylistDAO::createPlaylistSummary(&allPlaylistIds);
+    for (PlaylistSummary summary : summaries) {
+        DEBUG_ASSERT(trackCount.contains(summary.id()));
+        summary.setMatches(trackCount.value(summary.id()));
+    }
+    return summaries;
+}
+
+QList<PlaylistSummary> PlaylistDAO::createPlaylistSummary(const QSet<int>* playlistIds) {
+    QList<PlaylistSummary> playlistLabels;
+
+    // Setup the sidebar playlist model
+    QSqlTableModel playlistTableModel(this, m_database);
+    playlistTableModel.setTable("PlaylistsCountsDurations");
+
+    if (playlistIds) {
+        QStringList idList;
+        for (const auto& playlistId : *playlistIds) {
+            idList.append(QString::number(playlistId));
+        }
+        playlistTableModel.setFilter(QString("id in [%1]").arg(idList.join(",")));
+    }
+
+    playlistTableModel.select();
+    while (playlistTableModel.canFetchMore()) {
+        playlistTableModel.fetchMore();
+    }
+    QSqlRecord record = playlistTableModel.record();
+    int nameColumn = record.indexOf("name");
+    int idColumn = record.indexOf("id");
+    int countColumn = record.indexOf("count");
+    int durationColumn = record.indexOf("durationSeconds");
+
+    for (int row = 0; row < playlistTableModel.rowCount(); ++row) {
+        int id =
+                playlistTableModel
+                        .data(playlistTableModel.index(row, idColumn))
+                        .toInt();
+        QString name =
+                playlistTableModel
+                        .data(playlistTableModel.index(row, nameColumn))
+                        .toString();
+        int count =
+                playlistTableModel
+                        .data(playlistTableModel.index(row, countColumn))
+                        .toInt();
+        int duration =
+                playlistTableModel
+                        .data(playlistTableModel.index(row, durationColumn))
+                        .toInt();
+        PlaylistSummary playlist(id, name);
+        playlist.setCount(count);
+        playlist.setDuration(duration);
+        playlistLabels.append(playlist);
+    }
+    return playlistLabels;
+}
+PlaylistSummary PlaylistDAO::getPlaylistSummary(int playlistId) {
+    if (playlistId == -1) {
+        return PlaylistSummary();
+    }
+    QSqlTableModel playlistTableModel(this, m_database);
+    playlistTableModel.setTable("PlaylistsCountsDurations");
+
+    playlistTableModel.setFilter(QString("id = %1").arg(playlistId));
+
+    playlistTableModel.select();
+    while (playlistTableModel.canFetchMore()) {
+        playlistTableModel.fetchMore();
+    }
+    QSqlRecord record = playlistTableModel.record();
+    int nameColumn = record.indexOf("name");
+    int idColumn = record.indexOf("id");
+    int countColumn = record.indexOf("count");
+    int durationColumn = record.indexOf("durationSeconds");
+
+    if (playlistTableModel.rowCount() == 0) {
+        return PlaylistSummary();
+    }
+    VERIFY_OR_DEBUG_ASSERT(playlistTableModel.rowCount() == 1) {
+        qWarning() << "playlist id matched to multiple results";
+    }
+
+    int id =
+            playlistTableModel
+                    .data(playlistTableModel.index(0, idColumn))
+                    .toInt();
+    QString name =
+            playlistTableModel
+                    .data(playlistTableModel.index(0, nameColumn))
+                    .toString();
+    int count =
+            playlistTableModel
+                    .data(playlistTableModel.index(0, countColumn))
+                    .toInt();
+    int duration =
+            playlistTableModel
+                    .data(playlistTableModel.index(0, durationColumn))
+                    .toInt();
+    PlaylistSummary summary(id, name);
+    summary.setCount(count);
+    summary.setDuration(duration);
+    return summary;
+}
+
 void PlaylistDAO::setAutoDJProcessor(AutoDJProcessor* pAutoDJProcessor) {
     m_pAutoDJProcessor = pAutoDJProcessor;
 }

src/library/dao/playlistdao.h

@@ -2,10 +2,11 @@
 
 #include <QHash>
 #include <QObject>
-#include <QSqlDatabase>
 #include <QSet>
+#include <QSqlDatabase>
 
 #include "library/dao/dao.h"
+#include "library/trackset/playlistsummary.h"
 #include "track/trackid.h"
 #include "util/class.h"
 
@@ -129,6 +130,9 @@ class PlaylistDAO : public QObject, public virtual DAO {
     bool isTrackInPlaylist(TrackId trackId, const int playlistId) const;
 
     void getPlaylistsTrackIsIn(TrackId trackId, QSet<int>* playlistSet) const;
+    QList<PlaylistSummary> createPlaylistSummary(const QSet<int>* playlistIds = nullptr);
+    QList<PlaylistSummary> createPlaylistSummaryForTracks(const QList<TrackId>& tracks);
+    PlaylistSummary getPlaylistSummary(int playlistId);
 
     void setAutoDJProcessor(AutoDJProcessor* pAutoDJProcessor);