Support multiple library folders.

.gitignore

@@ -12,6 +12,8 @@
 .sconf_temp
 .sconsign.branch
 .sconsign.dblite
+*.sqlite
+*.cfg
 cache
 lib/*/*.a
 lib/*/lib/*.a

build/depends.py

@@ -583,6 +583,7 @@ def sources(self, build):
                    "library/libraryfeature.cpp",
                    "library/analysisfeature.cpp",
                    "library/autodjfeature.cpp",
+                   "library/dao/directorydao.cpp",
                    "library/mixxxlibraryfeature.cpp",
                    "library/baseplaylistfeature.cpp",
                    "library/playlistfeature.cpp",

res/schema.xml

@@ -373,4 +373,14 @@ METADATA
       ALTER TABLE itunes_library ADD COLUMN album_artist TEXT DEFAULT "";
     </sql>
   </revision>
+  <revision version="23" min_compatible="3">
+    <description>
+      Add directories table
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS directories (
+        directory TEXT UNIQUE
+      );
+    </sql>
+  </revision>
 </schema>

src/dlgpreferences.cpp

@@ -54,7 +54,7 @@
 DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader,
                                SoundManager * soundman, PlayerManager* pPlayerManager,
                                ControllerManager * controllers, VinylControlManager *pVCManager,
-                               ConfigObject<ConfigValue>* pConfig)
+                               ConfigObject<ConfigValue>* pConfig, Library *pLibrary)
         : m_pageSizeHint(QSize(0, 0)),
           m_preferencesUpdated(ConfigKey("[Preferences]", "updated")) {
     setupUi(this);
@@ -81,7 +81,7 @@ DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader,
 #endif
     m_wsound = new DlgPrefSound(this, soundman, pPlayerManager, pConfig);
     addPageWidget(m_wsound);
-    m_wplaylist = new DlgPrefPlaylist(this, pConfig);
+    m_wplaylist = new DlgPrefPlaylist(this, pConfig, pLibrary);
     addPageWidget(m_wplaylist);
     m_wcontrols = new DlgPrefControls(this, mixxx, pSkinLoader, pPlayerManager, pConfig);
     addPageWidget(m_wcontrols);

src/dlgpreferences.h

@@ -44,6 +44,7 @@ class DlgPrefReplayGain;
 class ControllerManager;
 class SkinLoader;
 class PlayerManager;
+class Library;
 class VinylControlManager;
 #ifdef __MODPLUG__
 class DlgPrefModplug;
@@ -54,7 +55,8 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg {
   public:
     DlgPreferences(MixxxApp* mixxx, SkinLoader* pSkinLoader, SoundManager* soundman,
                    PlayerManager* pPlayerManager, ControllerManager* controllers,
-                   VinylControlManager* pVCManager, ConfigObject<ConfigValue>* config);
+                   VinylControlManager* pVCManager, ConfigObject<ConfigValue>* pConfig,
+                   Library *pLibrary);
     virtual ~DlgPreferences();
 
     void addPageWidget(DlgPreferencePage* pWidget);

src/dlgprefplaylist.cpp

@@ -16,7 +16,9 @@
 ***************************************************************************/
 
 #include <QDesktopServices>
+#include <QDir>
 #include <QFileDialog>
+#include <QStringList>
 #include <QUrl>
 
 #include "dlgprefplaylist.h"
@@ -25,15 +27,28 @@
 #define MIXXX_ADDONS_URL "http://www.mixxx.org/wiki/doku.php/add-ons"
 
 
-DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * config)
-        : DlgPreferencePage(parent),
-          m_pconfig(config) {
+DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent,
+        ConfigObject<ConfigValue> * config, Library *pLibrary)
+        :DlgPreferencePage(parent),
+        m_dirListModel(),
+        m_pconfig(config),
+        m_pLibrary(pLibrary) {
     setupUi(this);
     slotUpdate();
     checkbox_ID3_sync->setVisible(false);
 
-    connect(PushButtonBrowsePlaylist, SIGNAL(clicked()),
-            this, SLOT(slotBrowseDir()));
+    connect(this, SIGNAL(requestAddDir(QString)),
+            m_pLibrary, SLOT(slotRequestAddDir(QString)));
+    connect(this, SIGNAL(requestRemoveDir(QString, bool)),
+            m_pLibrary, SLOT(slotRequestRemoveDir(QString, bool)));
+    connect(this, SIGNAL(requestRelocateDir(QString,QString)),
+            m_pLibrary, SLOT(slotRequestRelocateDir(QString,QString)));
+    connect(PushButtonAddDir, SIGNAL(clicked()),
+            this, SLOT(slotAddDir()));
+    connect(PushButtonRemoveDir, SIGNAL(clicked()),
+            this, SLOT(slotRemoveDir()));
+    connect(PushButtonRelocateDir, SIGNAL(clicked()),
+            this, SLOT(slotRelocateDir()));
     //connect(pushButtonM4A, SIGNAL(clicked()), this, SLOT(slotM4ACheck()));
     connect(pushButtonExtraPlugins, SIGNAL(clicked()),
             this, SLOT(slotExtraPlugins()));
@@ -49,14 +64,33 @@ DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * c
 DlgPrefPlaylist::~DlgPrefPlaylist() {
 }
 
+void DlgPrefPlaylist::initialiseDirList(){
+    // save which index was selected
+    const QString selected = dirList->currentIndex().data().toString();
+    // clear and fill model
+    m_dirListModel.clear();
+    QStringList dirs = m_pLibrary->getDirs();
+    foreach (QString dir, dirs) {
+        m_dirListModel.appendRow(new QStandardItem(dir));
+    }
+    dirList->setModel(&m_dirListModel);
+    dirList->setCurrentIndex(m_dirListModel.index(0, 0));
+    // reselect index if it still exists
+    for (int i=0 ; i<m_dirListModel.rowCount() ; ++i) {
+        const QModelIndex index = m_dirListModel.index(i, 0);
+        if (index.data().toString() == selected) {
+            dirList->setCurrentIndex(index);
+            break;
+        }
+    }
+}
+
 void DlgPrefPlaylist::slotExtraPlugins() {
     QDesktopServices::openUrl(QUrl(MIXXX_ADDONS_URL));
 }
 
 void DlgPrefPlaylist::slotUpdate() {
-    // Library Path
-    LineEditSongfiles->setText(m_pconfig->getValueString(
-            ConfigKey("[Playlist]","Directory")));
+    initialiseDirList();
     //Bundled songs stat tracking
     checkBox_library_scan->setChecked((bool)m_pconfig->getValueString(
             ConfigKey("[Library]","RescanOnStartup")).toInt());
@@ -74,12 +108,61 @@ void DlgPrefPlaylist::slotUpdate() {
             ConfigKey("[Library]","ShowTraktorLibrary"),"1").toInt());
 }
 
