AutoDJFeature: Show full path of crates in "Add Crates as Track Source" submenu

Author: cr7pt0gr4ph7

src/library/autodj/autodjfeature.cpp

@@ -12,6 +12,7 @@
 #include "library/trackcollection.h"
 #include "library/trackcollectionmanager.h"
 #include "library/trackset/crate/cratestorage.h"
+#include "library/trackset/crate/cratesummary.h"
 #include "library/treeitem.h"
 #include "moc_autodjfeature.cpp"
 #include "sources/soundsourceproxy.h"
@@ -356,11 +357,11 @@ void AutoDJFeature::slotAddRandomTrack() {
 
 void AutoDJFeature::constructCrateChildModel() {
     m_crateList.clear();
-    CrateSelectResult autoDjCrates(m_pTrackCollection->crates().selectAutoDjCrates(true));
-    Crate crate;
+    CrateSummarySelectResult autoDjCrates(m_pTrackCollection->crates().selectAutoDjCrates(true));
+    CrateSummary crate;
     while (autoDjCrates.populateNext(&crate)) {
         // Create the TreeItem for this crate.
-        m_pCratesTreeItem->appendChild(crate.getName(), crate.getId().toVariant());
+        m_pCratesTreeItem->appendChild(crate.getFullPath(), crate.getId().toVariant());
         m_crateList.append(crate);
     }
 }
@@ -385,10 +386,10 @@ void AutoDJFeature::onRightClickChild(const QPoint& globalPos,
         // Bring up the context menu.
         QMenu crateMenu(m_pSidebarWidget);
         crateMenu.setTitle(tr("Add Crate as Track Source"));
-        CrateSelectResult nonAutoDjCrates(m_pTrackCollection->crates().selectAutoDjCrates(false));
-        Crate crate;
+        CrateSummarySelectResult nonAutoDjCrates(m_pTrackCollection->crates().selectAutoDjCrates(false));
+        CrateSummary crate;
         while (nonAutoDjCrates.populateNext(&crate)) {
-            auto pAction = std::make_unique<QAction>(crate.getName(), &crateMenu);
+            auto pAction = std::make_unique<QAction>(crate.getFullPath(), &crateMenu);
             auto crateId = crate.getId();
             connect(pAction.get(), &QAction::triggered, this, [this, crateId] {
                 slotAddCrateToAutoDj(crateId);

src/library/trackset/crate/cratestorage.cpp

@@ -476,19 +476,21 @@ CrateSelectResult CrateStorage::selectCratesByIds(
     }
 }
 
-CrateSelectResult CrateStorage::selectAutoDjCrates(bool autoDjSource) const {
+CrateSummarySelectResult CrateStorage::selectAutoDjCrates(bool autoDjSource) const {
     FwdSqlQuery query(m_database,
             mixxx::DbConnection::collateLexicographically(
-                    QStringLiteral("SELECT * FROM %1 WHERE %2=:autoDjSource "
-                                   "ORDER BY %3")
-                            .arg(CRATE_TABLE,
+                    QStringLiteral(
+                            "SELECT * FROM %1 WHERE %2=:autoDjSource "
+                            "ORDER BY %3")
+                            .arg(
+                                    CRATE_SUMMARY_VIEW,
                                     CRATETABLE_AUTODJ_SOURCE,
-                                    CRATETABLE_NAME)));
+                                    CRATESUMMARY_FULL_PATH)));
     query.bindValue(":autoDjSource", QVariant(autoDjSource));
     if (query.execPrepared()) {
-        return CrateSelectResult(std::move(query));
+        return CrateSummarySelectResult(std::move(query));
     } else {
-        return CrateSelectResult();
+        return CrateSummarySelectResult();
     }
 }
 

src/library/trackset/crate/cratestorage.h

@@ -307,7 +307,7 @@ class CrateStorage : public virtual /*implements*/ SqlStorage {
     // redesign of the AutoDJ feature has been reached. The main
     // ideas of the new design should be documented for verification
     // before starting to code.
-    CrateSelectResult selectAutoDjCrates(bool autoDjSource = true) const;
+    CrateSummarySelectResult selectAutoDjCrates(bool autoDjSource = true) const;
 
     // Crate content, i.e. the crate's tracks referenced by id
     uint countCrateTracks(CrateId crateId) const;