WIP

acolombier · acolombier · commit bd2e88d5a779 · 2025-09-15T23:17:33.000Z
diff --git a/res/qml/Settings.qml b/res/qml/Settings.qml
@@ -87,6 +87,7 @@ Popup {
                         focus: true
                         model: sectionProperties
                         visible: !searchSetting.active
+                        currentIndex: 1
 
                         delegate: Rectangle {
                             required property int index
diff --git a/res/qml/Settings/Interface.qml b/res/qml/Settings/Interface.qml
@@ -2399,8 +2399,8 @@ Category {
         disableScreensaverInput.selected = disableScreensaverInput.options[Mixxx.Config.libraryInhibitScreensaver]
         startFullscreenInput.selected = Mixxx.Config.configStartInFullscreenKey ? "on" : "off"
         autoHideMenuBarInput.selected = Mixxx.Config.libraryHideMenuBar ? "on" : "off"
-        searchCompletionInput.selected = Mixxx.Config.libraryEnableSearchCompletions ? "on" : "off"
-        searchHistoryKeyboardInput.selected = Mixxx.Config.libraryEnableSearchHistoryShortcuts ? "on" : "off"
+        searchCompletionInput.selected = Mixxx.Config.librarySearchCompletionsEnable ? "on" : "off"
+        searchHistoryKeyboardInput.selected = Mixxx.Config.librarySearchHistoryShortcutsEnable ? "on" : "off"
         bpmPrecisionInput.value = Mixxx.Config.libraryBpmColumnPrecision
         libraryRowHeightInput.value = Mixxx.Config.libraryRowHeight
         trackPaletteComboBox.currentIndex = trackPaletteComboBox.model.indexOf(Mixxx.Config.configTrackColorPalette)
diff --git a/res/qml/Settings/Library.qml b/res/qml/Settings/Library.qml
diff --git a/res/qml/main.qml b/res/qml/main.qml
@@ -21,6 +21,22 @@ ApplicationWindow {
     visible: true
     width: 1920
 
+    Mixxx.ControlProxy {
+        group: "[App]"
+        key: "num_decks"
+        onInitializedChanged: {
+            value = 4
+        }
+    }
+
+    Mixxx.ControlProxy {
+        group: "[App]"
+        key: "num_samplers"
+        onInitializedChanged: {
+            value = 16
+        }
+    }
+
     Column {
         id: content
         anchors.fill: parent
@@ -462,6 +478,9 @@ ApplicationWindow {
         x: Math.round((parent.width - width) / 2)
         y: Math.round((parent.height - height) / 2)
 
+        visible: true
+        activeCategoryIndex: 1
+
         Overlay.modal: Rectangle {
             id: overlayModal
             property real radius: 12
diff --git a/src/library/dao/directorydao.cpp b/src/library/dao/directorydao.cpp
@@ -49,26 +49,36 @@ QList<mixxx::FileInfo> DirectoryDAO::loadAllDirectories(
     return allDirs;
 }
 
-QStringList DirectoryDAO::getRootDirStrings() const {
+QList<DirectoryDAO::RootDirectory> DirectoryDAO::getRootDirectories() const {
     DEBUG_ASSERT(m_database.isOpen());
-    const auto statement =
-            QStringLiteral("SELECT %1 FROM %2")
-                    .arg(
-                            kLocationColumn,
-                            kTable);
+    const auto statement = QStringLiteral(
+            "SELECT d.%1, COUNT(t.directory) AS total_track, SUM(l.duration) "
+            "AS total_runtime FROM %2 d LEFT JOIN track_locations t ON d.%3 = "
+            "t.directory LEFT JOIN library l ON t.id = l.id GROUP BY d.%4;")
+                                   .arg(kLocationColumn,
+                                           kTable,
+                                           kLocationColumn,
+                                           kLocationColumn);
     FwdSqlQuery query(
             m_database,
             statement);
     VERIFY_OR_DEBUG_ASSERT(query.execPrepared()) {
         return {};
     }
 
-    QStringList allDirs;
+    QList<DirectoryDAO::RootDirectory> allDirs;
     const auto locationIndex = query.fieldIndex(kLocationColumn);
+    const auto totalTrackIndex = query.fieldIndex("total_track");
+    const auto totalRuntimeIndex = query.fieldIndex("total_runtime");
     while (query.next()) {
         const auto locationValue =
                 query.fieldValue(locationIndex).toString();
-        allDirs.append(locationValue);
+        const auto totalTrackValue =
+                query.fieldValue(totalTrackIndex).toUInt();
+        const auto totalRuntimeValue =
+                query.fieldValue(totalRuntimeIndex).toUInt();
+        allDirs.append(DirectoryDAO::RootDirectory{
+                locationValue, totalTrackValue, totalRuntimeValue});
     }
     return allDirs;
 }
diff --git a/src/library/dao/directorydao.h b/src/library/dao/directorydao.h
@@ -8,13 +8,19 @@
 
 class DirectoryDAO : public DAO {
   public:
+    struct RootDirectory {
+        QString path;
+        uint trackCount;
+        uint totalSecond;
+    };
+
     ~DirectoryDAO() override = default;
 
     QList<mixxx::FileInfo> loadAllDirectories(
             bool skipInvalidOrMissing = false) const;
     /// Same as loadAllDirectories() just with paths as QString.
     /// See DlgPrefLibrary::populateDirList() for info.
-    QStringList getRootDirStrings() const;
+    QList<RootDirectory> getRootDirectories() const;
 
     enum class AddResult {
         Ok,
diff --git a/src/library/trackcollection.cpp b/src/library/trackcollection.cpp
@@ -141,7 +141,15 @@ QList<mixxx::FileInfo> TrackCollection::loadRootDirs(bool skipInvalidOrMissing)
 }
 
 QStringList TrackCollection::getRootDirStrings() const {
-    return m_directoryDao.getRootDirStrings();
+    QStringList rootDirStrings;
+    for (auto& rootDirectory : m_directoryDao.getRootDirectories()) {
+        rootDirStrings.append(rootDirectory.path);
+    }
+    return rootDirStrings;
+}
+
+QList<DirectoryDAO::RootDirectory> TrackCollection::getRootDirectories() const {
+    return m_directoryDao.getRootDirectories();
 }
 
 DirectoryDAO::AddResult TrackCollection::addDirectory(const mixxx::FileInfo& rootDir) {
diff --git a/src/library/trackcollection.h b/src/library/trackcollection.h
@@ -46,6 +46,7 @@ class TrackCollection : public QObject,
     QList<mixxx::FileInfo> loadRootDirs(
             bool skipInvalidOrMissing = false) const;
     QStringList getRootDirStrings() const;
+    QList<DirectoryDAO::RootDirectory> getRootDirectories() const;
 
     const CrateStorage& crates() const {
         DEBUG_ASSERT_QOBJECT_THREAD_AFFINITY(this);
diff --git a/src/qml/qmlconfigproxy.cpp b/src/qml/qmlconfigproxy.cpp
@@ -69,6 +69,14 @@ const QString kWaveformOptionsKey = QStringLiteral("waveform_options");
 const QString kTooltipsKey = QStringLiteral("Tooltips");
 const QString kInhibitScreensaverKey = QStringLiteral("InhibitScreensaver");
 const QString kHideMenuBarKey = QStringLiteral("hide_menubar");
+const QString kSearchBpmFuzzyRange = QStringLiteral("search_bpm_fuzzy_range");
+const QString kSearchDebouncingTimeout = QStringLiteral("SearchDebouncingTimeoutMillis");
+const QString kRhythmboxEnabled = QStringLiteral("ShowRhythmboxLibrary");
+const QString kBansheeEnabled = QStringLiteral("ShowBansheeLibrary");
+const QString kITunesEnabled = QStringLiteral("ShowITunesLibrary");
+const QString kTraktorEnabled = QStringLiteral("ShowTraktorLibrary");
+const QString kRekordboxEnabled = QStringLiteral("ShowRekordboxLibrary");
+const QString kSeratoEnabled = QStringLiteral("ShowSeratoLibrary");
 const QString kEnableSearchCompletionsKey = QStringLiteral("EnableSearchCompletions");
 const QString kEnableSearchHistoryShortcutsKey = QStringLiteral("EnableSearchHistoryShortcuts");
 const QString kBpmColumnPrecisionKey = QStringLiteral("BpmColumnPrecision");
@@ -248,16 +256,25 @@ PROPERTY_IMPL(kLibraryGroup,
         libraryInhibitScreensaver,
         mixxx::preferences::ScreenSaver::On);
 PROPERTY_IMPL(kLibraryGroup, kHideMenuBarKey, bool, libraryHideMenuBar, false);
+PROPERTY_IMPL(kLibraryGroup, kSearchBpmFuzzyRange, double, librarySearchBpmFuzzyRange, 0.06);
+PROPERTY_IMPL(kLibraryGroup, kSearchDebouncingTimeout, int, librarySearchDebouncingTimeout, 300);
 PROPERTY_IMPL(kLibraryGroup,
         kEnableSearchCompletionsKey,
         bool,
-        libraryEnableSearchCompletions,
+        librarySearchCompletionsEnable,
         true);
 PROPERTY_IMPL(kLibraryGroup,
         kEnableSearchHistoryShortcutsKey,
         bool,
-        libraryEnableSearchHistoryShortcuts,
+        librarySearchHistoryShortcutsEnable,
         true);
+
+PROPERTY_IMPL(kLibraryGroup, kRhythmboxEnabled, bool, libraryRhythmboxEnabled, false);
+PROPERTY_IMPL(kLibraryGroup, kBansheeEnabled, bool, libraryBansheeEnabled, false);
+PROPERTY_IMPL(kLibraryGroup, kITunesEnabled, bool, libraryITunesEnabled, false);
+PROPERTY_IMPL(kLibraryGroup, kTraktorEnabled, bool, libraryTraktorEnabled, false);
+PROPERTY_IMPL(kLibraryGroup, kRekordboxEnabled, bool, libraryRekordboxEnabled, false);
+PROPERTY_IMPL(kLibraryGroup, kSeratoEnabled, bool, librarySeratoEnabled, false);
 PROPERTY_IMPL(kLibraryGroup,
         kBpmColumnPrecisionKey,
         int,
diff --git a/src/qml/qmlconfigproxy.h b/src/qml/qmlconfigproxy.h
@@ -94,12 +94,23 @@ class QmlConfigProxy : public QObject {
     PROPERTY_DECL(mixxx::preferences::Tooltips, libraryTooltips);
     PROPERTY_DECL(mixxx::preferences::ScreenSaver, libraryInhibitScreensaver);
     PROPERTY_DECL(bool, libraryHideMenuBar);
-    PROPERTY_DECL(bool, libraryEnableSearchCompletions);
-    PROPERTY_DECL(bool, libraryEnableSearchHistoryShortcuts);
+    // Percent, 0..1.0
+    PROPERTY_DECL(double, librarySearchBpmFuzzyRange);
+    // Duration (ms), 100..9999
+    PROPERTY_DECL(int, librarySearchDebouncingTimeout);
+    PROPERTY_DECL(bool, librarySearchCompletionsEnable);
+    PROPERTY_DECL(bool, librarySearchHistoryShortcutsEnable);
     // Decimal count, 0..10
     PROPERTY_DECL(int, libraryBpmColumnPrecision);
     // Pixels
     PROPERTY_DECL(double, libraryRowHeight);
+    // Integration
+    PROPERTY_DECL(bool, libraryRhythmboxEnabled);
+    PROPERTY_DECL(bool, libraryBansheeEnabled);
+    PROPERTY_DECL(bool, libraryITunesEnabled);
+    PROPERTY_DECL(bool, libraryTraktorEnabled);
+    PROPERTY_DECL(bool, libraryRekordboxEnabled);
+    PROPERTY_DECL(bool, librarySeratoEnabled);
 
     // Controls group
     // [0..activePaletteColorCount-1]
diff --git a/src/qml/qmllibraryproxy.cpp b/src/qml/qmllibraryproxy.cpp
@@ -3,7 +3,10 @@
 #include <QAbstractItemModel>
 
 #include "library/library.h"
+#include "library/trackcollection.h"
+#include "library/trackcollectionmanager.h"
 #include "moc_qmllibraryproxy.cpp"
+#include "qml_owned_ptr.h"
 
 namespace mixxx {
 namespace qml {
@@ -29,5 +32,57 @@ QmlLibraryProxy* QmlLibraryProxy::create(QQmlEngine* pQmlEngine, QJSEngine* pJsE
     return new QmlLibraryProxy(s_pLibrary, pQmlEngine);
 }
 
+QmlLibraryProxy::RelocateResult QmlLibraryProxy::relocate(
+        const QString& oldPath, const QString& newPath) {
+    VERIFY_OR_DEBUG_ASSERT(s_pLibrary) {
+        qWarning() << "Library hasn't been registered yet!";
+        return QmlLibraryProxy::RelocateResult::SqlError;
+    }
+    return static_cast<QmlLibraryProxy::RelocateResult>(
+            s_pLibrary->trackCollectionManager()->relocateDirectory(
+                    oldPath, newPath));
+}
+
+// Static
+qsizetype QmlLibraryProxy::sources_count(QQmlListProperty<QmlLibrarySource>* pList) {
+    QmlLibraryProxy* pLibrary = static_cast<QmlLibraryProxy*>(pList->object);
+    VERIFY_OR_DEBUG_ASSERT(pLibrary) {
+        return 0;
+    }
+    return pLibrary->m_pLibrary->trackCollectionManager()
+            ->internalCollection()
+            ->getRootDirectories()
+            .size();
+}
+
+// Static
+QmlLibrarySource* QmlLibraryProxy::sources_at(
+        QQmlListProperty<QmlLibrarySource>* pList, qsizetype index) {
+    VERIFY_OR_DEBUG_ASSERT(pList && pList->object) {
+        return nullptr;
+    }
+    QmlLibraryProxy* pLibrary = static_cast<QmlLibraryProxy*>(pList->object);
+    VERIFY_OR_DEBUG_ASSERT(pLibrary) {
+        return nullptr;
+    }
+    return make_qml_owned<QmlLibrarySource>(
+            pLibrary->m_pLibrary->trackCollectionManager()
+                    ->internalCollection()
+                    ->getRootDirectories()
+                    .at(index));
+}
+
+// Static
+void QmlLibraryProxy::sources_clear(QQmlListProperty<QmlLibrarySource>* pList) {
+    QmlLibraryProxy* pLibrary = static_cast<QmlLibraryProxy*>(pList->object);
+    VERIFY_OR_DEBUG_ASSERT(pLibrary) {
+        return;
+    }
+    return pLibrary->m_pLibrary->trackCollectionManager()
+            ->internalCollection()
+            ->getRootDirectories()
+            .clear();
+}
+
 } // namespace qml
 } // namespace mixxx
diff --git a/src/qml/qmllibraryproxy.h b/src/qml/qmllibraryproxy.h
@@ -3,6 +3,7 @@
 #include <QQmlEngine>
 #include <memory>
 
+#include "library/dao/directorydao.h"
 #include "qml/qmllibrarytracklistmodel.h"
 #include "util/parented_ptr.h"
 
@@ -13,13 +14,40 @@ namespace qml {
 
 class QmlLibraryTrackListModel;
 
+class QmlLibrarySource : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString path MEMBER m_path CONSTANT)
+    Q_PROPERTY(uint totalSecond MEMBER m_totalSecond CONSTANT)
+    Q_PROPERTY(uint trackCount MEMBER m_trackCount CONSTANT)
+    QML_NAMED_ELEMENT(LibrarySource)
+  public:
+    QmlLibrarySource(DirectoryDAO::RootDirectory record)
+            : m_path(record.path),
+              m_totalSecond(record.totalSecond),
+              m_trackCount(record.trackCount) {
+    }
+
+  private:
+    QString m_path;
+    uint m_totalSecond;
+    uint m_trackCount;
+};
+
 class QmlLibraryProxy : public QObject {
     Q_OBJECT
     Q_PROPERTY(mixxx::qml::QmlLibraryTrackListModel* model MEMBER m_pModelProperty CONSTANT)
+    Q_PROPERTY(QQmlListProperty<QmlLibrarySource> sources READ sources)
     QML_NAMED_ELEMENT(Library)
     QML_SINGLETON
 
   public:
+    enum class RelocateResult {
+        Ok,
+        InvalidOrMissingDirectory,
+        UnreadableDirectory,
+        SqlError,
+    };
+
     explicit QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent = nullptr);
 
     static QmlLibraryProxy* create(QQmlEngine* pQmlEngine, QJSEngine* pJsEngine);
@@ -31,13 +59,29 @@ class QmlLibraryProxy : public QObject {
         return s_pLibrary.get();
     }
 
+    QQmlListProperty<QmlLibrarySource> sources() {
+        return {this,
+                nullptr,
+                nullptr,
+                &QmlLibraryProxy::sources_count,
+                &QmlLibraryProxy::sources_at,
+                &QmlLibraryProxy::sources_clear};
+    }
+
+    Q_INVOKABLE RelocateResult relocate(const QString& oldPath, const QString& newPath);
+
   private:
     static inline std::shared_ptr<Library> s_pLibrary;
 
     std::shared_ptr<Library> m_pLibrary;
 
     /// This needs to be a plain pointer because it's used as a `Q_PROPERTY` member variable.
     QmlLibraryTrackListModel* m_pModelProperty;
+
+    static qsizetype sources_count(QQmlListProperty<QmlLibrarySource>* property);
+    static QmlLibrarySource* sources_at(
+            QQmlListProperty<QmlLibrarySource>* property, qsizetype index);
+    static void sources_clear(QQmlListProperty<QmlLibrarySource>* property);
 };
 
 } // namespace qml