-void DlgPrefPlaylist::slotBrowseDir() {
-    QString fd = QFileDialog::getExistingDirectory(this,
-                 tr("Choose music library directory"),
-                 m_pconfig->getValueString(ConfigKey("[Playlist]","Directory")));
-    if (fd != "") {
-        LineEditSongfiles->setText(fd);
+void DlgPrefPlaylist::slotAddDir() {
+    QString fd = QFileDialog::getExistingDirectory(
+        this, tr("Choose a music library directory"),
+        QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+    if (!fd.isEmpty()) {
+        emit(requestAddDir(fd));
+        slotUpdate();
+    }
+}
+
+void DlgPrefPlaylist::slotRemoveDir() {
+    QModelIndex index = dirList->currentIndex();
+    QString fd = index.data().toString();
+    QMessageBox removeMsgBox;
+    removeMsgBox.setText(tr("Mixxx will hide any information about tracks in "
+                            "this directory. Once you re-add the directory all "
+                            "metadata will be restored"));
+    removeMsgBox.setInformativeText(tr("Do you want to remove this directory?"));
+    removeMsgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
+    QPushButton *removeAllButton = removeMsgBox.addButton(tr("Remove Metadata"),
+            QMessageBox::YesRole);
+    removeMsgBox.setDefaultButton(QMessageBox::Cancel);
+
+    int ret = removeMsgBox.exec();
+    bool removeAll = removeMsgBox.clickedButton() == removeAllButton;
+
+    if (ret == QMessageBox::Yes || removeAll) {
+        emit(requestRemoveDir(fd, removeAll));
+        slotUpdate();
+    }
+
+}
+
+void DlgPrefPlaylist::slotRelocateDir() {
+    QModelIndex index = dirList->currentIndex();
+    QString currentFd = index.data().toString();
+
+    // If the selected directory exists, use it. If not, go up one directory (if
+    // that directory exists). If neither exist, use the default music
+    // directory.
+    QString startDir = currentFd;
+    QDir dir(startDir);
+    if (!dir.exists() && dir.cdUp()) {
+        startDir = dir.absolutePath();
+    } else if (!dir.exists()) {
+        startDir = QDesktopServices::storageLocation(
+            QDesktopServices::MusicLocation);
+    }
+
+    QString fd = QFileDialog::getExistingDirectory(
+        this, tr("relocate to directory"), startDir);
+
+    if (!fd.isEmpty()) {
+        emit(requestRelocateDir(currentFd, fd));
+        slotUpdate();
     }
 }
 
@@ -99,10 +182,5 @@ void DlgPrefPlaylist::slotApply() {
     m_pconfig->set(ConfigKey("[Library]","ShowTraktorLibrary"),
                 ConfigValue((int)checkBox_show_traktor->isChecked()));
 
-    if (LineEditSongfiles->text() !=
-            m_pconfig->getValueString(ConfigKey("[Playlist]","Directory"))) {
-        m_pconfig->set(ConfigKey("[Playlist]","Directory"), LineEditSongfiles->text());
-        emit(apply());
-    }
     m_pconfig->Save();
 }

src/dlgprefplaylist.h

@@ -18,10 +18,12 @@
 #ifndef DLGPREFPLAYLIST_H
 #define DLGPREFPLAYLIST_H
 
+#include <QStandardItemModel>
 #include <QWidget>
 
 #include "ui_dlgprefplaylistdlg.h"
 #include "configobject.h"
+#include "library/library.h"
 #include "preferences/dlgpreferencepage.h"
 
 /**
@@ -31,24 +33,33 @@
 class DlgPrefPlaylist : public DlgPreferencePage, public Ui::DlgPrefPlaylistDlg  {
     Q_OBJECT
   public:
-    DlgPrefPlaylist(QWidget *parent, ConfigObject<ConfigValue> *config);
+    DlgPrefPlaylist(QWidget *parent, ConfigObject<ConfigValue> *config,
+                    Library *pLibrary);
     virtual ~DlgPrefPlaylist();
 
   public slots:
     // Update widget
     void slotUpdate();
     // Dialog to browse for music file directory
-    void slotBrowseDir();
+    void slotAddDir();
+    void slotRemoveDir();
+    void slotRelocateDir();
     // Apply changes to widget
     void slotApply();
 
     void slotExtraPlugins();
 
   signals:
     void apply();
+    void requestAddDir(QString dir);
+    void requestRemoveDir(QString dir, bool removeAll);
+    void requestRelocateDir(QString currentDir, QString newDir);
 
   private:
+    void initialiseDirList();
+    QStandardItemModel m_dirListModel;
     ConfigObject<ConfigValue>* m_pconfig;
+    Library *m_pLibrary;
 };
 
 #endif