AutoDJ: Show total track time

CMakeLists.txt

@@ -922,6 +922,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL
   src/library/trackset/crate/cratestorage.cpp
   src/library/trackset/crate/cratetablemodel.cpp
   src/library/trackset/playlistfeature.cpp
+  src/library/trackset/playlist/playliststorage.cpp
   src/library/trackset/setlogfeature.cpp
   src/library/trackset/tracksettablemodel.cpp
   src/library/traktor/traktorfeature.cpp

res/skins/LateNight/style.qss

@@ -864,6 +864,7 @@ QLabel#labelTransitionAppendix {
   margin-left: 3px;
 }
 QLabel#labelProgress, /* Analysis progress */
+QLabel#labelTotalInfo, /* AutoDJ track total info */
 QLabel#labelSelectionInfo /* AutoDJ track selection info */ {
   margin: 2px 5px 5px 1px;
 }

res/skins/LateNight/style_palemoon.qss

@@ -2853,6 +2853,7 @@ WSearchLineEdit {
     margin: 6px 3px 4px 3px;
   }
   QLabel#labelProgress, /* Analysis progress */
+  QLabel#labelTotalInfo, /* AutoDJ track total info */
   QLabel#labelSelectionInfo /* AutoDJ track selection info */ {
     margin: 4px 5px 5px 1px;
   }

res/skins/Tango/style.qss

@@ -2844,6 +2844,7 @@ Library features and their buttons:
     QPushButton#pushButtonFadeNow
     QSpinBox#spinBoxTransition
     QLabel#labelSelectionInfo
+    QLabel#labelTotalInfo
   DlgAnalysis
     + some small margin to maximize and cover art button
     + make radio buttons blue like active keylock button
@@ -2984,6 +2985,8 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
   /* Push labels away from buttons at the right */
   /* AutoDJ selection info */
   QLabel#labelSelectionInfo,
+  /* AutoDJ total info */
+  QLabel#labelTotalInfo,
   /* Analysis progress info */
   QLabel#labelProgress {
     margin: 0px 4px 5px 2px;

src/library/autodj/autodjfeature.cpp

@@ -92,13 +92,21 @@ AutoDJFeature::AutoDJFeature(Library* pLibrary,
             this,
             &AutoDJFeature::slotCrateChanged);
 
+    // Be notified when tracks are added/removed to/from playlist(s).
+    connect(&m_playlistDao,
+            &PlaylistDAO::tracksChanged,
+            this,
+            &AutoDJFeature::slotPlaylistsChanged);
+
     // Create context-menu items to allow crates to be added to, and removed
     // from, the auto-DJ queue.
     m_pRemoveCrateFromAutoDj = new QAction(tr("Remove Crate as Track Source"), this);
     connect(m_pRemoveCrateFromAutoDj,
             &QAction::triggered,
             this,
             &AutoDJFeature::slotRemoveCrateFromAutoDj);
