Nested crates

build/depends.py

@@ -1027,9 +1027,14 @@ def sources(self, build):
 
                    "library/features/crates/cratefeature.cpp",
                    "library/features/crates/cratetablemodel.cpp",
+                   "library/features/crates/cratetracks.cpp",
+                   "library/features/crates/cratehierarchy.cpp",
+                   "library/features/crates/cratestoragehelpers.cpp",
                    "library/features/crates/cratestorage.cpp",
+                   "library/features/crates/cratetreemodel.cpp",
                    "library/features/crates/cratefeaturehelper.cpp",
-
+                   "library/features/crates/cratemanager.cpp",
+
                    "library/features/history/historyfeature.cpp",
                    "library/features/history/historytreemodel.cpp",
 

res/schema.xml

@@ -458,4 +458,37 @@ METADATA
       );
     </sql>
   </revision>
+  <revision version="30" min_compatible="3">
+    <description>
+      Add tables to support nested crates.
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS crateClosure (
+        parentId INTEGER,
+        childId INTEGER,
+        depth INTEGER
+      );
+
+      CREATE TABLE IF NOT EXISTS cratePath (
+        crateId INTEGER,
+        idPath TEXT,
+        namePath TEXT
+      );
+
+      ALTER TABLE crates RENAME TO old_crates;
+
+      CREATE TABLE crates (
+        id integer PRIMARY KEY AUTOINCREMENT,
+        name varchar(48) NOT NULL,
+        count integer DEFAULT 0,
+        show integer DEFAULT 1,
+        locked integer DEFAULT 0,
+        autodj_source integer DEFAULT 0
+      );
+
+      INSERT INTO crates SELECT * FROM old_crates;
+
+      DROP TABLE old_crates;
+    </sql>
+  </revision>
 </schema>

src/database/mixxxdb.cpp

@@ -11,7 +11,7 @@
 const QString MixxxDb::kDefaultSchemaFile(":/schema.xml");
 
 //static