+
+    updateTitle();
 }
 
 AutoDJFeature::~AutoDJFeature() {
@@ -107,7 +115,22 @@ AutoDJFeature::~AutoDJFeature() {
 }
 
 QVariant AutoDJFeature::title() {
-    return tr("Auto DJ");
+    return m_title;
+}
+
+void AutoDJFeature::updateTitle() {
+    QString title = tr("Auto DJ");
+
+    PlaylistSummary summary;
+    if (m_pTrackCollection->playlists().readAutoDJPlaylistSummary(&summary) &&
+            summary.getTrackCount() > 0) {
+            title.append(QStringLiteral(" (%1) <%2")
+                                 .arg(QString::number(summary.getTrackCount()),
+                                         summary.getTrackDurationText()));
+    }
+
+    m_title = title;
+    emit featureIsLoading(this, false);
 }
 
 void AutoDJFeature::bindLibraryWidget(
@@ -320,3 +343,11 @@ void AutoDJFeature::slotRandomQueue(int numTracksToAdd) {
         slotAddRandomTrack();
     }
 }
+
+void AutoDJFeature::slotPlaylistsChanged(const QSet<int>& playlistIds) {
+    if (playlistIds.contains(m_iAutoDJPlaylistId)) {
+        // If AutoDJ playlist was changed, notify that feature title has changed
+        // since it contains duration of the AutoDJ playlist.
+        updateTitle();
+    }
+}

src/library/autodj/autodjfeature.h

@@ -81,6 +81,10 @@ class AutoDJFeature : public LibraryFeature {
 
     QPointer<WLibrarySidebar> m_pSidebarWidget;
 
+    QString m_title;
+
+    void updateTitle();
+
   private slots:
     // Add a crate to the auto-DJ queue.
     void slotAddCrateToAutoDj(CrateId crateId);
@@ -96,4 +100,6 @@ class AutoDJFeature : public LibraryFeature {
     // Adds a random track from the queue upon hitting minimum number
     // of tracks in the playlist
     void slotRandomQueue(int numTracksToAdd);
+
+    void slotPlaylistsChanged(const QSet<int>& playlistIds);
 };

src/library/autodj/dlgautodj.cpp

@@ -7,6 +7,8 @@
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "library/library.h"
 #include "library/playlisttablemodel.h"
+#include "library/trackcollection.h"
+#include "library/trackcollectionmanager.h"
 #include "moc_dlgautodj.cpp"
 #include "track/track.h"
 #include "util/assert.h"
@@ -34,7 +36,13 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
                   parent->getTrackTableBackgroundColorOpacity(),
                   /*no sorting*/ false)),
           m_bShowButtonText(parent->getShowButtonText()),
-          m_pAutoDJTableModel(nullptr) {
+          m_pAutoDJTableModel(nullptr),
+          m_pTrackCollection(nullptr) {
+    TrackCollectionManager* pTrackCollectionManager = pLibrary->trackCollectionManager();
+    DEBUG_ASSERT(pTrackCollectionManager != nullptr);
+    m_pTrackCollection = pTrackCollectionManager->internalCollection();
+    DEBUG_ASSERT(m_pTrackCollection != nullptr);
+
     setupUi(this);
 
     m_pTrackTableView->installEventFilter(pKeyboard);
@@ -56,6 +64,11 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
             this,
             &DlgAutoDJ::updateSelectionInfo);
 
+    connect(&m_pTrackCollection->getPlaylistDAO(),
+            &PlaylistDAO::tracksChanged,
+            this,
+            &DlgAutoDJ::updateTotalInfo);
+
     connect(pLibrary,
             &Library::setTrackTableFont,
             m_pTrackTableView,
@@ -219,6 +232,7 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
     autoDJStateChanged(m_pAutoDJProcessor->getState());
 
     updateSelectionInfo();
+    updateTotalInfo();
 }
 
 DlgAutoDJ::~DlgAutoDJ() {
@@ -374,20 +388,30 @@ void DlgAutoDJ::updateSelectionInfo() {
         }
     }
 
-    QString label;
-
     if (!indices.isEmpty()) {
-        label.append(mixxx::DurationBase::formatTime(duration));
-        label.append(QString(" (%1)").arg(indices.size()));
         labelSelectionInfo->setToolTip(tr("Displays the duration and number of selected tracks."));
-        labelSelectionInfo->setText(label);
+        labelSelectionInfo->setText(
+                QStringLiteral("<%1 (%2) / ")
+                        .arg(mixxx::DurationBase::formatTime(duration),
+                                QString::number(indices.size())));
         labelSelectionInfo->setEnabled(true);
     } else {
         labelSelectionInfo->setText("");
         labelSelectionInfo->setEnabled(false);
     }
 }
 
+void DlgAutoDJ::updateTotalInfo() {
+    PlaylistSummary summary;
+    if (!m_pTrackCollection->playlists().readAutoDJPlaylistSummary(&summary)) {
+        return;
+    }
+
+    labelTotalInfo->setText(QStringLiteral("<%1 (%2)")
+                                    .arg(summary.getTrackDurationText(),
+                                            QString::number(summary.getTrackCount())));
+}
+
 bool DlgAutoDJ::hasFocus() const {
     return m_pTrackTableView->hasFocus();
 }

src/library/autodj/dlgautodj.h