-const int MixxxDb::kRequiredSchemaVersion = 28;
+const int MixxxDb::kRequiredSchemaVersion = 30;
 
 namespace {
 

src/library/basesqltablemodel.cpp

@@ -410,6 +410,10 @@ void BaseSqlTableModel::setTable(const QString& tableName,
     m_bInitialized = true;
 }
 
+QString BaseSqlTableModel::getTableName() {
+    return m_tableName;
+}
+
 const QString BaseSqlTableModel::currentSearch() const {
     return m_currentSearch;
 }

src/library/basesqltablemodel.h

@@ -92,6 +92,7 @@ class BaseSqlTableModel : public QAbstractTableModel, public TrackModel {
     void setTable(const QString& tableName, const QString& trackIdColumn,
                   const QStringList& tableColumns,
                   QSharedPointer<BaseTrackCache> trackSource);
+    QString getTableName();
     void initHeaderData();
 
     QSet<TrackId> getTrackIdsFromIndices(const QModelIndexList& list) const;

src/library/crate/crateschema.h

@@ -7,6 +7,8 @@
 
 #define CRATE_TABLE "crates"
 #define CRATE_TRACKS_TABLE "crate_tracks"
+#define CRATE_CLOSURE_TABLE "crateClosure"
+#define CRATE_PATH_TABLE "cratePath"
 
 const QString CRATETABLE_ID = "id";
 const QString CRATETABLE_NAME = "name";
@@ -24,5 +26,12 @@ const QString CRATETABLE_AUTODJ_SOURCE = "autodj_source";
 const QString CRATETRACKSTABLE_CRATEID = "crate_id";
 const QString CRATETRACKSTABLE_TRACKID = "track_id";
 
+const QString CLOSURE_PARENTID = "parentId";
+const QString CLOSURE_CHILDID = "childId";
+const QString CLOSURE_DEPTH = "depth";
+
+const QString PATHTABLE_CRATEID = "crateId";
+const QString PATHTABLE_ID_PATH = "idPath";
+const QString PATHTABLE_NAME_PATH = "namePath";
 
 #endif // MIXXX_CRATESCHEMA_H

src/library/dao/autodjcratesdao.cpp

@@ -44,6 +44,7 @@ AutoDJCratesDAO::AutoDJCratesDAO(
         UserSettingsPointer pConfig)
         : m_iAutoDjPlaylistId(iAutoDjPlaylistId),
           m_pTrackCollection(pTrackCollection),
+          m_pCrates(pTrackCollection->crates()),
           m_database(pTrackCollection->database()),
           m_pConfig(pConfig),
           // The database has not been created yet.
@@ -198,13 +199,13 @@ void AutoDJCratesDAO::createAndConnectAutoDjCratesDatabase() {
             this, SLOT(slotTrackDirty(TrackId)));
 
     // Be notified when the status of crates changes.
-    connect(m_pTrackCollection, SIGNAL(crateInserted(CrateId)),
+    connect(m_pCrates, SIGNAL(crateInserted(CrateId)),
             this, SLOT(slotCrateInserted(CrateId)));
-    connect(m_pTrackCollection, SIGNAL(crateDeleted(CrateId)),
+    connect(m_pCrates, SIGNAL(crateDeleted(CrateId)),
             this, SLOT(slotCrateDeleted(CrateId)));
-    connect(m_pTrackCollection, SIGNAL(crateUpdated(CrateId)),
+    connect(m_pCrates, SIGNAL(crateUpdated(CrateId)),
             this, SLOT(slotCrateUpdated(CrateId)));
-    connect(m_pTrackCollection, SIGNAL(crateTracksChanged(CrateId,QList<TrackId>,QList<TrackId>)),
+    connect(m_pCrates, SIGNAL(crateTracksChanged(CrateId,QList<TrackId>,QList<TrackId>)),
             this, SLOT(slotCrateTracksChanged(CrateId,QList<TrackId>,QList<TrackId>)));
 
     // Be notified when playlists are added/removed.
@@ -720,7 +721,7 @@ void AutoDJCratesDAO::slotTrackDirty(TrackId trackId) {
 void AutoDJCratesDAO::slotCrateInserted(CrateId crateId) {
     // If this newly-added crate is in the auto-DJ queue, add it to the list.
     Crate crate;
-    if (m_pTrackCollection->crates().readCrateById(crateId, &crate)) {
+    if (m_pCrates->storage().readCrateById(crateId, &crate)) {
         if (crate.isAutoDjSource()) {
             updateAutoDjCrate(crateId);
         }
@@ -729,7 +730,7 @@ void AutoDJCratesDAO::slotCrateInserted(CrateId crateId) {
 
 void AutoDJCratesDAO::slotCrateUpdated(CrateId crateId) {
     Crate crate;
-    if (m_pTrackCollection->crates().readCrateById(crateId, &crate)) {
+    if (m_pCrates->storage().readCrateById(crateId, &crate)) {
         if (crate.isAutoDjSource()) {
             updateAutoDjCrate(crateId);
         } else {
@@ -875,7 +876,7 @@ void AutoDJCratesDAO::slotCrateTracksChanged(
         const QList<TrackId>& removedTrackIds) {
     // Skip this if it's not an auto-DJ crate.
     Crate crate;
-    if (!m_pTrackCollection->crates().readCrateById(crateId, &crate)
+    if (!m_pCrates->storage().readCrateById(crateId, &crate)
             || !crate.isAutoDjSource()) {
         return;
     }

src/library/dao/autodjcratesdao.h

@@ -6,6 +6,7 @@
 
 #include "preferences/usersettings.h"
 #include "library/crate/crateid.h"
+#include "library/features/crates/cratemanager.h"
 #include "track/track.h"
 #include "util/class.h"
 
@@ -103,6 +104,7 @@ class AutoDJCratesDAO : public QObject {
     const int m_iAutoDjPlaylistId;
 
     TrackCollection* m_pTrackCollection;
+    CrateManager* m_pCrates;
 
     // The SQL database we interact with.
     QSqlDatabase m_database;

src/library/features/autodj/autodjfeature.cpp

@@ -17,7 +17,7 @@
 #include "mixer/playermanager.h"
 #include "library/trackcollection.h"
 #include "library/treeitem.h"
-#include "library/features/crates/cratestorage.h"
+#include "library/features/crates/cratemanager.h"
 #include "controllers/keyboard/keyboardeventfilter.h"
 #include "sources/soundsourceproxy.h"
 #include "util/dnd.h"
@@ -52,7 +52,8 @@ AutoDJFeature::AutoDJFeature(UserSettingsPointer pConfig,
           m_iAutoDJPlaylistId(findOrCrateAutoDjPlaylistId(m_playlistDao)),
           m_pAutoDJProcessor(nullptr),
           m_pAutoDJView(nullptr),
-          m_autoDjCratesDao(m_iAutoDJPlaylistId, pTrackCollection, pConfig) {
+          m_autoDjCratesDao(m_iAutoDJPlaylistId, pTrackCollection, pConfig),
+          m_pCrates(pTrackCollection->crates()) {
 
     qRegisterMetaType<AutoDJProcessor::AutoDJState>("AutoDJState");
     m_pAutoDJProcessor = new AutoDJProcessor(
@@ -72,11 +73,11 @@ AutoDJFeature::AutoDJFeature(UserSettingsPointer pConfig,
     m_childModel.setRootItem(std::move(pRootItem));
 
     // Be notified when the status of crates changes.
-    connect(m_pTrackCollection, SIGNAL(crateInserted(CrateId)),
+    connect(m_pCrates, SIGNAL(crateInserted(CrateId)),
             this, SLOT(slotCrateChanged(CrateId)));
-    connect(m_pTrackCollection, SIGNAL(crateUpdated(CrateId)),
+    connect(m_pCrates, SIGNAL(crateUpdated(CrateId)),
             this, SLOT(slotCrateChanged(CrateId)));
-    connect(m_pTrackCollection, SIGNAL(crateDeleted(CrateId)),
+    connect(m_pCrates, SIGNAL(crateDeleted(CrateId)),
             this, SLOT(slotCrateChanged(CrateId)));
 
     // Create context-menu items to allow crates to be added to, and removed
@@ -197,18 +198,18 @@ bool AutoDJFeature::dragMoveAccept(QUrl url) {
 
 // Add a crate to the auto-DJ queue.
 void AutoDJFeature::slotAddCrateToAutoDj(int iCrateId) {
-    m_pTrackCollection->updateAutoDjCrate(CrateId(iCrateId), true);
+    m_pCrates->updateAutoDjCrate(CrateId(iCrateId), true);
 }
 
 void AutoDJFeature::slotRemoveCrateFromAutoDj() {
     CrateId crateId(m_pRemoveCrateFromAutoDj->data());
     DEBUG_ASSERT(crateId.isValid());
-    m_pTrackCollection->updateAutoDjCrate(crateId, false);
+    m_pCrates->updateAutoDjCrate(crateId, false);
 }
 
 void AutoDJFeature::slotCrateChanged(CrateId crateId) {
     Crate crate;
-    if (m_pTrackCollection->crates().readCrateById(crateId, &crate) && crate.isAutoDjSource()) {
+    if (m_pCrates->storage().readCrateById(crateId, &crate) && crate.isAutoDjSource()) {
         // Crate exists and is already a source for AutoDJ
         // -> Find and update the corresponding child item
         for (int i = 0; i < m_crateList.length(); ++i) {
@@ -287,7 +288,7 @@ void AutoDJFeature::slotAddRandomTrack() {
 
 void AutoDJFeature::constructCrateChildModel() {
     m_crateList.clear();
-    CrateSelectResult autoDjCrates(m_pTrackCollection->crates().selectAutoDjCrates(true));
+    CrateSelectResult autoDjCrates(m_pCrates->storage().selectAutoDjCrates(true));
     Crate crate;
     while (autoDjCrates.populateNext(&crate)) {
         // Create the TreeItem for this crate.
@@ -304,7 +305,7 @@ void AutoDJFeature::onRightClickChild(const QPoint& globalPos,
         // Bring up the context menu.
         QMenu crateMenu;
         crateMenu.setTitle(tr("Add Crate as Track Source"));
-        CrateSelectResult nonAutoDjCrates(m_pTrackCollection->crates().selectAutoDjCrates(false));
+        CrateSelectResult nonAutoDjCrates(m_pCrates->storage().selectAutoDjCrates(false));
         Crate crate;
         while (nonAutoDjCrates.populateNext(&crate)) {
             auto pAction = std::make_unique<QAction>(crate.getName(), &crateMenu);

src/library/features/autodj/autodjfeature.h

@@ -86,6 +86,8 @@ class AutoDJFeature : public LibraryFeature {
     // How we access the auto-DJ-crates database.
     AutoDJCratesDAO m_autoDjCratesDao;
 
+    CrateManager* m_pCrates;
+
     // A context-menu item that allows crates to be removed from the
     // auto-DJ list.
     QAction *m_pRemoveCrateFromAutoDj;