@@ -14,6 +14,7 @@ class WLibrary;
 class WTrackTableView;
 class Library;
 class KeyboardEventFilter;
+class TrackCollection;
 
 class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     Q_OBJECT
@@ -45,6 +46,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     void transitionSliderChanged(int value);
     void autoDJStateChanged(AutoDJProcessor::AutoDJState state);
     void updateSelectionInfo();
+    void updateTotalInfo();
     void slotTransitionModeChanged(int comboboxIndex);
     void slotRepeatPlaylistChanged(int checkedState);
 
@@ -67,6 +69,7 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     const bool m_bShowButtonText;
 
     PlaylistTableModel* m_pAutoDJTableModel;
+    TrackCollection* m_pTrackCollection;
 
     QString m_enableBtnTooltip;
     QString m_disableBtnTooltip;

src/library/autodj/dlgautodj.ui

@@ -199,26 +199,33 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="labelSelectionInfo">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="labelTotalInfo">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item>
        <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>1</width>
+          <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QLabel" name="labelSelectionInfo">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

src/library/trackcollection.cpp

@@ -68,6 +68,7 @@ void TrackCollection::repairDatabase(const QSqlDatabase& database) {
 
     kLogger.info() << "Repairing database";
     m_crates.repairDatabase(database);
+    m_playlists.repairDatabase(database);
 }
 
 void TrackCollection::connectDatabase(const QSqlDatabase& database) {
@@ -83,6 +84,7 @@ void TrackCollection::connectDatabase(const QSqlDatabase& database) {
     m_analysisDao.initialize(database);
     m_libraryHashDao.initialize(database);
     m_crates.connectDatabase(database);
+    m_playlists.connectDatabase(database);
 }
 
 void TrackCollection::disconnectDatabase() {
@@ -92,6 +94,7 @@ void TrackCollection::disconnectDatabase() {
     m_database = QSqlDatabase();
     m_trackDao.finish();
     m_crates.disconnectDatabase();
+    m_playlists.disconnectDatabase();
 }
 
 void TrackCollection::connectTrackSource(QSharedPointer<BaseTrackCache> pTrackSource) {

src/library/trackcollection.h

@@ -13,6 +13,7 @@
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackdao.h"
 #include "library/trackset/crate/cratestorage.h"
+#include "library/trackset/playlist/playliststorage.h"
 #include "preferences/usersettings.h"
 #include "util/thread_affinity.h"
 
@@ -51,6 +52,11 @@ class TrackCollection : public QObject,
         return m_crates;
     }
 
+    const PlaylistStorage& playlists() const {
+        DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this);
+        return m_playlists;
+    }
+
     TrackDAO& getTrackDAO() {
         DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this);
         return m_trackDao;
@@ -169,6 +175,7 @@ class TrackCollection : public QObject,
 
     PlaylistDAO m_playlistDao;
     CrateStorage m_crates;
+    PlaylistStorage m_playlists;
     CueDAO m_cueDao;
     DirectoryDAO m_directoryDao;
     AnalysisDao m_analysisDao;

src/library/trackset/baseplaylistfeature.h

@@ -73,11 +73,6 @@ class BasePlaylistFeature : public BaseTrackSetFeature {
     void slotAnalyzePlaylist();
 
   protected:
-    struct IdAndLabel {
-        int id;
-        QString label;
-    };
-
     virtual void updateChildModel(const QSet<int>& playlistIds);
     virtual void clearChildModel();
     virtual QString fetchPlaylistLabel(int playlistId) = 0;

src/library/trackset/playlist/playlist.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "library/trackset/playlist/playlistid.h"
+#include "util/db/dbnamedentity.h"
+
+class Playlist : public DbNamedEntity<PlaylistId> {
+  public:
+    explicit Playlist(PlaylistId id = PlaylistId())
+            : DbNamedEntity(id) {
+    }
+    ~Playlist() override = default;
+};

src/library/trackset/playlist/playlistid.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "util/db/dbid.h"
+
+class PlaylistId : public DbId {
+  public:
+    // Inherit constructors from base class
+    using DbId::DbId;
+};
+
+Q_DECLARE_TYPEINFO(PlaylistId, Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(PlaylistId)