Merge lp:~mixxxdevelopers/mixxx/library_features into lp:~mixxxdevelopers/mixxx/trunk

[RJ Skerry-Ryan]

Getting the ball rolling on the code review for Max's library_features work.

[RJ Skerry-Ryan (rryan)]

Hey Max -- I know you aren't ready to merge this yet but I gave it a quick skim while getting chromaprint on the build server and thought I'd shoot you some comments:

* DlgPrefPlaylist
  - SQL queries should not be done here -- need to be abstracted away by a DAO.
  - Shouldn't rely on the default DB connection existing -- TrackCollection needs to get passed into DlgPreferences. (We could change the creation order in the future and this code would break -- better to have it enforced by code)

* BaseSqlTableModel::relocateTracks
  - It would be cool if you could handle the use case where you select a whole album and hit relocate. Either maybe auto-magically detecting that the rest of the selected missing files are in the same directory as the first missing one relocated or maybe by letting the user pick a directory if it is clear that all the selected files were in the same directory originally. This would be a handy speedup.

* DirectoryDAO::addDirectory -- I don't see multiple queries so I don't think it needs a transaction.

* DirectoryDAO::relocateDirectory -- the string arguments in these queries are untrusted and need escaping. Use QSqlQuery::bindValue see TrackDAO::updateTrack for an example.

* DirectoryDAO::getDirIds, DirectoryDAO::getDirId -- same comment RE: escaping.

* DirectoryDAO::updateTrackLocations -- same comments re: escaping. Also this sets every track_locations entry to have the directory. Based on the calls to this function I'm not sure that was the intended functionality. What's this function supposed to do?

* TrackDAO::deleteTracksFromFS -- QMessageBox / GUI code shouldn't be in the DAO's (especially if all this code goes to its own thread eventually). Instead, have the caller pass in a list of stuff that you append un-removeable file paths to or something similar.

* TrackDAO -- some of your queries are using strings that need escaping .. you can only use string construction of the query for when you know the values are safe (i.e. a list of numeric IDs that you join together with commas.) or when you are using table names, column names, and other constants. Strings coming from user input (names, directories, paths, etc.) all need escaping.

* I'm scared of adding delete-on-filesystem code to Mixxx. Is it worth it to let the user do that? The cost of failure is huge in loss of user trust.

And now, about checksumming:

Checksumming every file when we add it to the library has to come with a huge performance hit to the library scanner. Have you noticed this? Albert and I considered checksums when we first wrote the SQLite library but didn't go with it because of this issue. I thought it would be a good compromise to do the checksums in the analyser queue (because it would be much less noticed there) and then only use the checksum for re-unification if it is present.

And now some comments about the checksum implementation itself:

* We should store version information about the checksum with it in a checksum_version column or with a unique string prefix to put on the front (I prefer a separate column since separators never end up being as unique as you thought they were).

* RE: md5 -- we probably don't need a c...

[lp:~mixxxdevelopers/mixxx/library_features]

3264. By Max Linke <[e-mail]> on 2013-05-07

fix cratetablemodel.cpp, library is not shown there is something off

3265. By Max Linke <[e-mail]> on 2013-05-07

disabled previewDeck to make everything work for now

3266. By Max Linke <[e-mail]> on 2013-05-07

reenabled preview deck, fixed temporary view that is created by the tablemodels

3267. By Max Linke <[e-mail]> on 2013-05-07

changed name for chromaprint library in scons

3268. By Max Linke <[e-mail]> on 2013-05-07

added missing files

3269. By Max Linke <[e-mail]> on 2013-05-07

I'm stupid -.-

3270. By Max Linke <[e-mail]> on 2013-05-07

next try for the build server

3271. By RJ Skerry-Ryan on 2013-05-08

Check for chromaprint_p.

3272. By RJ Skerry-Ryan on 2013-05-08

Check for chromaprint_p.

3273. By RJ Skerry-Ryan on 2013-05-08

Try detecting chromaprint after chromaprint_p?

3274. By RJ Skerry-Ryan on 2013-05-08

Roll-back r3273.

3275. By RJ Skerry-Ryan on 2013-05-08

Add chromaprint to LIBS manually after CheckLib passes.

3276. By RJ Skerry-Ryan on 2013-05-08

Add CHROMAPRINT_NODLL to CPPDEFINES.

3277. By RJ Skerry-Ryan on 2013-05-08

Typo.

3278. By RJ Skerry-Ryan on 2013-05-08

Only define CHROMAPRINT_NODLL for static_dependencies.

3279. By RJ Skerry-Ryan on 2013-05-08

Link fftw3 on Windows only.

3280. By Max Linke <[e-mail]> on 2013-05-10

merge with trunk, library scanner does not add songs

3281. By Max Linke <[e-mail]> on 2013-05-10

does launchpad use my email now?

3282. By Max Linke <[e-mail]> on 2013-05-10

next try

3283. By Max Linke <email address hidden> on 2013-05-10

next try 2

3284. By Max Linke <email address hidden> on 2013-05-11

removed fringerprinting feature that is moved into chromaprint branch

3285. By Max Linke <email address hidden> on 2013-05-12

merge with trunk

3286. By Max Linke <email address hidden> on 2013-05-18

merge with trunk

3287. By Max Linke <email address hidden> on 2013-05-18

merge with trunk

3288. By Max Linke <email address hidden> on 2013-05-18

merge with trunk

Unmerged revisions

3288. By Max Linke <email address hidden> on 2013-05-18

merge with trunk

3287. By Max Linke <email address hidden> on 2013-05-18

merge with trunk

3286. By Max Linke <email address hidden> on 2013-05-18

merge with trunk

3285. By Max Linke <email address hidden> on 2013-05-12

merge with trunk

3284. By Max Linke <email address hidden> on 2013-05-11

removed fringerprinting feature that is moved into chromaprint branch

3283. By Max Linke <email address hidden> on 2013-05-10

next try 2

3282. By Max Linke <[e-mail]> on 2013-05-10

next try

3281. By Max Linke <[e-mail]> on 2013-05-10

does launchpad use my email now?

3280. By Max Linke <[e-mail]> on 2013-05-10

merge with trunk, library scanner does not add songs

3279. By RJ Skerry-Ryan on 2013-05-08

Link fftw3 on Windows only.

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2013-05-16 01:40:06 +0000
+++ mixxx/build/depends.py	2013-05-18 16:32:26 +0000
@@ -569,6 +569,7 @@
                    "library/libraryfeature.cpp",
                    "library/preparefeature.cpp",
                    "library/autodjfeature.cpp",
+                   "library/dao/directorydao.cpp",
                    "library/mixxxlibraryfeature.cpp",
                    "library/baseplaylistfeature.cpp",
                    "library/playlistfeature.cpp",

=== modified file 'mixxx/res/schema.xml'
--- mixxx/res/schema.xml	2013-05-07 03:17:23 +0000
+++ mixxx/res/schema.xml	2013-05-18 16:32:26 +0000
@@ -338,4 +338,18 @@
       ALTER TABLE Library ADD COLUMN keys_sub_version TEXT;
     </sql>
   </revision>
+  <revision version="19" min_compatible="3">
+    <description>
+      Add directories table
+    </description>
+    <sql>
+      CREATE TABLE IF NOT EXISTS directories (
+        dir_id INTEGER primary key AUTOINCREMENT,
+        directory varchar(1024)
+      );
+      CREATE UNIQUE INDEX directory_idx ON directories(directory);
+      ALTER TABLE track_locations ADD COLUMN maindir_id INTEGER DEFAULT 0;
+      ALTER TABLE track_locations ADD COLUMN checksum varchar(1024);
+    </sql>
+  </revision>
 </schema>

=== modified file 'mixxx/src/dlgautodj.cpp'
--- mixxx/src/dlgautodj.cpp	2013-05-18 16:23:08 +0000
+++ mixxx/src/dlgautodj.cpp	2013-05-18 16:32:26 +0000
@@ -43,14 +43,17 @@
     box->insertWidget(1, m_pTrackTableView);
 
     m_pAutoDJTableModel = new PlaylistTableModel(this, pTrackCollection,
-                                                 "mixxx.db.model.autodj");
+                                                "mixxx.db.model.autodj",
+                                                 m_pConfig);
+    connect(this, SIGNAL(configChanged(QString,QString)),
+            m_pAutoDJTableModel, SLOT(slotConfigChanged(QString,QString)));
     PlaylistDAO& playlistDao = pTrackCollection->getPlaylistDAO();
     int playlistId = playlistDao.getPlaylistIdFromName(AUTODJ_TABLE);
     if (playlistId < 0) {
         playlistId = playlistDao.createPlaylist(AUTODJ_TABLE,
                                                 PlaylistDAO::PLHT_AUTO_DJ);
     }
-    m_pAutoDJTableModel->setPlaylist(playlistId);
+    m_pAutoDJTableModel->setTableModel(playlistId);
     m_pTrackTableView->loadTrackModel(m_pAutoDJTableModel);
 
     // Override some playlist-view properties:

=== modified file 'mixxx/src/dlgautodj.h'
--- mixxx/src/dlgautodj.h	2013-04-12 15:27:07 +0000
+++ mixxx/src/dlgautodj.h	2013-05-18 16:32:26 +0000
@@ -47,6 +47,7 @@
 
   signals:
     void loadTrack(TrackPointer tio);
+    void configChanged(QString,QString);
     void loadTrackToPlayer(TrackPointer tio, QString group, bool);
 
   private:

=== modified file 'mixxx/src/dlgpreferences.cpp'
--- mixxx/src/dlgpreferences.cpp	2013-05-12 10:15:29 +0000
+++ mixxx/src/dlgpreferences.cpp	2013-05-18 16:32:26 +0000
@@ -80,6 +80,11 @@
     addPageWidget(m_wsound);
     m_wplaylist = new DlgPrefPlaylist(this, config);
     addPageWidget(m_wplaylist);
+    connect(m_wplaylist, SIGNAL(configChanged(QString,QString)),
+            this, SIGNAL(configChanged(QString,QString)));
+    connect(m_wplaylist, SIGNAL(dirsChanged(QString,QString)),
+            this, SIGNAL(dirsChanged(QString,QString)));
+
     m_wcontrols = new DlgPrefControls(this, mixxx, pSkinLoader, pPlayerManager, config);
     addPageWidget(m_wcontrols);
     m_weq = new DlgPrefEQ(this, config);

=== modified file 'mixxx/src/dlgpreferences.h'
--- mixxx/src/dlgpreferences.h	2013-05-12 10:15:29 +0000
+++ mixxx/src/dlgpreferences.h	2013-05-18 16:32:26 +0000
@@ -74,6 +74,8 @@
 signals:
     void closeDlg();
     void showDlg();
+    void configChanged(QString, QString);
+    void dirsChanged(QString, QString);
 protected:
     bool eventFilter(QObject*, QEvent*);
 private:

=== modified file 'mixxx/src/dlgprefplaylist.cpp'
--- mixxx/src/dlgprefplaylist.cpp	2013-05-18 16:23:08 +0000
+++ mixxx/src/dlgprefplaylist.cpp	2013-05-18 16:32:26 +0000
@@ -15,6 +15,9 @@
 *                                                                         *
 ***************************************************************************/
 
+#include <QSqlDatabase>
+#include <QSqlQuery>
+#include <QSqlRecord>
 #include <QUrl>
 #include <QDesktopServices>
 #include <QFileDialog>
@@ -30,6 +33,8 @@
 
 DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * config)
             : QWidget(parent), 
+              m_model(),
+              m_dirsModified(false),
               m_pconfig(config) {
     setupUi(this);
     slotUpdate();
@@ -51,6 +56,10 @@
 
     connect(PushButtonBrowsePlaylist, SIGNAL(clicked()),
             this, SLOT(slotBrowseDir()));
+    connect(PushButtonRemovePlaylist, SIGNAL(clicked()),
+            this, SLOT(slotRemoveDir()));
+    connect(pushButton_2, SIGNAL(clicked()),
+            this, SLOT(slotRelocateDir()));
     //connect(pushButtonM4A, SIGNAL(clicked()), this, SLOT(slotM4ACheck()));
     connect(pushButtonExtraPlugins, SIGNAL(clicked()),
             this, SLOT(slotExtraPlugins()));
@@ -74,6 +83,40 @@
 DlgPrefPlaylist::~DlgPrefPlaylist() {
 }
 
+bool DlgPrefPlaylist::initializeModel(){
+    // this will hook into the default connection, so we don't need to
+    // provide anymore information. This works because the Library is
+    // created before the Preferences and a connection already exists.
+    // --kain88 July 2012
+    QSqlDatabase database = QSqlDatabase::database();
+    QSqlQuery query;
+    query.prepare("SELECT directory from directories");
+    if (!query.exec()) {
+        qDebug() << "damn there are no directories to display";
+        return false;
+    }
+    // save which index was selected
+    const int selected = list->currentIndex().row();
+    m_model.clear();
+    while(query.next()){
+        QStandardItem* pitem = new QStandardItem(
+                               query.value(query.record().indexOf("directory"))
+                               .toString());
+        m_model.appendRow(pitem);
+    }
+    list->setModel(&m_model);
+    // first select the first index then change it to selected if it still exists
+    list->setCurrentIndex(list->model()->index(0, 0));
+    for (int i=0 ; i<list->model()->rowCount() ; ++i) {
+        const QModelIndex index = list->model()->index(i, 0);
+        if (index.row() == selected) {
+            list->setCurrentIndex(index);
+            break;
+        }
+    }
+    return true;
+}
+
 void DlgPrefPlaylist::slotExtraPlugins() {
     QDesktopServices::openUrl(QUrl(MIXXX_ADDONS_URL));
 }
@@ -141,9 +184,8 @@
 }*/
 
 void DlgPrefPlaylist::slotUpdate() {
-    // Library Path
-    LineEditSongfiles->setText(m_pconfig->getValueString(
-                               ConfigKey("[Playlist]","Directory")));
+    // Song path
+    initializeModel();
     //Bundled songs stat tracking
     checkBoxPromoStats->setChecked((bool)m_pconfig->getValueString(
             ConfigKey("[Promo]","StatTracking")).toInt());
@@ -159,14 +201,41 @@
             ConfigKey("[Library]","ShowITunesLibrary"),"1").toInt());
     checkBox_show_traktor->setChecked((bool)m_pconfig->getValueString(
             ConfigKey("[Library]","ShowTraktorLibrary"),"1").toInt());
+    checkBox_show_missing->setChecked((bool)m_pconfig->getValueString(
+            ConfigKey("[Library]","ShowMissingSongs"),"1").toInt());
 }
 
 void DlgPrefPlaylist::slotBrowseDir() {
     QString fd = QFileDialog::getExistingDirectory(this,
-                 tr("Choose music library directory"),
-                 m_pconfig->getValueString(ConfigKey("[Playlist]","Directory")));
+                            tr("Choose music library directory"),
+                            QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
     if (fd != "") {
-        LineEditSongfiles->setText(fd);
+        emit(dirsChanged("added",fd));
+        slotUpdate();
+        m_dirsModified = true;
+    }
+}
+
+void DlgPrefPlaylist::slotRemoveDir() {
+    QModelIndex index = list->currentIndex();
+    QString fd = index.data().toString();
+    emit(dirsChanged("removed",fd));
+    slotUpdate();
+    m_dirsModified = true;
+}
+
+void DlgPrefPlaylist::slotRelocateDir() {
+    QModelIndex index = list->currentIndex();
+    QString currentFd = index.data().toString();
+    QString fd = QFileDialog::getExistingDirectory(this,
+                            tr("Choose music library directory"),
+                            QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+
+    //use !(~)! as a sign where the string has to be seperated later
+    if(!fd.isEmpty()){
+        emit(dirsChanged("relocate",fd+"!(~)!"+currentFd));
+        slotUpdate();
+        m_dirsModified = true;
     }
 }
 
@@ -186,10 +255,19 @@
     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());
+    // Update playlist if path has changed
+    if (m_dirsModified) {
         emit(apply());
     }
+
+    //update TM if ShowMissingSongs has changed
+    if ((int)checkBox_show_missing->isChecked() != m_pconfig->getValueString(
+                                                ConfigKey("[Library]",
+                                                "ShowMissingSongs"),"1").toInt()) {
+        m_pconfig->set(ConfigKey("[Library]","ShowMissingSongs"),
+                ConfigValue((int)checkBox_show_missing->isChecked()));
+
+        emit(configChanged("[Library]","ShowMissingSongs"));
+    }
     m_pconfig->Save();
 }

=== modified file 'mixxx/src/dlgprefplaylist.h'
--- mixxx/src/dlgprefplaylist.h	2013-05-18 16:23:08 +0000
+++ mixxx/src/dlgprefplaylist.h	2013-05-18 16:32:26 +0000
@@ -18,6 +18,8 @@
 #ifndef DLGPREFPLAYLIST_H
 #define DLGPREFPLAYLIST_H
 
+#include <QStandardItemModel>
+
 #include "ui_dlgprefplaylistdlg.h"
 #include "configobject.h"
 
@@ -37,6 +39,8 @@
     void slotUpdate();
     // Dialog to browse for music file directory 
     void slotBrowseDir();
+    void slotRemoveDir();
+    void slotRelocateDir();
     // Apply changes to widget 
     void slotApply();
     // Starts up the PluginDownloader if the plugin isn't present
@@ -53,8 +57,13 @@
 
   signals:
     void apply();
+    void configChanged(QString, QString);
+    void dirsChanged(QString, QString);
 
   private:
+    bool initializeModel();
+    QStandardItemModel m_model;
+    bool m_dirsModified;
     ConfigObject<ConfigValue> *m_pconfig;
     // SoundSource Plugin Downloader
     //PluginDownloader* m_pPluginDownloader;

=== modified file 'mixxx/src/dlgprefplaylistdlg.ui'
--- mixxx/src/dlgprefplaylistdlg.ui	2012-12-09 17:41:04 +0000
+++ mixxx/src/dlgprefplaylistdlg.ui	2013-05-18 16:32:26 +0000
@@ -41,30 +41,47 @@
          <bool>false</bool>
         </property>
         <property name="buddy">
-         <cstring>LineEditSongfiles</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="LineEditSongfiles">
-        <property name="minimumSize">
+         <cstring>list</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QPushButton" name="PushButtonRemovePlaylist">
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>Remove</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" rowspan="3">
+       <widget class="QListView" name="list">
+        <property name="iconSize">
          <size>
-          <width>100</width>
-          <height>10</height>
+          <width>16</width>
+          <height>16</height>
          </size>
         </property>
-        <property name="font">
-         <font/>
+        <property name="uniformItemSizes">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
+      <item row="1" column="1">
        <widget class="QPushButton" name="PushButtonBrowsePlaylist">
         <property name="font">
          <font/>
         </property>
         <property name="text">
-         <string>Browse...</string>
+         <string>Add</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="pushButton_2">
+        <property name="text">
+         <string>Relocate</string>
         </property>
        </widget>
       </item>
@@ -181,6 +198,16 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="0">
+       <widget class="QCheckBox" name="checkBox_show_missing">
+        <property name="text">
+         <string>Show Missing Songs</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -230,19 +257,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

=== modified file 'mixxx/src/dlgprefrecord.cpp'
--- mixxx/src/dlgprefrecord.cpp	2013-05-15 06:09:40 +0000
+++ mixxx/src/dlgprefrecord.cpp	2013-05-18 16:32:26 +0000
@@ -47,10 +47,7 @@
     if (recordingsPath == "") {
         // Initialize recordings path in config to old default path.
         // Do it here so we show current value in UI correctly.
-        QString musicDir = config->getValueString(ConfigKey("[Playlist]","Directory"));
-        if (musicDir.isEmpty()) {
-            musicDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
-        }
+        QString musicDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
         QDir recordDir(musicDir + "/Mixxx/Recordings");
         recordingsPath = recordDir.absolutePath();
     }

=== modified file 'mixxx/src/library/autodjfeature.cpp'
--- mixxx/src/library/autodjfeature.cpp	2013-05-12 22:17:32 +0000
+++ mixxx/src/library/autodjfeature.cpp	2013-05-18 16:32:26 +0000
@@ -45,6 +45,8 @@
     libraryWidget->registerView(m_sAutoDJViewName, m_pAutoDJView);
     connect(m_pAutoDJView, SIGNAL(loadTrack(TrackPointer)),
             this, SIGNAL(loadTrack(TrackPointer)));
+    connect(this, SIGNAL(configChanged(QString,QString)),
+            m_pAutoDJView, SIGNAL(configChanged(QString,QString)));
     connect(m_pAutoDJView, SIGNAL(loadTrackToPlayer(TrackPointer, QString, bool)),
             this, SIGNAL(loadTrackToPlayer(TrackPointer, QString, bool)));
 }

=== modified file 'mixxx/src/library/autodjfeature.h'
--- mixxx/src/library/autodjfeature.h	2012-12-12 17:23:33 +0000
+++ mixxx/src/library/autodjfeature.h	2013-05-18 16:32:26 +0000
@@ -35,6 +35,9 @@
 
     TreeItemModel* getChildModel();
 
+  signals:
+    void configChanged(QString,QString);
+
   public slots:
     void activate();
 

=== modified file 'mixxx/src/library/baseexternalplaylistmodel.cpp'
--- mixxx/src/library/baseexternalplaylistmodel.cpp	2012-11-25 11:17:13 +0000
+++ mixxx/src/library/baseexternalplaylistmodel.cpp	2013-05-18 16:32:26 +0000
@@ -6,10 +6,10 @@
 BaseExternalPlaylistModel::BaseExternalPlaylistModel(
     QObject* parent, TrackCollection* pTrackCollection,
     QString settingsNamespace, QString playlistsTable,
-    QString playlistTracksTable, QString trackSource)
+    QString playlistTracksTable, QString trackSource,
+    ConfigObject<ConfigValue>* pConfig)
         : BaseSqlTableModel(parent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            settingsNamespace),
+                            pConfig, settingsNamespace),
           m_playlistsTable(playlistsTable),
           m_playlistTracksTable(playlistTracksTable),
           m_trackSource(trackSource),

=== modified file 'mixxx/src/library/baseexternalplaylistmodel.h'
--- mixxx/src/library/baseexternalplaylistmodel.h	2012-11-22 06:59:01 +0000
+++ mixxx/src/library/baseexternalplaylistmodel.h	2013-05-18 16:32:26 +0000
@@ -10,13 +10,15 @@
 #include "library/librarytablemodel.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackdao.h"
+#include "configobject.h"
 
 class BaseExternalPlaylistModel : public BaseSqlTableModel {
     Q_OBJECT
   public:
     BaseExternalPlaylistModel(QObject* pParent, TrackCollection* pTrackCollection,
                               QString settingsNamespace, QString playlistsTable,
-                              QString playlistTracksTable, QString trackSource);
+                              QString playlistTracksTable, QString trackSource,
+                              ConfigObject<ConfigValue>* pConfig);
     virtual ~BaseExternalPlaylistModel();
 
     virtual TrackPointer getTrack(const QModelIndex& index) const;

=== modified file 'mixxx/src/library/baseexternaltrackmodel.cpp'
--- mixxx/src/library/baseexternaltrackmodel.cpp	2012-11-25 11:17:13 +0000
+++ mixxx/src/library/baseexternaltrackmodel.cpp	2013-05-18 16:32:26 +0000
@@ -6,10 +6,10 @@
                                                TrackCollection* pTrackCollection,
                                                QString settingsNamespace,
                                                QString trackTable,
-                                               QString trackSource)
+                                               QString trackSource,
+                                               ConfigObject<ConfigValue>* pConfig)
         : BaseSqlTableModel(parent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            settingsNamespace),
+                            pConfig, settingsNamespace),
           m_pTrackCollection(pTrackCollection),
           m_database(m_pTrackCollection->getDatabase()) {
     connect(this, SIGNAL(doSearch(const QString&)),

=== modified file 'mixxx/src/library/baseexternaltrackmodel.h'
--- mixxx/src/library/baseexternaltrackmodel.h	2012-11-22 06:59:01 +0000
+++ mixxx/src/library/baseexternaltrackmodel.h	2013-05-18 16:32:26 +0000
@@ -9,6 +9,7 @@
 #include "library/trackmodel.h"
 #include "library/basesqltablemodel.h"
 #include "trackinfoobject.h"
+#include "configobject.h"
 
 class TrackCollection;
 
@@ -18,7 +19,8 @@
     BaseExternalTrackModel(QObject* parent, TrackCollection* pTrackCollection,
                            QString settingsNamespace,
                            QString trackTable,
-                           QString trackSource);
+                           QString trackSource,
+                           ConfigObject<ConfigValue>* pConfig);
     virtual ~BaseExternalTrackModel();
 
     TrackModel::CapabilitiesFlags getCapabilities() const;

=== modified file 'mixxx/src/library/baseplaylistfeature.cpp'
--- mixxx/src/library/baseplaylistfeature.cpp	2013-05-12 22:17:32 +0000
+++ mixxx/src/library/baseplaylistfeature.cpp	2013-05-18 16:32:26 +0000
@@ -22,6 +22,7 @@
           m_trackDao(pTrackCollection->getTrackDAO()),
           m_pPlaylistTableModel(NULL),
           m_rootViewName(rootViewName) {
+
     m_pCreatePlaylistAction = new QAction(tr("New Playlist"),this);
     connect(m_pCreatePlaylistAction, SIGNAL(triggered()),
             this, SLOT(slotCreatePlaylist()));
@@ -96,7 +97,7 @@
     QString playlistName = index.data().toString();
     int playlistId = m_playlistDao.getPlaylistIdFromName(playlistName);
     if (m_pPlaylistTableModel) {
-        m_pPlaylistTableModel->setPlaylist(playlistId);
+        m_pPlaylistTableModel->setTableModel(playlistId);
         emit(showTrackModel(m_pPlaylistTableModel));
     }
 }
@@ -337,11 +338,12 @@
     }
 
     // Create a new table model since the main one might have an active search.
+    // This PTM will only use tracks that are not deleted from the FS
     QScopedPointer<PlaylistTableModel> pPlaylistTableModel(
         new PlaylistTableModel(this, m_pTrackCollection,
-                               "mixxx.db.model.playlist_export"));
+                               "mixxx.db.model.playlist_export", m_pConfig));
 
-    pPlaylistTableModel->setPlaylist(m_pPlaylistTableModel->getPlaylist());
+    pPlaylistTableModel->setTableModel(m_pPlaylistTableModel->getPlaylist());
     pPlaylistTableModel->setSort(pPlaylistTableModel->fieldIndex(PLAYLISTTRACKSTABLE_POSITION), Qt::AscendingOrder);
     pPlaylistTableModel->select();
 
@@ -476,4 +478,3 @@
 void BasePlaylistFeature::clearChildModel() {
     m_childModel.removeRows(0, m_playlistList.size());
 }
-

=== modified file 'mixxx/src/library/baseplaylistfeature.h'
--- mixxx/src/library/baseplaylistfeature.h	2013-02-23 10:40:40 +0000
+++ mixxx/src/library/baseplaylistfeature.h	2013-05-18 16:32:26 +0000
@@ -76,7 +76,6 @@
 
   private:
     virtual QString getRootViewHtml() const = 0;
-
     QString m_rootViewName;
 };
 

=== modified file 'mixxx/src/library/basesqltablemodel.cpp'
--- mixxx/src/library/basesqltablemodel.cpp	2013-05-14 22:25:44 +0000
+++ mixxx/src/library/basesqltablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -20,16 +20,17 @@
 
 BaseSqlTableModel::BaseSqlTableModel(QObject* pParent,
                                      TrackCollection* pTrackCollection,
-                                     QSqlDatabase db,
+                                     ConfigObject<ConfigValue>* pConfig,
                                      QString settingsNamespace)
         :  QAbstractTableModel(pParent),
-           TrackModel(db, settingsNamespace),
-           m_currentSearch(""),
+           TrackModel(pTrackCollection->getDatabase(), settingsNamespace),
            m_previewDeckGroup(PlayerManager::groupForPreviewDeck(0)),
            m_iPreviewDeckTrackId(-1),
            m_pTrackCollection(pTrackCollection),
            m_trackDAO(m_pTrackCollection->getTrackDAO()),
-           m_database(db) {
+           m_pConfig(pConfig),
+           m_currentSearch(""),
+           m_database(pTrackCollection->getDatabase()) {
     m_bInitialized = false;
     m_bDirty = true;
     m_iSortColumn = 0;
@@ -214,7 +215,6 @@
 
     QLinkedList<int> tableColumnIndices;
     foreach (QString column, m_tableColumns) {
-        Q_ASSERT(record.indexOf(column) == m_tableColumnIndex[column]);
         tableColumnIndices.push_back(record.indexOf(column));
     }
 
@@ -227,6 +227,8 @@
     QSet<int> trackIds;
     while (query.next()) {
         int id = query.value(idColumn).toInt();
+
+
         trackIds.insert(id);
 
         RowInfo thisRowInfo;
@@ -359,7 +361,7 @@
     m_bDirty = true;
 }
 
-void BaseSqlTableModel::search(const QString& searchText, const QString extraFilter) {
+void BaseSqlTableModel::search(const QString& searchText, const QString& extraFilter) {
     if (sDebug) {
         qDebug() << this << "search" << searchText;
     }
@@ -436,7 +438,8 @@
     if (!index.isValid() || (role != Qt::DisplayRole &&
                              role != Qt::EditRole &&
                              role != Qt::CheckStateRole &&
-                             role != Qt::ToolTipRole)) {
+                             role != Qt::ToolTipRole &&
+                             role != Qt::BackgroundColorRole)) {
         return QVariant();
     }
 
@@ -451,6 +454,13 @@
     // role
     switch (role) {
         case Qt::ToolTipRole:
+            if(index.sibling(index.row(),
+               fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)).data().toInt()==1){
+                QString warning(tr("No such file at : "));
+                value = QVariant(QString(warning+index.sibling(index.row(),
+                                 fieldIndex(LIBRARYTABLE_LOCATION)).data().toString()));
+            }
+            break;
         case Qt::DisplayRole:
             if (column == fieldIndex(LIBRARYTABLE_DURATION)) {
                 if (qVariantCanConvert<int>(value)) {
@@ -499,6 +509,14 @@
                 value = locked ? Qt::Checked : Qt::Unchecked;
             }
             break;
+        case Qt::BackgroundColorRole:
+            if (index.sibling(index.row(),
+               fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)).data().toInt()==1){
+                //TODO kain88 choose a better looking color, this will also
+                // have to be changed in stardelegate
+                value = QVariant(QColor(Qt::red));
+            }
+            break;
         default:
             break;
     }
@@ -626,6 +644,10 @@
     return index.sibling(index.row(), fieldIndex(m_idColumn)).data().toInt();
 }
 
+TrackPointer BaseSqlTableModel::getTrack(const QModelIndex& index) const {
+    return m_trackDAO.getTrack(getTrackId(index));
+}
+
 QString BaseSqlTableModel::getTrackLocation(const QModelIndex& index) const {
     if (!index.isValid()) {
         return "";
@@ -656,7 +678,6 @@
     if (sDebug) {
         qDebug() << this << "trackChanged" << trackIds.size();
     }
-
     const int numColumns = columnCount();
     foreach (int trackId, trackIds) {
         QLinkedList<int> rows = getTrackRows(trackId);
@@ -717,7 +738,8 @@
     const QModelIndex& index, int role) const {
     if (role != Qt::DisplayRole &&
         role != Qt::ToolTipRole &&
-        role != Qt::EditRole) {
+        role != Qt::EditRole &&
+        role != Qt::BackgroundColorRole) {
         return QVariant();
     }
 
@@ -822,3 +844,51 @@
     // there.
     select(); //Repopulate the data model.
 }
+
+void BaseSqlTableModel::slotConfigChanged(QString identifier, QString key){
+    Q_UNUSED(identifier);
+    if (key=="ShowMissingSongs") {
+        setTableModel();
+        select();
+    }
+}
+
+void BaseSqlTableModel::setTableModel(int id) {
+    Q_UNUSED(id);
+}
+
+void BaseSqlTableModel::relocateTracks(const QModelIndexList& indices) {
+    foreach (QModelIndex index, indices) {
+        int trackId = getTrackId(index);
+        TrackPointer ptrack = m_trackDAO.getTrack(trackId);
+        if (!ptrack) {
+            qDebug() << "strange I can't get that thing";
+        }
+        QString newLocation = QFileDialog::getOpenFileName(QApplication::desktop(),
+                                        QString(ptrack->getTitle()),
+                                        ptrack->getLocation());
+
+        if (!newLocation.isEmpty()) {
+            if (!m_trackDAO.relocateTrack(ptrack, newLocation)) {
+                QMessageBox::warning(NULL, tr("Mixxx"),
+                                     tr("The track could not be relocated"));
+            }
+        }
+    }
+    setTableModel();
+    select();
+}
+
+bool BaseSqlTableModel::isColumnInternal(int column) {
+    Q_UNUSED(column);
+    return false;
+}
+
+bool BaseSqlTableModel::isColumnHiddenByDefault(int column) {
+    Q_UNUSED(column);
+    return false;
+}
+
+TrackModel::CapabilitiesFlags BaseSqlTableModel::getCapabilities() const {
+    return TRACKMODELCAPS_NONE;
+}

=== modified file 'mixxx/src/library/basesqltablemodel.h'
--- mixxx/src/library/basesqltablemodel.h	2013-01-17 08:16:08 +0000
+++ mixxx/src/library/basesqltablemodel.h	2013-05-18 16:32:26 +0000
@@ -22,21 +22,43 @@
   public:
     BaseSqlTableModel(QObject* pParent,
                       TrackCollection* pTrackCollection,
-                      QSqlDatabase db, QString settingsNamespace);
+                      ConfigObject<ConfigValue>* pConfig,
+                      QString settingsNamespace);
     virtual ~BaseSqlTableModel();
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Methods implemented from QAbstractItemModel
-    ////////////////////////////////////////////////////////////////////////////
-
-    virtual void sort(int column, Qt::SortOrder order);
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role=Qt::EditRole);
-    virtual int columnCount(const QModelIndex& parent=QModelIndex()) const;
-    virtual int rowCount(const QModelIndex& parent=QModelIndex()) const;
-    virtual bool setHeaderData(int section, Qt::Orientation orientation,
+    // functions that HAVE to be implemented in a child class
+    virtual void setTableModel(int id=-1);
+    virtual bool isColumnInternal(int column);
+    virtual bool isColumnHiddenByDefault(int column);
+    virtual TrackModel::CapabilitiesFlags getCapabilities() const;
+    // calls readWriteFlags() by default, reimplement this if the child calls
+    // should be readOnly
+    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+    // function to reimplement for external libraries
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
+
+    // Other public methods
+    int getTrackId(const QModelIndex& index) const;
+    void search(const QString& searchText, const QString& extraFilter=QString());
+    void setSearch(const QString& searchText, const QString extraFilter=QString());
+    const QString currentSearch() const;
+    void setSort(int column, Qt::SortOrder order);
+    int fieldIndex(const QString& fieldName) const;
+    void select();
+    QString getTrackLocation(const QModelIndex& index) const;
+    QAbstractItemDelegate* delegateForColumn(const int i, QObject* pParent);
+    void relocateTracks(const QModelIndexList& indices);
+    void hideTracks(const QModelIndexList& indices);
+
+    // Methods reimplemented from QAbstractItemModel
+    void sort(int column, Qt::SortOrder order);
+    int rowCount(const QModelIndex& parent=QModelIndex()) const;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    bool setData(const QModelIndex& index, const QVariant& value, int role=Qt::EditRole);
+    int columnCount(const QModelIndex& parent=QModelIndex()) const;
+    bool setHeaderData(int section, Qt::Orientation orientation,
                                const QVariant &value, int role=Qt::EditRole);
-    virtual QVariant headerData(int section, Qt::Orientation orientation,
+    QVariant headerData(int section, Qt::Orientation orientation,
                                 int role=Qt::DisplayRole) const;
     virtual QMimeData* mimeData(const QModelIndexList &indexes) const;
 
@@ -44,44 +66,33 @@
     // Other public methods
     ////////////////////////////////////////////////////////////////////////////
 
-    virtual void search(const QString& searchText, const QString extraFilter=QString());
-    virtual void setSearch(const QString& searchText, const QString extraFilter=QString());
-    virtual const QString currentSearch() const;
-    virtual void setSort(int column, Qt::SortOrder order);
-    virtual int fieldIndex(const QString& fieldName) const;
-    virtual void select();
-    virtual int getTrackId(const QModelIndex& index) const;
-    virtual QString getTrackLocation(const QModelIndex& index) const;
-    virtual QAbstractItemDelegate* delegateForColumn(const int i, QObject* pParent);
-    virtual void hideTracks(const QModelIndexList& indices);
     // Returns true if the BaseSqlTableModel has been initialized. Calling data
     // access methods on a BaseSqlTableModel which is not initialized is likely
     // to cause instability / crashes.
     bool initialized() const { return m_bInitialized; }
 
-  protected:
+  protected://functions
     // Returns the row of trackId in this result set. If trackId is not present,
     // returns -1.
-    virtual const QLinkedList<int> getTrackRows(int trackId) const;
-
-    virtual void setTable(const QString& tableName,
-                          const QString& trackIdColumn,
-                          const QStringList& tableColumns,
-                          QSharedPointer<BaseTrackCache> trackSource);
-    QSqlDatabase database() const;
-
-    /** Use this if you want a model that is read-only. */
-    virtual Qt::ItemFlags readOnlyFlags(const QModelIndex &index) const;
-    /** Use this if you want a model that can be changed  */
-    virtual Qt::ItemFlags readWriteFlags(const QModelIndex &index) const;
-    /** calls readWriteFlags() by default */
-    virtual Qt::ItemFlags flags(const QModelIndex &index) const;
-
-    // Set the columns used for searching. Names must correspond to the column
-    // names in the table provided to setTable. Must be called after setTable is
-    // called.
-    virtual QString orderByClause() const;
-    virtual void initHeaderData();
+    const QLinkedList<int> getTrackRows(int trackId) const;
+    void setTable(const QString& tableName, const QString& trackIdColumn,
+                  const QStringList& tableColumns,
+                  QSharedPointer<BaseTrackCache> trackSource);
+    void initHeaderData();
+
+    // Use this if you want a model that is read-only.
+    Qt::ItemFlags readOnlyFlags(const QModelIndex &index) const;
+    // Use this if you want a model that can be changed
+    Qt::ItemFlags readWriteFlags(const QModelIndex &index) const;
+
+    //variables
+    TrackCollection* m_pTrackCollection;
+    TrackDAO& m_trackDAO;
+    ConfigObject<ConfigValue>* m_pConfig;
+    QSqlDatabase m_database;
+
+  protected slots:
+    void slotConfigChanged(QString,QString);
 
   private slots:
     void tracksChanged(QSet<int> trackIds);
@@ -90,6 +101,11 @@
   private:
     inline void setTrackValueForColumn(TrackPointer pTrack, int column, QVariant value);
     QVariant getBaseValue(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    // Set the columns used for searching. Names must correspond to the column
+    // names in the table provided to setTable. Must be called after setTable is
+    // called.
+    QString orderByClause() const;
+    QSqlDatabase database() const;
 
     struct RowInfo {
         int trackId;
@@ -106,6 +122,7 @@
             return order < other.order;
         }
     };
+    QVector<RowInfo> m_rowInfo;
 
     QString m_tableName;
     QString m_idColumn;
@@ -120,7 +137,6 @@
     bool m_bInitialized;
     bool m_bDirty;
     QSqlRecord m_queryRecord;
-    QVector<RowInfo> m_rowInfo;
     QHash<int, int> m_trackSortOrder;
     QHash<int, QLinkedList<int> > m_trackIdToRows;
 
@@ -132,10 +148,6 @@
 
     QVector<QHash<int, QVariant> > m_headerInfo;
 
-    TrackCollection* m_pTrackCollection;
-    TrackDAO& m_trackDAO;
-    QSqlDatabase m_database;
-
     DISALLOW_COPY_AND_ASSIGN(BaseSqlTableModel);
 };
 

=== modified file 'mixxx/src/library/basetrackcache.cpp'
--- mixxx/src/library/basetrackcache.cpp	2013-04-25 04:56:07 +0000
+++ mixxx/src/library/basetrackcache.cpp	2013-05-18 16:32:26 +0000
@@ -87,6 +87,7 @@
         qDebug() << this << "slotTracksAdded" << trackIds.size();
     }
     updateTracksInIndex(trackIds);
+    buildIndex();
 }
 
 void BaseTrackCache::slotDbTrackAdded(TrackPointer pTrack) {
@@ -118,6 +119,7 @@
     }
     QSet<int> trackIds;
     trackIds.insert(trackId);
+    updateTracksInIndex(trackIds);
     emit(tracksChanged(trackIds));
 }
 

=== modified file 'mixxx/src/library/browse/browsefeature.cpp'
--- mixxx/src/library/browse/browsefeature.cpp	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/browse/browsefeature.cpp	2013-05-18 16:32:26 +0000
@@ -29,7 +29,12 @@
           m_pConfig(pConfig),
           m_browseModel(this, pTrackCollection, pRecordingManager),
           m_proxyModel(&m_browseModel),
-          m_pTrackCollection(pTrackCollection) {
+          m_pAddtoLibraryAction(NULL),
+          m_pLastRightClickedItem(NULL),
+          m_pTrackCollection(pTrackCollection){
+
+    connect(this, SIGNAL(dirsChanged(QString,QString)),
+            parent, SLOT(slotDirsChanged(QString,QString)));
 
     m_pAddQuickLinkAction = new QAction(tr("Add to Quick Links"),this);
     connect(m_pAddQuickLinkAction, SIGNAL(triggered()), this, SLOT(slotAddQuickLink()));
@@ -37,6 +42,10 @@
     m_pRemoveQuickLinkAction = new QAction(tr("Remove from Quick Links"),this);
     connect(m_pRemoveQuickLinkAction, SIGNAL(triggered()), this, SLOT(slotRemoveQuickLink()));
 
+    m_pAddtoLibraryAction = new QAction(tr("Add to Library"),this);
+    connect(m_pAddtoLibraryAction, SIGNAL(triggered()),
+            this, SLOT(slotAddToLibrary()));
+
     m_proxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
     m_proxyModel.setSortCaseSensitivity(Qt::CaseInsensitive);
 
@@ -75,7 +84,7 @@
 
     // show root directory on UNIX-based operating systems
     TreeItem* root_folder_item = new TreeItem(
-        QDir::rootPath(), QDir::rootPath(), this, rootItem);
+        QDir::homePath(), QDir::homePath(), this, rootItem);
     rootItem->appendChild(root_folder_item);
 #endif
 
@@ -100,11 +109,14 @@
         m_pQuickLinkItem->appendChild(item);
     }
 
+
     // initialize the model
     m_childModel.setRootItem(rootItem);
 }
 
 BrowseFeature::~BrowseFeature() {
+    //delete m_pLastRightClickedItem;
+    // delete m_pQuickLinkItem;
 }
 
 QVariant BrowseFeature::title() {
@@ -124,6 +136,14 @@
     saveQuickLinks();
 }
 
+void BrowseFeature::slotAddToLibrary() {
+    if (!m_pLastRightClickedItem) {
+        return;
+    }
+    QString spath = m_pLastRightClickedItem->dataPath().toString();
+    emit dirsChanged("added" ,spath);
+}
+
 void BrowseFeature::slotRemoveQuickLink() {
     if (!m_pLastRightClickedItem) {
         return;
@@ -200,6 +220,7 @@
      }
 
      menu.addAction(m_pAddQuickLinkAction);
+     menu.addAction(m_pAddtoLibraryAction);
      menu.exec(globalPos);
      onLazyChildExpandation(index);
 }

=== modified file 'mixxx/src/library/browse/browsefeature.h'
--- mixxx/src/library/browse/browsefeature.h	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/browse/browsefeature.h	2013-05-18 16:32:26 +0000
@@ -38,6 +38,7 @@
   public slots:
     void slotAddQuickLink();
     void slotRemoveQuickLink();
+    void slotAddToLibrary();
     void activate();
     void activateChild(const QModelIndex& index);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);
@@ -45,6 +46,7 @@
 
   signals:
     void setRootIndex(const QModelIndex&);
+    void dirsChanged(QString,QString);
 
   private:
     QString getRootViewHtml() const;
@@ -60,6 +62,7 @@
     FolderTreeModel m_childModel;
     QAction* m_pAddQuickLinkAction;
     QAction* m_pRemoveQuickLinkAction;
+    QAction* m_pAddtoLibraryAction;
     TreeItem* m_pLastRightClickedItem;
     TreeItem* m_pQuickLinkItem;
     QStringList m_quickLinkList;

=== modified file 'mixxx/src/library/browse/browsetablemodel.cpp'
--- mixxx/src/library/browse/browsetablemodel.cpp	2013-01-19 12:15:22 +0000
+++ mixxx/src/library/browse/browsetablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -124,7 +124,8 @@
     return QLinkedList<int>();
 }
 
-void BrowseTableModel::search(const QString& searchText) {
+void BrowseTableModel::search(const QString& searchText, const QString& extraFilter) {
+    Q_UNUSED(extraFilter);
     Q_UNUSED(searchText);
 }
 

=== modified file 'mixxx/src/library/browse/browsetablemodel.h'
--- mixxx/src/library/browse/browsetablemodel.h	2012-08-10 15:03:46 +0000
+++ mixxx/src/library/browse/browsetablemodel.h	2013-05-18 16:32:26 +0000
@@ -42,7 +42,7 @@
     virtual int getTrackId(const QModelIndex& index) const;
     TrackModel::CapabilitiesFlags getCapabilities() const;
     virtual const QLinkedList<int> getTrackRows(int trackId) const;
-    virtual void search(const QString& searchText);
+    virtual void search(const QString& searchText,const QString& extraFilter=QString());
     virtual void removeTrack(const QModelIndex& index);
     virtual void removeTracks(const QModelIndexList& indices);
     virtual bool addTrack(const QModelIndex& index, QString location);

=== modified file 'mixxx/src/library/browse/browsethread.h'
--- mixxx/src/library/browse/browsethread.h	2012-03-13 04:36:19 +0000
+++ mixxx/src/library/browse/browsethread.h	2013-05-18 16:32:26 +0000
@@ -11,15 +11,13 @@
 #include <QStandardItem>
 #include <QList>
 
-/*
- * This class is a singleton and represents a thread
- * that is used to read ID3 metadata
- * from a particular folder.
- *
- * The BroseTableModel uses this class.
- * Note: Don't call getInstance() from places
- * other than the GUI thread.
- */
+// This class is a singleton and represents a thread
+// that is used to read ID3 metadata
+// from a particular folder.
+//
+// The BroseTableModel uses this class.
+// Note: Don't call getInstance() from places
+// other than the GUI thread.
 class BrowseTableModel;
 
 class BrowseThread : public QThread {

=== modified file 'mixxx/src/library/browse/foldertreemodel.cpp'
--- mixxx/src/library/browse/foldertreemodel.cpp	2012-07-18 21:22:53 +0000
+++ mixxx/src/library/browse/foldertreemodel.cpp	2013-05-18 16:32:26 +0000
@@ -25,6 +25,7 @@
 }
 
 FolderTreeModel::~FolderTreeModel() {
+    qDebug() << "~FolderTreeModel()";
 }
 
 /* A tree model of the filesystem should be initialized lazy.

=== modified file 'mixxx/src/library/cratefeature.cpp'
--- mixxx/src/library/cratefeature.cpp	2013-04-22 19:29:54 +0000
+++ mixxx/src/library/cratefeature.cpp	2013-05-18 16:32:26 +0000
@@ -20,10 +20,11 @@
 #include "soundsourceproxy.h"
 
 CrateFeature::CrateFeature(QObject* parent,
-                           TrackCollection* pTrackCollection, ConfigObject<ConfigValue>* pConfig)
+                           TrackCollection* pTrackCollection, 
+                           ConfigObject<ConfigValue>* pConfig)
         : m_pTrackCollection(pTrackCollection),
           m_crateDao(pTrackCollection->getCrateDAO()),
-          m_crateTableModel(this, pTrackCollection),
+          m_crateTableModel(this, pTrackCollection,pConfig),
           m_pConfig(pConfig) {
     Q_UNUSED(parent);
     m_pCreateCrateAction = new QAction(tr("New Crate"),this);
@@ -65,6 +66,9 @@
     connect(&m_crateDao, SIGNAL(lockChanged(int)),
             this, SLOT(slotCrateTableChanged(int)));
 
+    connect(this, SIGNAL(configChanged(QString,QString)),
+            &m_crateTableModel, SLOT(slotConfigChanged(QString,QString)));
+
     // construct child model
     TreeItem *rootItem = new TreeItem();
     m_childModel.setRootItem(rootItem);
@@ -156,7 +160,7 @@
         return;
     QString crateName = index.data().toString();
     int crateId = m_crateDao.getCrateIdByName(crateName);
-    m_crateTableModel.setCrate(crateId);
+    m_crateTableModel.setTableModel(crateId);
     emit(showTrackModel(&m_crateTableModel));
 }
 
@@ -473,7 +477,6 @@
     }
 
     QList<QString> entries = playlist_parser->parse(playlist_file);
-    //qDebug() << "Size of Imported Playlist: " << entries.size();
 
     //Iterate over the List that holds URLs of playlist entires
     m_crateTableModel.addTracks(QModelIndex(), entries);
@@ -503,8 +506,8 @@
     QList<QString> playlist_items;
     // Create a new table model since the main one might have an active search.
     QScopedPointer<CrateTableModel> pCrateTableModel(
-        new CrateTableModel(this, m_pTrackCollection));
-    pCrateTableModel->setCrate(m_crateTableModel.getCrate());
+        new CrateTableModel(this, m_pTrackCollection,m_pConfig));
+    pCrateTableModel->setTableModel(m_crateTableModel.getCrate());
     pCrateTableModel->select();
 
     if (file_location.endsWith(".csv", Qt::CaseInsensitive)) {
@@ -542,7 +545,7 @@
     clearChildModel();
     m_lastRightClickedIndex = constructChildModel(crateId);
     // Switch the view to the crate.
-    m_crateTableModel.setCrate(crateId);
+    m_crateTableModel.setTableModel(crateId);
     // Update selection
     emit(featureSelect(this, m_lastRightClickedIndex));
 }

=== modified file 'mixxx/src/library/cratefeature.h'
--- mixxx/src/library/cratefeature.h	2013-05-18 16:23:08 +0000
+++ mixxx/src/library/cratefeature.h	2013-05-18 16:32:26 +0000
@@ -34,6 +34,9 @@
 
     TreeItemModel* getChildModel();
 
+  signals:
+    void configChanged(QString,QString);
+
   public slots:
     void activate();
     void activateChild(const QModelIndex& index);

=== modified file 'mixxx/src/library/cratetablemodel.cpp'
--- mixxx/src/library/cratetablemodel.cpp	2013-04-22 19:29:54 +0000
+++ mixxx/src/library/cratetablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -4,53 +4,69 @@
 #include <QtDebug>
 
 #include "library/cratetablemodel.h"
-
-#include "library/dao/cratedao.h"
-#include "library/librarytablemodel.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
 #include "mixxxutils.cpp"
 #include "playermanager.h"
 
-CrateTableModel::CrateTableModel(QObject* pParent, TrackCollection* pTrackCollection)
+CrateTableModel::CrateTableModel(QObject* pParent, 
+                                 TrackCollection* pTrackCollection,
+                                 ConfigObject<ConfigValue>* pConfig)
         : BaseSqlTableModel(pParent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            "mixxx.db.model.crate"),
-          m_pTrackCollection(pTrackCollection),
-          m_iCrateId(-1) {
-    connect(this, SIGNAL(doSearch(const QString&)),
-            this, SLOT(slotSearch(const QString&)));
+                            pConfig, "mixxx.db.model.crate"),
+          m_iCrateId(-1),
+          m_crateDAO(pTrackCollection->getCrateDAO()) {
 }
 
 CrateTableModel::~CrateTableModel() {
 }
 
-void CrateTableModel::setCrate(int crateId) {
+void CrateTableModel::setTableModel(int crateId) {
     //qDebug() << "CrateTableModel::setCrate()" << crateId;
+    if (crateId == m_iCrateId) {
+        qDebug() << "Already focused on crate " << crateId;
+        return;
+    } else if (crateId == -1) {
+        // calls from parent class use -1 as id then just set the current crate
+        crateId = m_iCrateId;
+    }
     m_iCrateId = crateId;
 
-    QString tableName = QString("crate_%1").arg(m_iCrateId);
+    QString tableName = QString("crate_%1_").arg(m_iCrateId);
     QSqlQuery query(m_pTrackCollection->getDatabase());
     FieldEscaper escaper(m_pTrackCollection->getDatabase());
+
     QStringList columns;
-    columns << CRATETRACKSTABLE_TRACKID + " as " + LIBRARYTABLE_ID
+    QStringList tableColumns;
+    QString filter;
+    columns << "crate_tracks."+CRATETRACKSTABLE_TRACKID + " as " + LIBRARYTABLE_ID
             << "'' as preview";
+    tableColumns << CRATETRACKSTABLE_TRACKID;
+    bool showMissing = m_pConfig->getValueString(ConfigKey("[Library]","ShowMissingSongs"),"1").toInt();
+    if(showMissing){
+        filter = "library.mixxx_deleted=0";
+        tableName.append("_missing");
+    } else {
+        filter = "library.mixxx_deleted=0 AND track_locations.fs_deleted=0";
+    }
 
     // We drop files that have been explicitly deleted from mixxx
     // (mixxx_deleted=0) from the view. There was a bug in <= 1.9.0 where
-    // removed files were not removed from playlists, so some users will have
+    // removed files were not removed from crates, so some users will have
     // libraries where this is the case.
     QString queryString = QString(
         "CREATE TEMPORARY VIEW IF NOT EXISTS %1 AS "
         "SELECT %2 FROM %3 "
         "INNER JOIN library ON library.id = %3.%4 "
-        "WHERE %3.%5 = %6 AND library.mixxx_deleted = 0")
+        "INNER JOIN track_locations ON track_locations.id=crate_tracks.track_id "
+        "WHERE %3.%5 = %6 AND %7")
             .arg(escaper.escapeString(tableName),
                  columns.join(","),
                  CRATE_TRACKS_TABLE,
                  CRATETRACKSTABLE_TRACKID,
                  CRATETRACKSTABLE_CRATEID,
-                 QString::number(crateId));
+                 QString::number(crateId),
+                 filter);
     query.prepare(queryString);
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
@@ -103,10 +119,9 @@
         fileInfoList.append(QFileInfo(fileLocation));
     }
 
-    TrackDAO& trackDao = m_pTrackCollection->getTrackDAO();
-    QList<int> trackIDs = trackDao.addTracks(fileInfoList, true);
+    QList<int> trackIDs = m_trackDAO.addTracks(fileInfoList, true);
 
-    int tracksAdded = m_pTrackCollection->getCrateDAO().addTracksToCrate(
+    int tracksAdded = m_crateDAO.addTracksToCrate(
         trackIDs, m_iCrateId);
     if (tracksAdded > 0) {
         select();
@@ -120,58 +135,19 @@
     return tracksAdded;
 }
 
-TrackPointer CrateTableModel::getTrack(const QModelIndex& index) const {
-    int trackId = getTrackId(index);
-    return m_pTrackCollection->getTrackDAO().getTrack(trackId);
-}
-
 void CrateTableModel::removeTracks(const QModelIndexList& indices) {
-    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-    bool locked = crateDao.isCrateLocked(m_iCrateId);
+    bool locked = m_crateDAO.isCrateLocked(m_iCrateId);
 
     if (!locked) {
         QList<int> trackIds;
         foreach (QModelIndex index, indices) {
             trackIds.append(getTrackId(index));
         }
-        crateDao.removeTracksFromCrate(trackIds, m_iCrateId);
+        m_crateDAO.removeTracksFromCrate(trackIds, m_iCrateId);
         select();
     }
 }
 
-void CrateTableModel::removeTrack(const QModelIndex& index) {
-    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-    bool locked = crateDao.isCrateLocked(m_iCrateId);
-
-    if (!locked) {
-        int trackId = getTrackId(index);
-        if (m_pTrackCollection->getCrateDAO().
-            removeTrackFromCrate(trackId, m_iCrateId)) {
-            select();
-        } else {
-            // TODO(XXX) feedback
-        }
-    }
-}
-
-void CrateTableModel::moveTrack(const QModelIndex& sourceIndex,
-                                const QModelIndex& destIndex) {
-    Q_UNUSED(sourceIndex);
-    Q_UNUSED(destIndex);
-    return;
-}
-
-void CrateTableModel::search(const QString& searchText) {
-    // qDebug() << "CrateTableModel::search()" << searchText
-    //          << QThread::currentThread();
-    emit(doSearch(searchText));
-}
-
-void CrateTableModel::slotSearch(const QString& searchText) {
-    BaseSqlTableModel::search(
-        searchText, LibraryTableModel::DEFAULT_LIBRARYFILTER);
-}
-
 bool CrateTableModel::isColumnInternal(int column) {
     if (column == fieldIndex(LIBRARYTABLE_ID) ||
         column == fieldIndex(CRATETRACKSTABLE_TRACKID) ||
@@ -179,6 +155,7 @@
         column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
         column == fieldIndex(LIBRARYTABLE_BPM_LOCK) ||
         column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_MAINDIRID) ||
         (PlayerManager::numPreviewDecks() == 0 && column == fieldIndex("preview"))) {
         return true;
     }
@@ -202,12 +179,12 @@
             | TRACKMODELCAPS_LOADTOSAMPLER
             | TRACKMODELCAPS_LOADTOPREVIEWDECK
             | TRACKMODELCAPS_REMOVE
+            | TRACKMODELCAPS_RELOCATE
             | TRACKMODELCAPS_BPMLOCK
             | TRACKMODELCAPS_CLEAR_BEATS
             | TRACKMODELCAPS_RESETPLAYED;
 
-    CrateDAO& crateDao = m_pTrackCollection->getCrateDAO();
-    bool locked = crateDao.isCrateLocked(m_iCrateId);
+    bool locked = m_crateDAO.isCrateLocked(m_iCrateId);
 
     if (locked) {
         caps |= TRACKMODELCAPS_LOCKED;
@@ -215,3 +192,10 @@
 
     return caps;
 }
+
+void CrateTableModel::moveTrack(const QModelIndex& sourceIndex,
+                                const QModelIndex& destIndex) {
+    Q_UNUSED(sourceIndex);
+    Q_UNUSED(destIndex);
+    return;
+}

=== modified file 'mixxx/src/library/cratetablemodel.h'
--- mixxx/src/library/cratetablemodel.h	2013-04-22 19:29:54 +0000
+++ mixxx/src/library/cratetablemodel.h	2013-05-18 16:32:26 +0000
@@ -4,48 +4,35 @@
 #ifndef CRATETABLEMODEL_H
 #define CRATETABLEMODEL_H
 
-#include <QItemDelegate>
-#include <QSqlTableModel>
-
 #include "library/basesqltablemodel.h"
-
-class TrackCollection;
+#include "library/dao/cratedao.h"
 
 class CrateTableModel : public BaseSqlTableModel {
     Q_OBJECT
   public:
-    CrateTableModel(QObject* parent, TrackCollection* pTrackCollection);
+    CrateTableModel(QObject* parent, TrackCollection* pTrackCollection,
+                    ConfigObject<ConfigValue>* pConfig);
     virtual ~CrateTableModel();
 
-    void setCrate(int crateId);
+    void setTableModel(int crateId=-1);
     int getCrate() const {
         return m_iCrateId;
     }
 
     // From TrackModel
-    TrackPointer getTrack(const QModelIndex& index) const;
-    void search(const QString& searchText);
     bool isColumnInternal(int column);
     bool isColumnHiddenByDefault(int column);
-    void removeTrack(const QModelIndex& index);
     void removeTracks(const QModelIndexList& indices);
-    bool addTrack(const QModelIndex& index, QString location);
+    bool addTrack(const QModelIndex &index, QString location);
     // Returns the number of unsuccessful track additions
-    int addTracks(const QModelIndex& index,
-                  const QList <QString> &locations);
+    int addTracks(const QModelIndex& index,const QList <QString> &locations);
     void moveTrack(const QModelIndex& sourceIndex,
                    const QModelIndex& destIndex);
     TrackModel::CapabilitiesFlags getCapabilities() const;
 
-  private slots:
-    void slotSearch(const QString& searchText);
-
-  signals:
-    void doSearch(const QString& searchText);
-
   private:
-    TrackCollection* m_pTrackCollection;
     int m_iCrateId;
+    CrateDAO& m_crateDAO;
 };
 
 #endif /* CRATETABLEMODEL_H */

=== added file 'mixxx/src/library/dao/directorydao.cpp'
--- mixxx/src/library/dao/directorydao.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/dao/directorydao.cpp	2013-05-18 16:32:26 +0000
@@ -0,0 +1,143 @@
+#include <QtSql>
+#include <QtDebug>
+#include <QStringBuilder>
+
+#include "directorydao.h"
+#include "library/queryutil.h"
+
+DirectoryDAO::DirectoryDAO(QSqlDatabase& database)
+        : m_database(database) {
+}
+
+DirectoryDAO::DirectoryDAO(const DirectoryDAO& directoryDao)
+            : m_database(directoryDao.m_database){
+}
+
+DirectoryDAO::~DirectoryDAO(){
+}
+
+void DirectoryDAO::initialize()
+{
+    qDebug() << "DirectoryDAO::initialize" << QThread::currentThread() 
+             << m_database.connectionName();
+}
+
+bool DirectoryDAO::addDirectory(QString dir){
+    ScopedTransaction transaction(m_database);
+    QSqlQuery query(m_database);
+    query.prepare("INSERT OR REPLACE INTO directories (directory) "
+                  "VALUES (\""% dir %"\")");
+
+    if (!query.exec()) {
+        qDebug() << "Adding new dir ("% dir %") failed:"
+                 <<query.lastError();
+        return false;
+    }
+    transaction.commit();
+    return true;
+}
+
+bool DirectoryDAO::purgeDirectory(QString dir){
+    QSqlQuery query(m_database);
+    query.prepare("DELETE FROM directories WHERE directory=\"" % dir % "\"");
+
+    if (!query.exec()) {
+        qDebug() << "purging dir ("%dir%") failed:"<<query.lastError();
+        return false;
+    }
+    return true;
+}
+
+bool DirectoryDAO::relocateDirectory(QString oldFolder, QString newFolder){
+    ScopedTransaction transaction(m_database);
+    QSqlQuery query(m_database);
+
+    // update directory in directories table
+    query.prepare("UPDATE "%DIRECTORYDAO_TABLE%" SET "%DIRECTORYDAO_DIR%"="
+                  "\":newFolder\" WHERE "%DIRECTORYDAO_DIR%"=\":oldFolder\"");
+    query.bindValue(":newFolder", newFolder);
+    query.bindValue(":oldFolder", oldFolder);
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "coud not relocate directory";
+        return false;
+    }
+
+    // update location and directory in track_locations table
+    query.prepare("UPDATE track_locations SET location="
+                  "REPLACE(location,\":oldFolder\",\":newFolder\")"
+                  ", directory="
+                  "REPLACE(directory,\":oldFolder\",\":newFolder\") "
+                  "WHERE "%DIRECTORYDAO_DIR%"=\":oldFolder\"");
+    query.bindValue(":newFolder", newFolder);
+    query.bindValue(":oldFolder", oldFolder);
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "coud not relocate path of tracks";
+        return false;
+    }
+
+    // updating the dir_id column is not necessary because it does not change
+
+    transaction.commit();
+    return true;
+}
+
+QStringList DirectoryDAO::getDirs(){
+    QSqlQuery query(m_database);
+    query.prepare("SELECT " % DIRECTORYDAO_DIR % " FROM " % DIRECTORYDAO_TABLE);
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "There are no directories saved in the db";
+    }
+    QStringList dirs;
+    while (query.next()) {
+        dirs << query.value(query.record().indexOf(DIRECTORYDAO_DIR)).toString();
+    }
+    return dirs;
+}
+
+QList<int> DirectoryDAO::getDirIds(QStringList& dirs){
+    QSqlQuery query(m_database);
+    query.prepare("SELECT " % DIRECTORYDAO_ID % " FROM " % DIRECTORYDAO_TABLE %
+                  " WHERE " % DIRECTORYDAO_DIR %" in (\":dirs\")");
+    query.bindValue(":dirs", dirs.join("\",\"") );
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "couldn't find directory:"<<dirs;
+    }
+    QList<int> ids;
+    while (query.next()) {
+        ids.append(query.value(query.record().indexOf(DIRECTORYDAO_ID)).toInt());
+    }
+
+    return ids;
+}
+
+//TODO(kain88) check if this is not obsolete because of getDirIds
+int DirectoryDAO::getDirId(const QString dir){
+    QSqlQuery query(m_database);
+    query.prepare("SELECT " % DIRECTORYDAO_ID % " FROM " % DIRECTORYDAO_TABLE %
+                  " WHERE " % DIRECTORYDAO_DIR %" in (\":dir\")");
+    query.bindValue(":dir",dir);
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "couldn't find directory:"<<dir;
+    }
+    int id=0;
+    while (query.next()) {
+        id = query.value(query.record().indexOf(DIRECTORYDAO_ID)).toInt();
+    }
+    return id;
+}
+
+// Only call this when an update happens from an old library version!!!
+// TODO move this into update code
+bool DirectoryDAO::updateTrackLocations(QString dir){
+    QString dirId = QString::number(getDirId(dir));
+    ScopedTransaction transaction(m_database);
+    QSqlQuery query(m_database);
+    query.prepare("UPDATE track_locations SET maindir_id = :dirId");
+    query.bindValue(":dirId", dirId);
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << " could not update TrackLocations";
+        return false;
+    }
+    transaction.commit();
+    return true;
+}

=== added file 'mixxx/src/library/dao/directorydao.h'
--- mixxx/src/library/dao/directorydao.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/dao/directorydao.h	2013-05-18 16:32:26 +0000
@@ -0,0 +1,31 @@
+#ifndef DIRECTORYDAO_H
+#define DIRECTORYDAO_H
+
+#include <QSqlDatabase>
+#include "library/dao/dao.h"
+
+const QString DIRECTORYDAO_DIR = "directory";
+const QString DIRECTORYDAO_ID  = "dir_id";
+const QString DIRECTORYDAO_TABLE = "directories";
+
+class DirectoryDAO : public DAO {
+  public:
+    // normal method
+    DirectoryDAO(QSqlDatabase& database);
+    DirectoryDAO(const DirectoryDAO& directoryDao);
+    virtual ~DirectoryDAO();
+
+    void initialize();
+    bool addDirectory(QString dir);
+    bool purgeDirectory(QString dir);
+    bool relocateDirectory(QString oldFolder,QString newFolder);
+    bool updateTrackLocations(QString dir);
+    QList<int> getDirIds(QStringList& dirs);
+    int getDirId(const QString dir);
+    QStringList getDirs();
+
+  private:
+    QSqlDatabase m_database;
+};
+
+#endif //DIRECTORYDAO_H

=== modified file 'mixxx/src/library/dao/trackdao.cpp'
--- mixxx/src/library/dao/trackdao.cpp	2013-05-03 23:33:12 +0000
+++ mixxx/src/library/dao/trackdao.cpp	2013-05-18 16:32:26 +0000
@@ -1,6 +1,7 @@
 #include <QtDebug>
 #include <QtCore>
 #include <QtSql>
+#include <QMessageBox>
 
 #include "library/dao/trackdao.h"
 
@@ -14,6 +15,7 @@
 #include "library/dao/cuedao.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/analysisdao.h"
+#include "library/dao/directorydao.h"
 
 QHash<int, TrackWeakPointer> TrackDAO::m_sTracks;
 QMutex TrackDAO::m_sTracksMutex;
@@ -30,12 +32,14 @@
                    PlaylistDAO& playlistDao,
                    CrateDAO& crateDao,
                    AnalysisDao& analysisDao,
+                   DirectoryDAO& directoryDao,
                    ConfigObject<ConfigValue> * pConfig)
         : m_database(database),
           m_cueDao(cueDao),
           m_playlistDao(playlistDao),
           m_crateDao(crateDao),
           m_analysisDao(analysisDao),
+          m_directoryDAO(directoryDao),
           m_pConfig(pConfig),
           m_trackCache(TRACK_CACHE_SIZE),
           m_pQueryTrackLocationInsert(NULL),
@@ -268,7 +272,8 @@
 
 // No need to check here if the querys exist, this is already done in
 // addTracksAdd, which is the only function that calls this
-void TrackDAO::bindTrackToTrackLocationsInsert(TrackInfoObject* pTrack) {
+void TrackDAO::bindTrackToTrackLocationsInsert(TrackInfoObject* pTrack, int dirId,
+                                               QString& checksum) {
     // gets called only in addTracksAdd
     m_pQueryTrackLocationInsert->bindValue(":location", pTrack->getLocation());
     m_pQueryTrackLocationInsert->bindValue(":directory", pTrack->getDirectory());
@@ -277,6 +282,8 @@
     // Should this check pTrack->exists()?
     m_pQueryTrackLocationInsert->bindValue(":fs_deleted", 0);
     m_pQueryTrackLocationInsert->bindValue(":needs_verification", 0);
+    m_pQueryTrackLocationInsert->bindValue(":maindir_id", dirId);
+    m_pQueryTrackLocationInsert->bindValue(":checksum", checksum);
 }
 
 // No need to check here if the querys exist, this is already done in
@@ -335,7 +342,6 @@
 }
 
 void TrackDAO::addTracksPrepare() {
-
     if (m_pQueryLibraryInsert || m_pQueryTrackLocationInsert ||
         m_pQueryLibrarySelect || m_pQueryTrackLocationSelect ||
         m_pTransaction) {
@@ -353,9 +359,8 @@
     m_pQueryLibrarySelect = new QSqlQuery(m_database);
 
     m_pQueryTrackLocationInsert->prepare("INSERT INTO track_locations "
-            "(location, directory, filename, filesize, fs_deleted, needs_verification) "
-            "VALUES (:location, :directory, :filename, :filesize, :fs_deleted, :needs_verification)"
-            );
+            "(location, directory, filename, filesize, fs_deleted, needs_verification, maindir_id, checksum) "
+            "VALUES (:location, :directory, :filename, :filesize, :fs_deleted, :needs_verification, :maindir_id, :checksum)");
 
     m_pQueryTrackLocationSelect->prepare("SELECT id FROM track_locations WHERE location=:location");
 
@@ -398,7 +403,8 @@
     m_tracksAddedSet.clear();
 }
 
-bool TrackDAO::addTracksAdd(TrackInfoObject* pTrack, bool unremove) {
+bool TrackDAO::addTracksAdd(TrackInfoObject* pTrack, bool unremove,const int dirId) {
+
 
     if (!m_pQueryLibraryInsert || !m_pQueryTrackLocationInsert ||
         !m_pQueryLibrarySelect || !m_pQueryTrackLocationSelect) {
@@ -409,11 +415,12 @@
 
     int trackLocationId = -1;
     int trackId = -1;
+    QString checksum = calcChecksum(*pTrack);
 
     // Insert the track location into the corresponding table. This will fail
     // silently if the location is already in the table because it has a UNIQUE
     // constraint.
-    bindTrackToTrackLocationsInsert(pTrack);
+    bindTrackToTrackLocationsInsert(pTrack,dirId,checksum);
 
     if (!m_pQueryTrackLocationInsert->exec()) {
         qDebug() << "Location " << pTrack->getLocation() << " is already in the DB";
@@ -522,7 +529,7 @@
     }
 
     addTracksPrepare();
-    addTracksAdd(pTrack, unremove);
+    addTracksAdd(pTrack, unremove, 0);
     addTracksFinish();
 }
 
@@ -530,6 +537,8 @@
                                bool unremove) {
     QSqlQuery query(m_database);
     QList<int> trackIDs;
+    TrackInfoObject* pTrack;
+
 
     // Create a temporary database of the paths of all the imported tracks.
     query.prepare("CREATE TEMP TABLE playlist_import "
@@ -589,7 +598,8 @@
     while (query.next()) {
         QString filePath = query.value(query.record().indexOf("location")).toString();
         TrackInfoObject* pTrack = new TrackInfoObject(QFileInfo(filePath));
-        addTracksAdd(pTrack, unremove);
+        //TODO kain88 fix dirID
+        addTracksAdd(pTrack, unremove,0);
         int trackID = pTrack->getId();
         if (trackID >= 0) {
             trackIDs.append(trackID);
@@ -625,6 +635,7 @@
 
     // This signal is received by basetrackcache to remove the tracks from cache
     QSet<int> tracksRemovedSet = QSet<int>::fromList(ids);
+    uncacheTracks(tracksRemovedSet);
     emit(tracksRemoved(tracksRemovedSet));
 }
 
@@ -647,6 +658,7 @@
         LOG_FAILED_QUERY(query);
     }
     QSet<int> tracksAddedSet = QSet<int>::fromList(ids);
+    uncacheTracks(tracksAddedSet);
     emit(tracksAdded(tracksAddedSet));
 }
 
@@ -675,18 +687,17 @@
 
     FieldEscaper escaper(m_database);
     QStringList locationList;
-    QSet<QString> dirs;
+    QStringList dirs;
     while (query.next()) {
         QString filePath = query.value(query.record().indexOf("location")).toString();
         locationList << escaper.escapeString(filePath);
         QString directory = query.value(query.record().indexOf("directory")).toString();
-        dirs.insert(directory);
+        dirs << directory;
     }
 
     QStringList dirList;
-    for (QSet<QString>::const_iterator it = dirs.constBegin();
-         it != dirs.constEnd(); ++it) {
-        dirList << escaper.escapeString(*it);
+    foreach(QString dir, dirs) {
+        dirList << escaper.escapeString(dir);
     }
 
     if (locationList.empty()) {
@@ -724,16 +735,68 @@
     transaction.commit();
 
     // also need to clean playlists, crates, cues and track_analyses
-
     m_cueDao.deleteCuesForTracks(ids);
     m_playlistDao.removeTracksFromPlaylists(ids);
     m_crateDao.removeTracksFromCrates(ids);
     m_analysisDao.deleteAnalysises(ids);
 
     QSet<int> tracksRemovedSet = QSet<int>::fromList(ids);
+    uncacheTracks(tracksRemovedSet);
     emit(tracksRemoved(tracksRemovedSet));
 }
 
+//TODO(kain88) check if this works as desired
+QStringList TrackDAO::deleteTracksFromFS(QList<int> ids){
+     if (ids.empty()) {
+        return QStringList();
+    }
+
+    QStringList idList;
+    foreach (int id, ids) {
+        idList << QString::number(id);
+    }
+
+    QSqlQuery query(m_database);
+    query.prepare("SELECT track_locations.location, track_locations.directory FROM "
+                  "track_locations INNER JOIN library ON library.location = "
+                  "track_locations.id WHERE library.id in (:idList)");
+    query.bindValue("idList", idList.join(","));
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+    }
+
+    FieldEscaper escaper(m_database);
+    QStringList locationList;
+    while (query.next()) {
+        locationList << escaper.escapeString(query.value(
+                        query.record().indexOf("location")).toString());
+    }
+
+    QStringList failed;
+    foreach (QString loc, locationList) {
+        if (!QFile::remove(loc)) {
+            failed.append(loc);
+        }
+    }
+
+    query.prepare("SELECT libary.id FROM library INNER JOIN track_locations ON "
+                  "library.location = track_locations.id WHERE "
+                  "track_locations.location in (:locList)");
+    query.bindValue(":locList", failed.join(","));
+
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+    }
+    
+    while (query.next()) {
+        ids.removeAll(query.value(query.record().indexOf("if")).toInt());
+    }
+    // clean all DB entries AFTER the file is removed, otherwise the remove 
+    // function fails.
+    purgeTracks(ids);
+    return failed;
+}
+
 // deleter of the TrackInfoObject, for delete a Track from Library use hide or purge
 // static
 void TrackDAO::deleteTrack(TrackInfoObject* pTrack) {
@@ -764,7 +827,8 @@
         "filetype, rating, key, track_locations.location as location, "
         "track_locations.filesize as filesize, comment, url, duration, bitrate, "
         "samplerate, cuepoint, bpm, replaygain, channels, "
-        "header_parsed, timesplayed, played, beats_version, beats_sub_version, beats, datetime_added, bpm_lock "
+        "header_parsed, timesplayed, played, beats_version, beats_sub_version, beats, "
+        "datetime_added, bpm_lock "
         "FROM Library "
         "INNER JOIN track_locations "
             "ON library.location = track_locations.id "
@@ -1035,19 +1099,16 @@
 // Mark all the tracks whose paths begin with libraryPath as invalid.
 // That means we'll need to later check that those tracks actually
 // (still) exist as part of the library scanning procedure.
-void TrackDAO::invalidateTrackLocationsInLibrary(QString libraryPath) {
+void TrackDAO::invalidateTrackLocationsInLibrary() {
     //qDebug() << "TrackDAO::invalidateTrackLocations" << QThread::currentThread() << m_database.connectionName();
     //qDebug() << "invalidateTrackLocations(" << libraryPath << ")";
-    libraryPath += "%"; //Add wildcard to SQL query to match subdirectories!
 
     QSqlQuery query(m_database);
     query.prepare("UPDATE track_locations "
-                  "SET needs_verification=1 "
-                  "WHERE directory LIKE :directory");
-    query.bindValue(":directory", libraryPath);
+                  "SET needs_verification=1");
     if (!query.exec()) {
         LOG_FAILED_QUERY(query)
-                << "Couldn't mark tracks in directory" << libraryPath
+                << "Couldn't mark tracks in directory "
                 <<  "as needing verification.";
     }
 }
@@ -1087,13 +1148,24 @@
         LOG_FAILED_QUERY(query)
                 << "Couldn't mark tracks in" << directories.size() << "directories as verified.";
     }
+    // qDebug() << directories;
 }
 
 void TrackDAO::markUnverifiedTracksAsDeleted() {
     //qDebug() << "TrackDAO::markUnverifiedTracksAsDeleted" << QThread::currentThread() << m_database.connectionName();
-    //qDebug() << "markUnverifiedTracksAsDeleted()";
-
+    qDebug() << "markUnverifiedTracksAsDeleted()";
+    
     QSqlQuery query(m_database);
+    query.prepare("SELECT id FROM track_locations WHERE needs_verification=1");
+    QSet<int> trackIds;
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query)
+                << "Couldn't find unverified tracks";
+    }
+    while (query.next()){
+        trackIds.insert(query.value(query.record().indexOf("id")).toInt());
+    }
+    emit(tracksRemoved(trackIds));
     query.prepare("UPDATE track_locations "
                   "SET fs_deleted=1, needs_verification=0 "
                   "WHERE needs_verification=1");
@@ -1121,55 +1193,54 @@
 // and see if another "file" with the same name and filesize exists in the track_locations
 // table. That means the file has moved instead of being deleted outright, and so
 // we can salvage your existing metadata that you have in your DB (like cue points, etc.).
-void TrackDAO::detectMovedFiles(QSet<int>* pTracksMovedSetOld, QSet<int>* pTracksMovedSetNew) {
+void TrackDAO::detectMovedFiles(QSet<int>& tracksMovedSetOld, QSet<int>& tracksMovedSetNew) {
     //This function should not start a transaction on it's own!
     //When it's called from libraryscanner.cpp, there already is a transaction
     //started!
-
     QSqlQuery query(m_database);
     QSqlQuery query2(m_database);
     QSqlQuery query3(m_database);
     int oldTrackLocationId = -1;
     int newTrackLocationId = -1;
-    QString filename;
-    int fileSize;
+    QString checksum;
+    int duration = -1;
+    int fileSize = -1;
 
-    query.prepare("SELECT id, filename, filesize FROM track_locations WHERE fs_deleted=1");
+    query.prepare("SELECT track_locations.id, checksum, filesize, duration FROM track_locations "
+                  "INNER JOIN library ON track_locations.id=library.location "
+                  "WHERE fs_deleted=1");
 
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
     }
 
-    query2.prepare("SELECT id FROM track_locations WHERE "
-                   "fs_deleted=0 AND "
-                   "filename=:filename AND "
-                   "filesize=:filesize");
+    query2.prepare("SELECT track_locations.id FROM track_locations "
+                   "INNER JOIN library ON track_locations.id=library.location "
+                   "WHERE fs_deleted=0 AND "
+                   "checksum=:checksum AND "
+                   "filesize=:filesize AND "
+                   "duration=:duration");
 
     //For each track that's been "deleted" on disk...
     while (query.next()) {
         newTrackLocationId = -1; //Reset this var
         oldTrackLocationId = query.value(query.record().indexOf("id")).toInt();
-        filename = query.value(query.record().indexOf("filename")).toString();
+        checksum = query.value(query.record().indexOf("checksum")).toString();
         fileSize = query.value(query.record().indexOf("filesize")).toInt();
+        duration = query.value(query.record().indexOf("duration")).toInt();
 
-        query2.bindValue(":filename", filename);
+        query2.bindValue(":checksum", checksum);
         query2.bindValue(":filesize", fileSize);
+        query2.bindValue(":duration", duration);
         Q_ASSERT(query2.exec());
 
         Q_ASSERT(query2.size() <= 1); //WTF duplicate tracks?
-        while (query2.next())
-        {
+        while (query2.next()) {
             newTrackLocationId = query2.value(query2.record().indexOf("id")).toInt();
-        }
-
-        //If we found a moved track...
-        if (newTrackLocationId >= 0)
-        {
-            qDebug() << "Found moved track!" << filename;
+            qDebug() << "Found moved track!" << checksum;
 
             //Remove old row from track_locations table
-            query3.prepare("DELETE FROM track_locations WHERE "
-                           "id=:id");
+            query3.prepare("DELETE FROM track_locations WHERE id=:id");
             query3.bindValue(":id", oldTrackLocationId);
             Q_ASSERT(query3.exec());
 
@@ -1181,42 +1252,37 @@
                            "location=:location");
             query3.bindValue(":location", newTrackLocationId);
             Q_ASSERT(query3.exec());
-
-            while (query3.next())
-            {
-                int newTrackId = query3.value(query3.record().indexOf("id")).toInt();
-                query3.prepare("DELETE FROM library WHERE "
-                               "id=:newid");
-                query3.bindValue(":newid", newTrackLocationId);
-                Q_ASSERT(query3.exec());
-
-                // We collect all the new tracks the where added to BaseTrackCache as well
-                pTracksMovedSetNew->insert(newTrackId);
+            // We collect all the new tracks the where added to BaseTrackCache as well
+            while (query3.next()) {
+                int newTrackId = query3.value(0).toInt();
+                tracksMovedSetNew.insert(newTrackId);
             }
+            // Delete the track
+            query3.prepare("DELETE FROM library WHERE "
+                            "id=:newid");
+            query3.bindValue(":newid", newTrackLocationId);
+            Q_ASSERT(query3.exec());
 
             //Update the location foreign key for the existing row in the library table
             //to point to the correct row in the track_locations table.
+            query3.prepare("UPDATE library "
+                           "SET location=:newloc WHERE location=:oldloc");
+            query3.bindValue(":newloc", newTrackLocationId);
+            query3.bindValue(":oldloc", oldTrackLocationId);
+            Q_ASSERT(query3.exec());
+
+            // We collect all the old tracks that has to be updated in BaseTrackCache as well
             query3.prepare("SELECT id FROM library WHERE "
                            "location=:location");
-            query3.bindValue(":location", oldTrackLocationId);
+            query3.bindValue(":location", newTrackLocationId);
             Q_ASSERT(query3.exec());
-
-
-            while (query3.next())
-            {
-                int oldTrackId = query3.value(query3.record().indexOf("id")).toInt();
-
-                query3.prepare("UPDATE library "
-                               "SET location=:newloc WHERE id=:oldid");
-                query3.bindValue(":newloc", newTrackLocationId);
-                query3.bindValue(":oldid", oldTrackId);
-                Q_ASSERT(query3.exec());
-
-                // We collect all the old tracks that has to be updated in BaseTrackCache as well
-                pTracksMovedSetOld->insert(oldTrackId);
+            while (query3.next()) {
+                int oldTrackId = query3.value(0).toInt();
+                tracksMovedSetOld.insert(oldTrackId);
             }
         }
     }
+    databaseTracksMoved(tracksMovedSetOld, tracksMovedSetNew);
 }
 
 void TrackDAO::clearCache() {
@@ -1248,7 +1314,125 @@
     return false;
 }
 
-void TrackDAO::verifyTracksOutside(const QString& libraryPath, volatile bool* pCancel) {
+bool TrackDAO::relocateTrack(TrackPointer pTrack, QString newLocation) {
+    int newFileSize=-1;
+    int newDuration=-1;
+    int newTrackLocationId = -1;
+    int oldTrackLocationId = -1;
+    QString oldCheckSum;
+    QString newCheckSum;
+    int newMainDirId=0;
+    QString oldLocation = pTrack->getLocation();
+    int oldFileSize = pTrack->getLength();
+    int oldDuration = pTrack->getDuration();
+    int id = getTrackId(pTrack->getLocation());
+
+    ScopedTransaction transaction(m_database);
+    // see if this track is not already in the database and retrieve information
+    QSqlQuery query(m_database);
+    query.prepare("SELECT track_locations.id, checksum, filesize, duration FROM track_locations "
+                  "INNER JOIN library ON track_locations.id=library.location "
+                  "WHERE location= \"" + newLocation +  "\"");
+    if (!query.exec())
+        LOG_FAILED_QUERY(query);
+
+    while (query.next()) {
+        newTrackLocationId = query.value(query.record().indexOf("id")).toInt();
+        newFileSize = query.value(query.record().indexOf("filesize")).toInt();
+        newCheckSum = query.value(query.record().indexOf("checksum")).toString();
+        newDuration = query.value(query.record().indexOf("duration")).toInt();
+    }
+
+    // retrieve information about the old track
+    query.prepare("SELECT id, checksum FROM track_locations "
+                  "WHERE location = \""+oldLocation+"\"");
+    if (!query.exec())
+        LOG_FAILED_QUERY(query);
+    while (query.next()) {
+        oldCheckSum = query.value(query.record().indexOf("checksum")).toString();
+        oldTrackLocationId = query.value(query.record().indexOf("id")).toInt();
+        //qDebug() << oldTrackLocationId << " old id";
+    }
+
+    // check if the new track is in a Folder that mixxx watches
+    query.prepare("SELECT dir_id, directory FROM directories");
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "There are no directories saved in the db";
+    }
+    while (query.next()) {
+        QString dir = query.value(query.record().indexOf("directory")).toString();
+        if (newLocation.contains(dir)) {
+            newMainDirId = query.value(query.record().indexOf("dir_id")).toInt();
+        }
+    }
+
+    // check we already know a track in that location and make sanity check
+    // that this new track actually is the same as the old one
+    if (newTrackLocationId >= 0 &&
+        ((newFileSize == oldFileSize) &&
+         (oldCheckSum==newCheckSum) &&
+         (newDuration==oldDuration))) {
+
+        //The library scanner will have added a new row to the Library
+        //table which corresponds to the track in the new location. We need
+        //to remove that so we don't end up with two rows in the library table
+        //for the same track.
+        query.prepare("DELETE FROM library INNER JOIN track_locations ON "
+        "library.locations = track_locations.id WHERE library.location=:newid");
+        query.bindValue(":newid", newTrackLocationId);
+        Q_ASSERT(query.exec());
+
+        // Update the location foreign key for the existing row in the library table
+        // to point to the correct row in the track_locations table.
+        query.prepare("UPDATE track_locations "
+                      "SET location=:newloc, maindir_id=:dirid WHERE location=:oldloc");
+        query.bindValue(":newloc", "\"" +newLocation + "\"");
+        query.bindValue(":dirid",newMainDirId);
+        query.bindValue(":oldloc","\"" +oldLocation + "\"");
+        Q_ASSERT(query.exec());
+    } else {
+        // New locazion was unknown,
+        // we can simply change the location
+        TrackInfoObject newTrack(newLocation);
+        QString filename = newTrack.getFilename();
+        QString location = newTrack.getLocation();
+        QString directory = newTrack.getDirectory();
+        newFileSize = newTrack.getLength();
+        newDuration = newTrack.getDuration();
+
+        newCheckSum = calcChecksum(newLocation);
+        if ((newCheckSum != oldCheckSum) && (oldFileSize != newFileSize) 
+             && (newDuration!=oldDuration)) {
+            qDebug() << "that is another song";
+            qDebug() << "checksum " << oldCheckSum << " vs " << newCheckSum;
+            qDebug() << "filesize " << oldFileSize << " vs " << newFileSize;
+            qDebug() << "duration " << oldDuration << " vs " << newDuration;
+            return false;
+        }
+
+        query.prepare("UPDATE track_locations "
+                      "SET location=\""+location+"\", filename=\""+filename+"\","
+                      " directory=\""+directory+"\", "
+                      "fs_deleted=0, maindir_id= "+QString::number(newMainDirId)+
+                      " WHERE id="+QString::number(oldTrackLocationId));
+
+        // qDebug() << "will update it";
+        // qDebug() << query.lastQuery();
+        if (!query.exec()) {
+            LOG_FAILED_QUERY(query) << " update failed";
+            return false;
+        }
+    }
+    transaction.commit();
+    // remove tracks from cache and BTC
+    QSet<int> ids;
+    ids.insert(id);
+    databaseTracksMoved(ids,ids);
+    uncacheTracks(ids);
+    return true;
+}
+
+void TrackDAO::verifyTracksOutside(volatile bool* pCancel) {
     // This function is called from the LibraryScanner Thread
     ScopedTransaction transaction(m_database);
     QSqlQuery query(m_database);
@@ -1258,10 +1442,7 @@
     query.setForwardOnly(true);
     query.prepare("SELECT location "
                   "FROM track_locations "
-                  "WHERE directory NOT LIKE '" +
-                  libraryPath +
-                  "/%'"); //Add wildcard to SQL query to match subdirectories!
-
+                  "WHERE maindir_id=0");
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
         return;
@@ -1287,3 +1468,53 @@
     qDebug() << "verifyTracksOutside finished";
 }
 
+void TrackDAO::markTrackAsDeleted(TrackPointer pTrack){
+    int id = pTrack->getId();
+    ScopedTransaction transaction(m_database);
+    QSqlQuery query;
+    query.prepare("UPDATE track_locations SET fs_deleted=1 WHERE id="+QString::number(id));
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query) << "Could not mark Track as deleted";
+        return;
+    }
+    transaction.commit();
+    QSet<int> ids;
+    ids.insert(id);
+    uncacheTracks(ids);
+    emit(tracksRemoved(ids));
+}
+
+
+void TrackDAO::uncacheTracks(QSet<int> ids){
+    QMutexLocker locker(&m_sTracksMutex);
+    foreach (int id, ids) {
+        m_sTracks.remove(id);
+        m_trackCache.remove(id);
+    }
+}
+
+QString TrackDAO::calcChecksum(TrackInfoObject& pTrack) {
+    return calcChecksum(pTrack.getLocation());
+}
+
+QString TrackDAO::calcChecksum(QString location){
+    QFile file(location);
+    if (!file.exists()) {
+        return QString();
+    }
+    file.open(QIODevice::ReadOnly);
+    const int block_size = 4096;
+    char buffer[block_size];
+    int bytes_read;
+    // only ID3v1-Tags are at the end of the file and have a fixed size of
+    // 128byte this way we only calc the checksum of the audio
+    file.seek(file.size() - 2*block_size);
+
+    QCryptographicHash hash(QCryptographicHash::Md5);
+    if ( (bytes_read = file.read(buffer, block_size)) ) {
+        hash.addData(buffer,bytes_read);
+    }
+    return hash.result().toHex();
+}
+
+

=== modified file 'mixxx/src/library/dao/trackdao.h'
--- mixxx/src/library/dao/trackdao.h	2013-04-22 19:29:54 +0000
+++ mixxx/src/library/dao/trackdao.h	2013-05-18 16:32:26 +0000
@@ -52,12 +52,15 @@
 const QString TRACKLOCATIONSTABLE_FILESIZE = "filesize";
 const QString TRACKLOCATIONSTABLE_FSDELETED = "fs_deleted";
 const QString TRACKLOCATIONSTABLE_NEEDSVERIFICATION = "needs_verification";
+const QString TRACKLOCATIONSTABLE_FINGERPRINT = "fingerprint";
+const QString TRACKLOCATIONSTABLE_MAINDIRID = "maindir_id";
 
 class ScopedTransaction;
 class PlaylistDAO;
 class AnalysisDao;
 class CueDAO;
 class CrateDAO;
+class DirectoryDAO;
 
 class TrackDAO : public QObject, public virtual DAO {
     Q_OBJECT
@@ -66,8 +69,8 @@
     // synchronized on track metadata change
     TrackDAO(QSqlDatabase& database, CueDAO& cueDao,
              PlaylistDAO& playlistDao, CrateDAO& crateDao,
-             AnalysisDao& analysisDao,
-             ConfigObject<ConfigValue>* pConfig);
+             AnalysisDao& analysisDao, DirectoryDAO& directoryDao,
+             ConfigObject<ConfigValue>* pConfig = NULL);
     virtual ~TrackDAO();
 
     void finish();
@@ -81,25 +84,28 @@
     int addTrack(const QString& file, bool unremove);
     int addTrack(const QFileInfo& fileInfo, bool unremove);
     void addTracksPrepare();
-    bool addTracksAdd(TrackInfoObject* pTrack, bool unremove);
+    bool addTracksAdd(TrackInfoObject* pTrack, bool unremove,const int dirId);
     void addTracksFinish();
     QList<int> addTracks(const QList<QFileInfo> &fileInfoList, bool unremove);
     void hideTracks(QList<int> ids);
     void purgeTracks(QList<int> ids);
+    QStringList deleteTracksFromFS(QList<int> ids);
     void unhideTracks(QList<int> ids);
     TrackPointer getTrack(int id, bool cacheOnly=false) const;
     bool isDirty(int trackId);
+    bool relocateTrack(TrackPointer pTrack, QString newLocation);
+    void markTrackAsDeleted(TrackPointer pTrack);
 
     // Scanning related calls. Should be elsewhere or private somehow.
     void markTrackLocationAsVerified(QString location);
     void markTracksInDirectoriesAsVerified(QStringList directories);
-    void invalidateTrackLocationsInLibrary(QString libraryPath);
+    void invalidateTrackLocationsInLibrary();
     void markUnverifiedTracksAsDeleted();
     void markTrackLocationsAsDeleted(QString directory);
-    void detectMovedFiles(QSet<int>* pTracksMovedSetNew, QSet<int>* pTracksMovedSetOld);
+    void detectMovedFiles(QSet<int>& tracksMovedSetNew, QSet<int>& tracksMovedSetOld);
     void databaseTrackAdded(TrackPointer pTrack);
     void databaseTracksMoved(QSet<int> tracksMovedSetOld, QSet<int> tracksMovedSetNew);
-    void verifyTracksOutside(const QString& libraryPath, volatile bool* pCancel);
+    void verifyTracksOutside(volatile bool* pCancel);
 
   signals:
     void trackDirty(int trackId);
@@ -134,10 +140,13 @@
     void saveTrack(TrackInfoObject* pTrack);
     void updateTrack(TrackInfoObject* pTrack);
     void addTrack(TrackInfoObject* pTrack, bool unremove);
+    QString calcChecksum(TrackInfoObject& pTrack);
+    QString calcChecksum(QString location);
     TrackPointer getTrackFromDB(int id) const;
     QString absoluteFilePath(QString location);
+    void uncacheTracks(QSet<int> ids);
 
-    void bindTrackToTrackLocationsInsert(TrackInfoObject* pTrack);
+    void bindTrackToTrackLocationsInsert(TrackInfoObject* pTrack, int dirId,QString& checksum);
     void bindTrackToLibraryInsert(TrackInfoObject* pTrack, int trackLocationId);
 
     void writeAudioMetaData(TrackInfoObject* pTrack);
@@ -149,6 +158,7 @@
     PlaylistDAO &m_playlistDao;
     CrateDAO &m_crateDao;
     AnalysisDao& m_analysisDao;
+    DirectoryDAO& m_directoryDAO;
     ConfigObject<ConfigValue> * m_pConfig;
     static QHash<int, TrackWeakPointer> m_sTracks;
     static QMutex m_sTracksMutex;

=== modified file 'mixxx/src/library/hiddentablemodel.cpp'
--- mixxx/src/library/hiddentablemodel.cpp	2012-06-20 15:49:14 +0000
+++ mixxx/src/library/hiddentablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -1,28 +1,25 @@
-#include <QtCore>
-#include <QtGui>
-#include <QtSql>
-#include "library/trackcollection.h"
+#include <QMessageBox>
+
 #include "library/hiddentablemodel.h"
-#include "library/librarytablemodel.h"
-#include "mixxxutils.cpp"
-
 
 HiddenTableModel::HiddenTableModel(QObject* parent,
                                      TrackCollection* pTrackCollection)
         : BaseSqlTableModel(parent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            "mixxx.db.model.missing"),
-          m_pTrackCollection(pTrackCollection),
-          m_trackDao(m_pTrackCollection->getTrackDAO()) {
-
+                            NULL,"mixxx.db.model.missing") {
+    setTableModel();
+}
+
+HiddenTableModel::~HiddenTableModel() {
+}
+
+void HiddenTableModel::setTableModel(int id){
+    Q_UNUSED(id);
     QSqlQuery query;
-    QString tableName("hidden_songs");
+    QString tableName("hidden_songs_");
 
     QStringList columns;
     columns << "library." + LIBRARYTABLE_ID;
-
-    QString filter("mixxx_deleted");
-
+    QString filter("mixxx_deleted=1");
     query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS " + tableName + " AS "
                   "SELECT "
                   + columns.join(",") +
@@ -36,7 +33,7 @@
 
     //Print out any SQL error, if there was one.
     if (query.lastError().isValid()) {
-     	qDebug() << __FILE__ << __LINE__ << query.lastError();
+        qDebug() << __FILE__ << __LINE__ << query.lastError();
     }
 
     QStringList tableColumns;
@@ -48,26 +45,6 @@
     setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
     setSearch("");
 
-    connect(this, SIGNAL(doSearch(const QString&)),
-            this, SLOT(slotSearch(const QString&)));
-}
-
-HiddenTableModel::~HiddenTableModel() {
-}
-
-bool HiddenTableModel::addTrack(const QModelIndex& index, QString location) {
-    Q_UNUSED(index);
-    Q_UNUSED(location);
-    return false;
-}
-
-TrackPointer HiddenTableModel::getTrack(const QModelIndex& index) const {
-    //FIXME: use position instead of location for playlist tracks?
-
-    //const int locationColumnIndex = this->fieldIndex(LIBRARYTABLE_LOCATION);
-    //QString location = index.sibling(index.row(), locationColumnIndex).data().toString();
-    int trackId = getTrackId(index);
-    return m_trackDao.getTrack(trackId);
 }
 
 void HiddenTableModel::purgeTracks(const QModelIndexList& indices) {
@@ -78,7 +55,7 @@
         trackIds.append(trackId);
     }
 
-    m_trackDao.purgeTracks(trackIds);
+    m_trackDAO.purgeTracks(trackIds);
 
     // TODO(rryan) : do not select, instead route event to BTC and notify from
     // there.
@@ -93,22 +70,34 @@
         trackIds.append(trackId);
     }
 
-    m_trackDao.unhideTracks(trackIds);
+   m_trackDAO.unhideTracks(trackIds);
 
     // TODO(rryan) : do not select, instead route event to BTC and notify from
     // there.
     select(); //Repopulate the data model.
 }
 
-
-void HiddenTableModel::search(const QString& searchText) {
-    // qDebug() << "HiddenTableModel::search()" << searchText
-    //          << QThread::currentThread();
-    emit(doSearch(searchText));
-}
-
-void HiddenTableModel::slotSearch(const QString& searchText) {
-    BaseSqlTableModel::search(searchText);
+void HiddenTableModel::deleteTracks(const QModelIndexList& indices) {
+    QMessageBox::StandardButton btn = QMessageBox::question(
+        NULL, tr("Confirm Delete"),
+        tr("Are you sure you want to delete these files?"),
+        QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    if (btn == QMessageBox::No) {
+        return ;
+    }
+
+    QList<int> trackIds;
+    foreach (QModelIndex index, indices) {
+        int trackId = getTrackId(index);
+        trackIds.append(trackId);
+    }
+    QStringList failed = m_trackDAO.deleteTracksFromFS(trackIds);
+    if (!failed.isEmpty()) {
+        QMessageBox::warning(NULL, tr("Mixxx"),
+                     tr("The following track (%1) could not be removed"
+                         "because the files are still in use").arg(failed.join(",")));
+    }
+    select(); //Repopulate the data model.
 }
 
 bool HiddenTableModel::isColumnInternal(int column) {
@@ -116,7 +105,8 @@
         column == fieldIndex(LIBRARYTABLE_PLAYED) ||
         column == fieldIndex(LIBRARYTABLE_BPM_LOCK) ||
         column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
-        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)) {
+        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_MAINDIRID)) {
         return true;
     }
     return false;
@@ -136,5 +126,7 @@
 TrackModel::CapabilitiesFlags HiddenTableModel::getCapabilities() const {
     return TRACKMODELCAPS_NONE
             | TRACKMODELCAPS_PURGE
-            | TRACKMODELCAPS_UNHIDE;
+            | TRACKMODELCAPS_UNHIDE
+            | TRACKMODELCAPS_RELOCATE
+            | TRACKMODELCAPS_DELETEFS;
 }

=== modified file 'mixxx/src/library/hiddentablemodel.h'
--- mixxx/src/library/hiddentablemodel.h	2013-05-18 16:23:08 +0000
+++ mixxx/src/library/hiddentablemodel.h	2013-05-18 16:32:26 +0000
@@ -3,33 +3,20 @@
 
 #include "library/basesqltablemodel.h"
 
-class TrackCollection;
-
 class HiddenTableModel : public BaseSqlTableModel {
     Q_OBJECT
   public:
     HiddenTableModel(QObject* parent, TrackCollection* pTrackCollection);
     virtual ~HiddenTableModel();
-    TrackPointer getTrack(const QModelIndex& index) const;
-    void search(const QString& searchText);
+    void setTableModel(int id = -1);
     bool isColumnInternal(int column);
     bool isColumnHiddenByDefault(int column);
     void purgeTracks(const QModelIndexList& indices);
+    void deleteTracks(const QModelIndexList& indices);
     void unhideTracks(const QModelIndexList& indices);
-    bool addTrack(const QModelIndex& index, QString location);
 
     Qt::ItemFlags flags(const QModelIndex &index) const;
     TrackModel::CapabilitiesFlags getCapabilities() const;
-
-  private slots:
-    void slotSearch(const QString& searchText);
-
-  signals:
-    void doSearch(const QString& searchText);
-
-  private:
-    TrackCollection* m_pTrackCollection;
-    TrackDAO& m_trackDao;
 };
 
 #endif

=== modified file 'mixxx/src/library/itunes/itunesfeature.cpp'
--- mixxx/src/library/itunes/itunesfeature.cpp	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/itunes/itunesfeature.cpp	2013-05-18 16:32:26 +0000
@@ -25,10 +25,12 @@
 #endif
 }
 
-ITunesFeature::ITunesFeature(QObject* parent, TrackCollection* pTrackCollection)
+ITunesFeature::ITunesFeature(QObject* parent, TrackCollection* pTrackCollection
+                             ,ConfigObject<ConfigValue>* pConfig)
         : BaseExternalLibraryFeature(parent, pTrackCollection),
-          m_pTrackCollection(pTrackCollection),
-          m_cancelImport(false) {
+        m_pTrackCollection(pTrackCollection),
+        m_cancelImport(false),
+        m_pConfig(pConfig) {
     QString tableName = "itunes_library";
     QString idColumn = "id";
     QStringList columns;
@@ -53,13 +55,13 @@
         this, m_pTrackCollection,
         "mixxx.db.model.itunes",
         "itunes_library",
-        "itunes");
+        "itunes",m_pConfig);
     m_pITunesPlaylistModel = new BaseExternalPlaylistModel(
         this, m_pTrackCollection,
         "mixxx.db.model.itunes_playlist",
         "itunes_playlists",
         "itunes_playlist_tracks",
-        "itunes");
+        "itunes",m_pConfig);
     m_isActivated = false;
     m_title = tr("iTunes");
 
@@ -86,7 +88,7 @@
         "mixxx.db.model.itunes_playlist",
         "itunes_playlists",
         "itunes_playlist_tracks",
-        "itunes");
+        "itunes", m_pConfig);
     pModel->setPlaylist(playlist);
     return pModel;
 }
@@ -360,12 +362,12 @@
 void ITunesFeature::parseTracks(QXmlStreamReader &xml) {
     QSqlQuery query(m_database);
     query.prepare("INSERT INTO itunes_library (id, artist, title, album, year, genre, comment, tracknumber,"
-                  "bpm, bitrate,"
-                  "duration, location,"
-                  "rating ) "
-                  "VALUES (:id, :artist, :title, :album, :year, :genre, :comment, :tracknumber,"
-                  ":bpm, :bitrate,"
-                  ":duration, :location," ":rating )");
+                "bpm, bitrate,"
+                "duration, location,"
+                "rating ) "
+                "VALUES (:id, :artist, :title, :album, :year, :genre, :comment, :tracknumber,"
+                ":bpm, :bitrate,"
+                ":duration, :location," ":rating )");
 
 
     bool in_container_dictionary = false;
@@ -533,7 +535,7 @@
     TreeItem* rootItem = new TreeItem();
     QSqlQuery query_insert_to_playlists(m_database);
     query_insert_to_playlists.prepare("INSERT INTO itunes_playlists (id, name) "
-                                      "VALUES (:id, :name)");
+                                    "VALUES (:id, :name)");
 
     QSqlQuery query_insert_to_playlist_tracks(m_database);
     query_insert_to_playlist_tracks.prepare(
@@ -545,9 +547,9 @@
         //We process and iterate the <dict> tags holding playlist summary information here
         if (xml.isStartElement() && xml.name() == "dict") {
             parsePlaylist(xml,
-                          query_insert_to_playlists,
-                          query_insert_to_playlist_tracks,
-                          rootItem);
+                        query_insert_to_playlists,
+                        query_insert_to_playlist_tracks,
+                        rootItem);
             continue;
         }
         if (xml.isEndElement()) {
@@ -570,7 +572,7 @@
 }
 
 void ITunesFeature::parsePlaylist(QXmlStreamReader &xml, QSqlQuery &query_insert_to_playlists,
-                                  QSqlQuery &query_insert_to_playlist_tracks, TreeItem* root) {
+                                QSqlQuery &query_insert_to_playlist_tracks, TreeItem* root) {
     //qDebug() << "Parse Playlist";
 
     QString playlistname;
@@ -623,7 +625,7 @@
                     bool success = query_insert_to_playlists.exec();
                     if (!success) {
                         qDebug() << "SQL Error in ITunesTableModel.cpp: line" << __LINE__
-                                 << " " << query_insert_to_playlists.lastError();
+                                << " " << query_insert_to_playlists.lastError();
                         return;
                     }
                     //append the playlist to the child model
@@ -646,7 +648,7 @@
                     //Insert tracks if we are not in a pre-build playlist
                     if (!isSystemPlaylist && !query_insert_to_playlist_tracks.exec()) {
                         qDebug() << "SQL Error in ITunesFeature.cpp: line" << __LINE__ << " "
-                                 << query_insert_to_playlist_tracks.lastError();
+                                << query_insert_to_playlist_tracks.lastError();
                         qDebug() << "trackid" << track_reference;
                         qDebug() << "playlistname; " << playlistname;
                         qDebug() << "-----------------";
@@ -670,10 +672,10 @@
 
     if (!success) {
         qDebug() << "Could not delete remove old entries from table "
-                 << table_name << " : " << query.lastError();
+                << table_name << " : " << query.lastError();
     } else {
         qDebug() << "iTunes table entries of '"
-                 << table_name <<"' have been cleared.";
+                << table_name <<"' have been cleared.";
     }
 }
 
@@ -693,7 +695,7 @@
             NULL,
             tr("Error Loading iTunes Library"),
             tr("There was an error loading your iTunes library. Some of "
-               "your iTunes tracks or playlists may not have loaded."));
+            "your iTunes tracks or playlists may not have loaded."));
     }
     // calls a slot in the sidebarmodel such that 'isLoading' is removed from the feature title.
     m_title = tr("iTunes");

=== modified file 'mixxx/src/library/itunes/itunesfeature.h'
--- mixxx/src/library/itunes/itunesfeature.h	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/itunes/itunesfeature.h	2013-05-18 16:32:26 +0000
@@ -14,6 +14,7 @@
 #include "library/trackcollection.h"
 #include "library/treeitemmodel.h"
 #include "library/treeitem.h"
+#include "configobject.h"
 
 class BaseExternalTrackModel;
 class BaseExternalPlaylistModel;
@@ -21,7 +22,8 @@
 class ITunesFeature : public BaseExternalLibraryFeature {
     Q_OBJECT
  public:
-    ITunesFeature(QObject* parent, TrackCollection* pTrackCollection);
+    ITunesFeature(QObject* parent, TrackCollection* pTrackCollection
+                  ,ConfigObject<ConfigValue>* pConfig);
     virtual ~ITunesFeature();
     static bool isSupported();
 
@@ -62,6 +64,8 @@
     bool m_isActivated;
     QString m_dbfile;
 
+    ConfigObject<ConfigValue>* m_pConfig;
+
     QFutureWatcher<TreeItem*> m_future_watcher;
     QFuture<TreeItem*> m_future;
     QString m_title;

=== modified file 'mixxx/src/library/library.cpp'
--- mixxx/src/library/library.cpp	2013-05-18 16:23:08 +0000
+++ mixxx/src/library/library.cpp	2013-05-18 16:32:26 +0000
@@ -2,6 +2,8 @@
 // Created 8/23/2009 by RJ Ryan ([e-mail])
 
 #include <QItemSelectionModel>
+#include <QFuture>
+#include <QtConcurrentMap>
 
 #include "library/library.h"
 #include "library/libraryfeature.h"
@@ -41,48 +43,50 @@
         m_pSidebarModel(new SidebarModel(parent)),
         m_pTrackCollection(new TrackCollection(pConfig)),
         m_pLibraryControl(new LibraryControl),
-        m_pRecordingManager(pRecordingManager) {
+        m_pRecordingManager(pRecordingManager),
+        m_directoryDAO(m_pTrackCollection->getDirectoryDAO()) {
 
     // TODO(rryan) -- turn this construction / adding of features into a static
     // method or something -- CreateDefaultLibrary
-    m_pMixxxLibraryFeature = new MixxxLibraryFeature(this, m_pTrackCollection,m_pConfig);
-    addFeature(m_pMixxxLibraryFeature);
+    m_pMixxxLibraryFeature = new MixxxLibraryFeature(this, m_pTrackCollection,pConfig);
+    addFeature(m_pMixxxLibraryFeature,true);
 
 #ifdef __PROMO__
     if (PromoTracksFeature::isSupported(m_pConfig)) {
         m_pPromoTracksFeature = new PromoTracksFeature(this, pConfig,
                                                        m_pTrackCollection,
                                                        firstRun);
-        addFeature(m_pPromoTracksFeature);
+        addFeature(m_pPromoTracksFeature,false);
     } else {
         m_pPromoTracksFeature = NULL;
     }
 #endif
 
-    addFeature(new AutoDJFeature(this, pConfig, m_pTrackCollection));
+    addFeature(new AutoDJFeature(this, pConfig, m_pTrackCollection),true);
     m_pPlaylistFeature = new PlaylistFeature(this, m_pTrackCollection, pConfig);
-    addFeature(m_pPlaylistFeature);
+    addFeature(m_pPlaylistFeature,true);
     m_pCrateFeature = new CrateFeature(this, m_pTrackCollection, pConfig);
-    addFeature(m_pCrateFeature);
-    addFeature(new BrowseFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
-    addFeature(new RecordingFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager));
-    addFeature(new SetlogFeature(this, pConfig, m_pTrackCollection));
+    addFeature(m_pCrateFeature,true);
+    addFeature(new BrowseFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager),false);
+    addFeature(new RecordingFeature(this, pConfig, m_pTrackCollection, m_pRecordingManager),false);
+    // the history should show ALL songs 
+    addFeature(new SetlogFeature(this, pConfig, m_pTrackCollection),false);
     m_pPrepareFeature = new PrepareFeature(this, pConfig, m_pTrackCollection);
-    addFeature(m_pPrepareFeature);
+    addFeature(m_pPrepareFeature,false);
     //iTunes and Rhythmbox should be last until we no longer have an obnoxious
     //messagebox popup when you select them. (This forces you to reach for your
     //mouse or keyboard if you're using MIDI control and you scroll through them...)
     if (RhythmboxFeature::isSupported() &&
         pConfig->getValueString(ConfigKey("[Library]","ShowRhythmboxLibrary"),"1").toInt()) {
-        addFeature(new RhythmboxFeature(this, m_pTrackCollection));
+        addFeature(new RhythmboxFeature(this, m_pTrackCollection,pConfig),false);
     }
     if (ITunesFeature::isSupported() &&
         pConfig->getValueString(ConfigKey("[Library]","ShowITunesLibrary"),"1").toInt()) {
-        addFeature(new ITunesFeature(this, m_pTrackCollection));
+        addFeature(new ITunesFeature(this, m_pTrackCollection, pConfig),false);
     }
     if (TraktorFeature::isSupported() &&
         pConfig->getValueString(ConfigKey("[Library]","ShowTraktorLibrary"),"1").toInt()) {
-        addFeature(new TraktorFeature(this, m_pTrackCollection));
+        addFeature(new TraktorFeature(this, m_pTrackCollection,pConfig),false);
     }
 
     //Show the promo tracks view on first run, otherwise show the library
@@ -157,7 +161,7 @@
     }
 }
 
-void Library::addFeature(LibraryFeature* feature) {
+void Library::addFeature(LibraryFeature* feature, bool config) {
     Q_ASSERT(feature);
     m_features.push_back(feature);
     m_pSidebarModel->addLibraryFeature(feature);
@@ -171,15 +175,19 @@
             this, SLOT(slotLoadTrackToPlayer(TrackPointer, QString, bool)));
     connect(feature, SIGNAL(restoreSearch(const QString&)),
             this, SLOT(slotRestoreSearch(const QString&)));
+    if (config) {
+        connect(this, SIGNAL(configChanged(QString,QString)),
+                feature, SIGNAL(configChanged(QString,QString)));
+    }
 }
 
 void Library::slotShowTrackModel(QAbstractItemModel* model) {
-    //qDebug() << "Library::slotShowTrackModel" << model;
-    TrackModel* trackModel = dynamic_cast<TrackModel*>(model);
-    Q_ASSERT(trackModel);
+    qDebug() << "Library::slotShowTrackModel" << model;
+    m_ptrackModel = dynamic_cast<TrackModel*>(model);
+    Q_ASSERT(m_ptrackModel);
     emit(showTrackModel(model));
     emit(switchToView(m_sTrackViewName));
-    emit(restoreSearch(trackModel->currentSearch()));
+    emit(restoreSearch(m_ptrackModel->currentSearch()));
 }
 
 void Library::slotSwitchToView(const QString& view) {
@@ -242,3 +250,55 @@
 #endif
     return QList<TrackPointer>();
 }
+
+MixxxLibraryFeature* Library::getpMixxxLibraryFeature(){
+    return m_pMixxxLibraryFeature;
+}
+
+void Library::slotDirsChanged(QString op, QString dir){
+    qDebug() << "kain88 slotDirsChanged";
+    qDebug() << op << '\t' << dir;
+    if (op=="added") {
+        m_directoryDAO.addDirectory(dir);
+    } else if (op=="removed") {
+        purgeTracks(m_directoryDAO.getDirId(dir));
+        m_directoryDAO.purgeDirectory(dir);
+    } else if (op=="relocate") {
+        // see dlgprefplaylist for this
+        QStringList dirs = dir.split("!(~)!");
+        QString newFolder = dirs[0];
+        QString oldFolder = dirs[1];
+        m_directoryDAO.relocateDirectory(oldFolder,newFolder);
+    } else if (op=="update") {
+        // this will be signaled from the library scanner if the db needs to be 
+        // updated
+        m_directoryDAO.addDirectory(dir);
+        m_directoryDAO.updateTrackLocations(dir);
+    }
+}
+
+void Library::purgeTracks(const int dirId) {
+    QSqlQuery query;
+    QList<int> trackIds;
+    query.prepare("SELECT library.id FROM library INNER JOIN track_locations "
+                "ON library.location=track_locations.id "
+                "WHERE maindir_id="+QString::number(dirId));
+
+    if (!query.exec()) {
+        qDebug() << "could not purge tracks from libraryPath "<<dirId;
+    }
+
+    while (query.next()) {
+        trackIds.append(query.value(query.record().indexOf("id")).toInt());
+    }
+    qDebug() << "starting to purge Tracks " << trackIds;
+    m_pTrackCollection->getTrackDAO().purgeTracks(trackIds); 
+}
+
+void Library::slotLoadTrackFailed(TrackPointer pTrack){
+    m_pTrackCollection->getTrackDAO().markTrackAsDeleted(pTrack);
+}
+
+QStringList Library::getDirs(){
+    return m_directoryDAO.getDirs();
+}

=== modified file 'mixxx/src/library/library.h'
--- mixxx/src/library/library.h	2013-02-09 00:38:39 +0000
+++ mixxx/src/library/library.h	2013-05-18 16:32:26 +0000
@@ -14,7 +14,9 @@
 #include "configobject.h"
 #include "trackinfoobject.h"
 #include "recording/recordingmanager.h"
+#include "mixxxlibraryfeature.h"
 #include "preparefeature.h"
+#include "library/dao/directorydao.h"
 
 class TrackModel;
 class TrackCollection;
@@ -24,6 +26,7 @@
 class WLibrarySidebar;
 class WLibrary;
 class WSearchLineEdit;
+class PromoTracksFeature;
 class MixxxLibraryFeature;
 class PlaylistFeature;
 class CrateFeature;
@@ -42,8 +45,10 @@
                     MixxxKeyboard* pKeyboard);
     void bindSidebarWidget(WLibrarySidebar* sidebarWidget);
 
-    void addFeature(LibraryFeature* feature);
+    void addFeature(LibraryFeature* feature, bool config);
     QList<TrackPointer> getTracksToAutoLoad();
+    MixxxLibraryFeature* getpMixxxLibraryFeature();
+    QStringList getDirs();
 
     // TODO(rryan) Transitionary only -- the only reason this is here is so the
     // waveform widgets can signal to a player to load a track. This can be
@@ -65,6 +70,8 @@
     void slotRefreshLibraryModels();
     void slotCreatePlaylist();
     void slotCreateCrate();
+    void slotDirsChanged(QString,QString);
+    void slotLoadTrackFailed(TrackPointer pTrack);
     void onSkinLoadFinished();
 
   signals:
@@ -73,11 +80,17 @@
     void loadTrack(TrackPointer pTrack);
     void loadTrackToPlayer(TrackPointer pTrack, QString group, bool play = false);
     void restoreSearch(const QString&);
+    void configChanged(QString, QString);
+    void dirsChanged(QString,QString);
+    void loadTrackFailed(TrackPointer);
     void search(const QString& text);
     void searchCleared();
     void searchStarting();
 
   private:
+    void purgeTracks(const int dirId);
+    static QString mpChanged(const QString);
+
     ConfigObject<ConfigValue>* m_pConfig;
     SidebarModel* m_pSidebarModel;
     TrackCollection* m_pTrackCollection;
@@ -94,6 +107,8 @@
     PrepareFeature* m_pPrepareFeature;
     LibraryControl* m_pLibraryControl;
     RecordingManager* m_pRecordingManager;
+    TrackModel* m_ptrackModel;
+    DirectoryDAO m_directoryDAO;
 };
 
 #endif /* LIBRARY_H */

=== modified file 'mixxx/src/library/libraryfeature.h'
--- mixxx/src/library/libraryfeature.h	2013-02-03 18:50:24 +0000
+++ mixxx/src/library/libraryfeature.h	2013-05-18 16:32:26 +0000
@@ -9,6 +9,7 @@
 #include <QModelIndex>
 #include <QObject>
 #include <QString>
+#include <QStringList>
 #include <QVariant>
 #include <QAbstractItemModel>
 #include <QUrl>
@@ -87,11 +88,11 @@
     void restoreSearch(const QString&);
     // emit this signal before you parse a large music collection, e.g., iTunes, Traktor.
     void featureIsLoading(LibraryFeature*);
-    // emit this signal if the foreign music collection has been imported/parsed. 
+    // emit this signal if the foreign music collection has been imported/parsed.
     void featureLoadingFinished(LibraryFeature*s);
-    // emit this signal to select pFeature 
+    // emit this signal to select pFeature
     void featureSelect(LibraryFeature* pFeature, const QModelIndex& index);
-
+    void availableDirsChanged(QList<int>);
 };
 
 #endif /* LIBRARYFEATURE_H */

=== modified file 'mixxx/src/library/libraryscanner.cpp'
--- mixxx/src/library/libraryscanner.cpp	2013-02-09 22:06:46 +0000
+++ mixxx/src/library/libraryscanner.cpp	2013-05-18 16:32:26 +0000
@@ -33,9 +33,10 @@
     m_cueDao(m_database),
     m_playlistDao(m_database),
     m_crateDao(m_database),
+    m_directoryDao(m_database),
     m_analysisDao(m_database, collection->getConfig()),
     m_trackDao(m_database, m_cueDao, m_playlistDao, m_crateDao,
-               m_analysisDao, collection->getConfig()),
+               m_analysisDao,m_directoryDao, collection->getConfig()),
     // Don't initialize m_database here, we need to do it in run() so the DB
     // conn is in the right thread.
     m_nameFilters(SoundSourceProxy::supportedFileExtensionsString().split(" ")),
@@ -51,6 +52,17 @@
     connect(this, SIGNAL(scanFinished()),
             &(collection->getTrackDAO()), SLOT(clearCache()));
 
+    //connect the new trackDAO with the default BaseTrackCacheR
+    connect(&m_trackDao, SIGNAL(tracksRemoved(QSet<int>)),
+            &*(collection->getTrackSource(QString("default"))),
+            SLOT(slotTracksRemoved(QSet<int>)));
+    connect(&m_trackDao, SIGNAL(tracksAdded(QSet<int>)),
+            &*(collection->getTrackSource(QString("default"))),
+            SLOT(slotTracksAdded(QSet<int>)));
+    connect(this, SIGNAL(tracksRestored(QSet<int>)),
+            &*(collection->getTrackSource(QString("default"))),
+            SLOT(slotTracksAdded(QSet<int>)));
+
     // The "Album Artwork" folder within iTunes stores Album Arts.
     // It has numerous hundreds of sub folders but no audio files
     // We put this folder on a "black list"
@@ -128,7 +140,7 @@
         // Rollback any uncommitted transaction
         if (m_database.rollback()) {
             qDebug() << "ERROR: There was a transaction in progress while closing the library scanner connection."
-                     << "There is a logic error somewhere.";
+                    << "There is a logic error somewhere.";
         }
         // Close our database connection
         m_database.close();
@@ -214,7 +226,7 @@
     // verification of their existance...
     // (ie. we want to check they're still on your hard drive where
     // we think they are)
-    m_trackDao.invalidateTrackLocationsInLibrary(m_qLibraryPath);
+    m_trackDao.invalidateTrackLocationsInLibrary();
 
     qDebug() << "Recursively scanning library.";
     // Start scanning the library.
@@ -224,19 +236,26 @@
     m_trackDao.addTracksPrepare();
     QStringList verifiedDirectories;
 
-    bool bScanFinishedCleanly = recursiveScan(m_qLibraryPath, verifiedDirectories);
-
-    if (!bScanFinishedCleanly) {
-        qDebug() << "Recursive scan interrupted.";
-    } else {
-        qDebug() << "Recursive scan finished cleanly.";
+    QStringList dirs = m_directoryDao.getDirs();
+    QSet<int> restoredTracks;
+    bool bScanFinishedCleanly=false;
+    //recursivly scan each dir that is saved in the directories table
+    foreach (QString dir , dirs) {
+        int dirId = m_directoryDao.getDirId(dir);
+        bScanFinishedCleanly = recursiveScan(dir,verifiedDirectories,restoredTracks,dirId);
+        //Verify all Tracks inside Library but outside the library path
+        if (!bScanFinishedCleanly) {
+            qDebug() << "Recursive scan interrupted.";
+        } else {
+            qDebug() << "Recursive scan finished cleanly.";
+        }
     }
+    m_trackDao.verifyTracksOutside(&m_bCancelLibraryScan);
 
     // Runs inside a transaction
     m_trackDao.addTracksFinish();
-
-    //Verify all Tracks inside Library but outside the library path
-    m_trackDao.verifyTracksOutside(m_qLibraryPath, &m_bCancelLibraryScan);
+    // this will cause BaseTrackCache to update the index of all restored tracks
+    emit(tracksRestored(restoredTracks));
 
     // Start a transaction for all the library hashing (moved file detection)
     // stuff.
@@ -263,7 +282,7 @@
         // Check to see if the "deleted" tracks showed up in another location,
         // and if so, do some magic to update all our tables.
         qDebug() << "Detecting moved files.";
-        m_trackDao.detectMovedFiles(&tracksMovedSetOld, &tracksMovedSetNew);
+        m_trackDao.detectMovedFiles(tracksMovedSetOld, tracksMovedSetNew);
 
         // Remove the hashes for any directories that have been
         // marked as deleted to clean up. We need to do this otherwise
@@ -289,10 +308,8 @@
     emit(scanFinished());
 }
 
-void LibraryScanner::scan(QString libraryPath, QWidget *parent)
-{
-    m_qLibraryPath = libraryPath;
-    m_pProgress = new LibraryScannerDlg(parent);
+void LibraryScanner::scan() {
+    m_pProgress = new LibraryScannerDlg();
     m_pProgress->setAttribute(Qt::WA_DeleteOnClose);
 
     // The important part here is that we need to use
@@ -314,7 +331,7 @@
             this, SLOT(cancel()));
     connect(&m_trackDao, SIGNAL(progressVerifyTracksOutside(QString)),
             m_pProgress, SLOT(slotUpdate(QString)));
-    scan();
+    start();
 }
 
 //slot
@@ -328,15 +345,11 @@
     m_bCancelLibraryScan = 0;
 }
 
-void LibraryScanner::scan()
-{
-    start(); // Starts the thread by calling run()
-}
-
 // Recursively scan a music library. Doesn't import tracks for any directories that
 // have already been scanned and have not changed. Changes are tracked by performing
 // a hash of the directory's file list, and those hashes are stored in the database.
-bool LibraryScanner::recursiveScan(QString dirPath, QStringList& verifiedDirectories) {
+bool LibraryScanner::recursiveScan(QString dirPath, QStringList& verifiedDirectories,
+                                   QSet<int>& restoredTracks, const int dirId) {
     QDirIterator fileIt(dirPath, m_nameFilters, QDir::Files | QDir::NoDotAndDotDot);
     QString currentFile;
     bool bScanFinishedCleanly = true;
@@ -376,7 +389,8 @@
         }
 
         // Rescan that mofo!
-        bScanFinishedCleanly = m_pCollection->importDirectory(dirPath, m_trackDao, m_nameFilters, &m_bCancelLibraryScan);
+        bScanFinishedCleanly = m_pCollection->importDirectory(dirPath, m_trackDao, m_nameFilters,
+                                                              restoredTracks,dirId,&m_bCancelLibraryScan);
     } else { //prevHash == newHash
         // Add the directory to the verifiedDirectories list, so that later they
         // (and the tracks inside them) will be marked as verified
@@ -401,7 +415,7 @@
         if (m_directoriesBlacklist.contains(nextPath))
             continue;
 
-        if (!recursiveScan(nextPath, verifiedDirectories)) {
+        if (!recursiveScan(nextPath, verifiedDirectories,restoredTracks,dirId)) {
             bScanFinishedCleanly = false;
         }
     }

=== modified file 'mixxx/src/library/libraryscanner.h'
--- mixxx/src/library/libraryscanner.h	2012-12-06 17:11:14 +0000
+++ mixxx/src/library/libraryscanner.h	2013-05-18 16:32:26 +0000
@@ -16,7 +16,6 @@
 *                                                                         *
 ***************************************************************************/
 
-
 #ifndef LIBRARYSCANNER_H
 #define LIBRARYSCANNER_H
 
@@ -27,6 +26,7 @@
 #include "library/dao/cratedao.h"
 #include "library/dao/cuedao.h"
 #include "library/dao/libraryhashdao.h"
+#include "library/dao/directorydao.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackdao.h"
 #include "library/dao/analysisdao.h"
@@ -46,18 +46,20 @@
     void run();
     void scan(QString libraryPath, QWidget *parent);
     void scan();
-    bool recursiveScan(QString dirPath, QStringList& verifiedDirectories);
+    
   public slots:
     void cancel();
     void resetCancel();
   signals:
     void scanFinished();
     void progressHashing(QString);
+    void tracksRestored(QSet<int>);
   private:
+    bool recursiveScan(QString dirPath, QStringList& verifiedDirectories,
+                       QSet<int>& restoredTracks,const int dirId);
     TrackCollection* m_pCollection; // The library trackcollection
     QSqlDatabase m_database; // Hang on to a different DB connection
                              // since we run in a different thread */
-    QString m_qLibraryPath; // The path to the library on disk
     LibraryScannerDlg* m_pProgress; // The library scanning window
 
     LibraryHashDAO m_libraryHashDao;
@@ -65,6 +67,7 @@
     PlaylistDAO m_playlistDao;
     CrateDAO m_crateDao;
     AnalysisDao m_analysisDao;
+    DirectoryDAO m_directoryDao;
     TrackDAO m_trackDao;
 
     QStringList m_nameFilters;

=== modified file 'mixxx/src/library/librarytablemodel.cpp'
--- mixxx/src/library/librarytablemodel.cpp	2012-11-25 11:17:13 +0000
+++ mixxx/src/library/librarytablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -1,33 +1,53 @@
-#include <QtCore>
-#include <QtGui>
-#include <QtSql>
 
-#include "library/trackcollection.h"
 #include "library/librarytablemodel.h"
 #include "library/queryutil.h"
+#include "controlobjectthread.h"
+#include "controlobject.h"
 #include "mixxxutils.cpp"
 #include "playermanager.h"
 
 const QString LibraryTableModel::DEFAULT_LIBRARYFILTER =
-        "mixxx_deleted=0 AND fs_deleted=0";
+        "mixxx_deleted=0 AND fs_deleted=0"; 
 
 LibraryTableModel::LibraryTableModel(QObject* parent,
                                      TrackCollection* pTrackCollection,
+                                     ConfigObject<ConfigValue>* pConfig,
                                      QString settingsNamespace)
-        : BaseSqlTableModel(parent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            settingsNamespace),
-          m_trackDao(pTrackCollection->getTrackDAO()) {
+        : BaseSqlTableModel(parent, pTrackCollection, pConfig, settingsNamespace){
+    setTableModel();
+}
+
+LibraryTableModel::~LibraryTableModel() {
+}
+
+void LibraryTableModel::setTableModel(int id){
+    Q_UNUSED(id);
     QStringList columns;
-    columns << "library." + LIBRARYTABLE_ID;
-    columns << "'' as preview";
-
-    QSqlQuery query(pTrackCollection->getDatabase());
-    QString queryString = "CREATE TEMPORARY VIEW IF NOT EXISTS library_view AS "
-            "SELECT " + columns.join(",") +
+    columns << "library."+LIBRARYTABLE_ID << "'' as preview";
+
+    //prepareLibrary give a NULL to the constructor so check for it
+    bool showMissing;
+    if (m_pConfig) {
+        showMissing = m_pConfig->getValueString(
+                        ConfigKey("[Library]","ShowMissingSongs"),"1").toInt();
+    } else {
+        showMissing = false;
+    }
+    QString tableName = "library_view";
+    QString libraryFilter;
+    if (showMissing) {
+        libraryFilter = "mixxx_deleted=0";
+        tableName.append("_missing");
+    } else {
+        libraryFilter = "mixxx_deleted=0 AND fs_deleted=0";
+    }
+
+    QSqlQuery query(m_pTrackCollection->getDatabase());
+    QString queryString = "CREATE TEMPORARY VIEW IF NOT EXISTS "+tableName+" AS "
+            "SELECT " + columns.join(", ") +
             " FROM library INNER JOIN track_locations "
             "ON library.location = track_locations.id "
-            "WHERE (" + LibraryTableModel::DEFAULT_LIBRARYFILTER + ")";
+            "WHERE (" + libraryFilter + ")";
     query.prepare(queryString);
     if (!query.exec()) {
         LOG_FAILED_QUERY(query);
@@ -36,36 +56,16 @@
     QStringList tableColumns;
     tableColumns << LIBRARYTABLE_ID;
     tableColumns << "preview";
-    setTable("library_view", LIBRARYTABLE_ID, tableColumns,
-             pTrackCollection->getTrackSource("default"));
+    setTable(tableName, LIBRARYTABLE_ID, tableColumns,
+             m_pTrackCollection->getTrackSource("default"));
 
     // BaseSqlTabelModel will setup the header info
     initHeaderData();
 
     setSearch("");
     setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
-
-    connect(this, SIGNAL(doSearch(const QString&)),
-            this, SLOT(slotSearch(const QString&)));
-}
-
-LibraryTableModel::~LibraryTableModel() {
-}
-
-bool LibraryTableModel::addTrack(const QModelIndex& index, QString location) {
-    Q_UNUSED(index);
-    QFileInfo fileInfo(location);
-
-    // Adds track, does not insert duplicates, handles unremoving logic.
-    int trackId = m_trackDao.addTrack(fileInfo, true);
-    if (trackId >= 0) {
-        // TODO(rryan) do not select since we will get a signal. instead, do
-        // something nice UI wise and select the track they dropped.
-        select(); //Repopulate the data model.
-        return true;
-    }
-    return false;
-}
+}
+
 
 int LibraryTableModel::addTracks(const QModelIndex& index, QList<QString> locations) {
     Q_UNUSED(index);
@@ -73,35 +73,11 @@
     foreach (QString fileLocation, locations) {
         fileInfoList.append(QFileInfo(fileLocation));
     }
-    QList<int> trackIds = m_trackDao.addTracks(fileInfoList, true);
+    QList<int> trackIds = m_trackDAO.addTracks(fileInfoList, true);
     select();
     return trackIds.size();
 }
 
-TrackPointer LibraryTableModel::getTrack(const QModelIndex& index) const {
-    int trackId = getTrackId(index);
-    return m_trackDao.getTrack(trackId);
-}
-
-void LibraryTableModel::moveTrack(const QModelIndex& sourceIndex,
-                                  const QModelIndex& destIndex) {
-    Q_UNUSED(sourceIndex);
-    Q_UNUSED(destIndex);
-    // Does nothing because we don't support reordering tracks in the library,
-    // and getCapabilities() reports that.
-}
-
-void LibraryTableModel::search(const QString& searchText) {
-    // qDebug() << "LibraryTableModel::search()" << searchText
-    //          << QThread::currentThread();
-    emit(doSearch(searchText));
-}
-
-void LibraryTableModel::slotSearch(const QString& searchText) {
-    // qDebug() << "slotSearch()" << searchText << QThread::currentThread();
-    BaseSqlTableModel::search(searchText);
-}
-
 bool LibraryTableModel::isColumnInternal(int column) {
     if ((column == fieldIndex(LIBRARYTABLE_ID)) ||
         (column == fieldIndex(LIBRARYTABLE_URL)) ||
@@ -115,6 +91,7 @@
         (column == fieldIndex(LIBRARYTABLE_BPM_LOCK)) ||
         (column == fieldIndex(LIBRARYTABLE_CHANNELS)) ||
         (column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)) ||
+        (column == fieldIndex(TRACKLOCATIONSTABLE_MAINDIRID)) ||
         (PlayerManager::numPreviewDecks() == 0 && column == fieldIndex("preview"))) {
         return true;
     }
@@ -141,5 +118,6 @@
             | TRACKMODELCAPS_HIDE
             | TRACKMODELCAPS_BPMLOCK
             | TRACKMODELCAPS_CLEAR_BEATS
-            | TRACKMODELCAPS_RESETPLAYED;
+            | TRACKMODELCAPS_RESETPLAYED
+            | TRACKMODELCAPS_RELOCATE;
 }

=== modified file 'mixxx/src/library/librarytablemodel.h'
--- mixxx/src/library/librarytablemodel.h	2013-05-18 16:23:08 +0000
+++ mixxx/src/library/librarytablemodel.h	2013-05-18 16:32:26 +0000
@@ -1,43 +1,24 @@
 #ifndef LIBRARYTABLEMODEL_H
 #define LIBRARYTABLEMODEL_H
 
-#include <QtSql>
-#include <QtCore>
-
 #include "library/basesqltablemodel.h"
-#include "library/trackmodel.h"
-#include "library/dao/trackdao.h"
-
-class TrackCollection;
 
 class LibraryTableModel : public BaseSqlTableModel {
     Q_OBJECT
   public:
     LibraryTableModel(QObject* parent, TrackCollection* pTrackCollection,
+                      ConfigObject<ConfigValue>* pConfig,
                       QString settingsNamespace="mixxx.db.model.library");
     virtual ~LibraryTableModel();
+    void setTableModel(int id =-1);
 
-    TrackPointer getTrack(const QModelIndex& index) const;
-    void search(const QString& searchText);
     bool isColumnInternal(int column);
     bool isColumnHiddenByDefault(int column);
-    bool addTrack(const QModelIndex& index, QString location);
     // Takes a list of locations and add the tracks to the library. Returns the
     // number of successful additions.
     int addTracks(const QModelIndex& index, QList<QString> locations);
-    void moveTrack(const QModelIndex& sourceIndex,
-                           const QModelIndex& destIndex);
     TrackModel::CapabilitiesFlags getCapabilities() const;
     static const QString DEFAULT_LIBRARYFILTER;
-
-  private:
-    TrackDAO& m_trackDao;
-
-  private slots:
-    void slotSearch(const QString& searchText);
-
-  signals:
-    void doSearch(const QString& searchText);
 };
 
 #endif

=== added file 'mixxx/src/library/missingtablemodel.cpp'
--- mixxx/src/library/missingtablemodel.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/missingtablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -0,0 +1,126 @@
+#include <QtCore>
+#include <QtGui>
+#include <QtSql>
+#include "library/trackcollection.h"
+#include "library/missingtablemodel.h"
+#include "library/librarytablemodel.h"
+#include "mixxxutils.cpp"
+
+const QString MissingTableModel::MISSINGFILTER = "mixxx_deleted=0 AND fs_deleted=1";
+
+MissingTableModel::MissingTableModel(QObject* parent,
+                                     TrackCollection* pTrackCollection)
+        : BaseSqlTableModel(parent, pTrackCollection,
+                            //TODO kain88 this is not quite right
+                            NULL,
+                            "mixxx.db.model.missing"),
+          m_pTrackCollection(pTrackCollection),
+          m_trackDao(m_pTrackCollection->getTrackDAO()) {
+
+    QSqlQuery query;
+    //query.prepare("DROP VIEW " + playlistTableName);
+    //query.exec();
+    QString tableName("missing_songs");
+
+    QStringList columns;
+    columns << "library." + LIBRARYTABLE_ID;
+
+    query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS " + tableName + " AS "
+                  "SELECT "
+                  + columns.join(",") +
+                  " FROM library "
+                  "INNER JOIN track_locations "
+                  "ON library.location=track_locations.id "
+                  "WHERE " + MissingTableModel::MISSINGFILTER);
+    if (!query.exec()) {
+        qDebug() << query.executedQuery() << query.lastError();
+    }
+
+    //Print out any SQL error, if there was one.
+    if (query.lastError().isValid()) {
+     	qDebug() << __FILE__ << __LINE__ << query.lastError();
+    }
+
+    QStringList tableColumns;
+    tableColumns << LIBRARYTABLE_ID;
+    setTable(tableName, LIBRARYTABLE_ID, tableColumns,
+             m_pTrackCollection->getTrackSource("default"));
+
+    initHeaderData();
+    setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
+    setSearch("");
+
+    connect(this, SIGNAL(doSearch(const QString&)),
+            this, SLOT(slotSearch(const QString&)));
+}
+
+MissingTableModel::~MissingTableModel() {
+}
+
+bool MissingTableModel::addTrack(const QModelIndex& index, QString location) {
+    Q_UNUSED(index);
+    Q_UNUSED(location);
+    return false;
+}
+
+TrackPointer MissingTableModel::getTrack(const QModelIndex& index) const {
+    //FIXME: use position instead of location for playlist tracks?
+
+    //const int locationColumnIndex = this->fieldIndex(LIBRARYTABLE_LOCATION);
+    //QString location = index.sibling(index.row(), locationColumnIndex).data().toString();
+    int trackId = getTrackId(index);
+    return m_trackDao.getTrack(trackId);
+}
+
+void MissingTableModel::purgeTracks(const QModelIndexList& indices) {
+    QList<int> trackIds;
+
+    foreach (QModelIndex index, indices) {
+        int trackId = getTrackId(index);
+        trackIds.append(trackId);
+    }
+
+    m_trackDao.purgeTracks(trackIds);
+
+    // TODO(rryan) : do not select, instead route event to BTC and notify from
+    // there.
+    select(); //Repopulate the data model.
+}
+
+
+void MissingTableModel::search(const QString& searchText) {
+    // qDebug() << "MissingTableModel::search()" << searchText
+    //          << QThread::currentThread();
+    emit(doSearch(searchText));
+}
+
+void MissingTableModel::slotSearch(const QString& searchText) {
+    BaseSqlTableModel::search(searchText);
+}
+
+bool MissingTableModel::isColumnInternal(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_ID) ||
+        column == fieldIndex(LIBRARYTABLE_PLAYED) ||
+        column == fieldIndex(LIBRARYTABLE_BPM_LOCK) ||
+        column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)) {
+        return true;
+    }
+    return false;
+}
+bool MissingTableModel::isColumnHiddenByDefault(int column) {
+    if (column == fieldIndex(LIBRARYTABLE_KEY)) {
+        return true;
+    }
+    return false;
+}
+
+/** Override flags from BaseSqlModel since we don't want edit this model */
+Qt::ItemFlags MissingTableModel::flags(const QModelIndex &index) const {
+    return readOnlyFlags(index);
+}
+
+TrackModel::CapabilitiesFlags MissingTableModel::getCapabilities() const {
+    return TRACKMODELCAPS_NONE
+            | TRACKMODELCAPS_PURGE;
+}

=== removed file 'mixxx/src/library/missingtablemodel.cpp'
--- mixxx/src/library/missingtablemodel.cpp	2013-05-01 02:15:05 +0000
+++ mixxx/src/library/missingtablemodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-#include <QtCore>
-#include <QtGui>
-#include <QtSql>
-#include "library/trackcollection.h"
-#include "library/missingtablemodel.h"
-#include "library/librarytablemodel.h"
-#include "mixxxutils.cpp"
-
-const QString MissingTableModel::MISSINGFILTER = "mixxx_deleted=0 AND fs_deleted=1";
-
-MissingTableModel::MissingTableModel(QObject* parent,
-                                     TrackCollection* pTrackCollection)
-        : BaseSqlTableModel(parent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            "mixxx.db.model.missing"),
-          m_pTrackCollection(pTrackCollection),
-          m_trackDao(m_pTrackCollection->getTrackDAO()) {
-
-    QSqlQuery query(pTrackCollection->getDatabase());
-    //query.prepare("DROP VIEW " + playlistTableName);
-    //query.exec();
-    QString tableName("missing_songs");
-
-    QStringList columns;
-    columns << "library." + LIBRARYTABLE_ID;
-
-    query.prepare("CREATE TEMPORARY VIEW IF NOT EXISTS " + tableName + " AS "
-                  "SELECT "
-                  + columns.join(",") +
-                  " FROM library "
-                  "INNER JOIN track_locations "
-                  "ON library.location=track_locations.id "
-                  "WHERE " + MissingTableModel::MISSINGFILTER);
-    if (!query.exec()) {
-        qDebug() << query.executedQuery() << query.lastError();
-    }
-
-    //Print out any SQL error, if there was one.
-    if (query.lastError().isValid()) {
-     	qDebug() << __FILE__ << __LINE__ << query.lastError();
-    }
-
-    QStringList tableColumns;
-    tableColumns << LIBRARYTABLE_ID;
-    setTable(tableName, LIBRARYTABLE_ID, tableColumns,
-             m_pTrackCollection->getTrackSource("default"));
-
-    initHeaderData();
-    setDefaultSort(fieldIndex("artist"), Qt::AscendingOrder);
-    setSearch("");
-
-    connect(this, SIGNAL(doSearch(const QString&)),
-            this, SLOT(slotSearch(const QString&)));
-}
-
-MissingTableModel::~MissingTableModel() {
-}
-
-bool MissingTableModel::addTrack(const QModelIndex& index, QString location) {
-    Q_UNUSED(index);
-    Q_UNUSED(location);
-    return false;
-}
-
-TrackPointer MissingTableModel::getTrack(const QModelIndex& index) const {
-    //FIXME: use position instead of location for playlist tracks?
-
-    //const int locationColumnIndex = this->fieldIndex(LIBRARYTABLE_LOCATION);
-    //QString location = index.sibling(index.row(), locationColumnIndex).data().toString();
-    int trackId = getTrackId(index);
-    return m_trackDao.getTrack(trackId);
-}
-
-void MissingTableModel::purgeTracks(const QModelIndexList& indices) {
-    QList<int> trackIds;
-
-    foreach (QModelIndex index, indices) {
-        int trackId = getTrackId(index);
-        trackIds.append(trackId);
-    }
-
-    m_trackDao.purgeTracks(trackIds);
-
-    // TODO(rryan) : do not select, instead route event to BTC and notify from
-    // there.
-    select(); //Repopulate the data model.
-}
-
-
-void MissingTableModel::search(const QString& searchText) {
-    // qDebug() << "MissingTableModel::search()" << searchText
-    //          << QThread::currentThread();
-    emit(doSearch(searchText));
-}
-
-void MissingTableModel::slotSearch(const QString& searchText) {
-    BaseSqlTableModel::search(searchText);
-}
-
-bool MissingTableModel::isColumnInternal(int column) {
-    if (column == fieldIndex(LIBRARYTABLE_ID) ||
-        column == fieldIndex(LIBRARYTABLE_PLAYED) ||
-        column == fieldIndex(LIBRARYTABLE_BPM_LOCK) ||
-        column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
-        column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)) {
-        return true;
-    }
-    return false;
-}
-bool MissingTableModel::isColumnHiddenByDefault(int column) {
-    if (column == fieldIndex(LIBRARYTABLE_KEY)) {
-        return true;
-    }
-    return false;
-}
-
-/** Override flags from BaseSqlModel since we don't want edit this model */
-Qt::ItemFlags MissingTableModel::flags(const QModelIndex &index) const {
-    return readOnlyFlags(index);
-}
-
-TrackModel::CapabilitiesFlags MissingTableModel::getCapabilities() const {
-    return TRACKMODELCAPS_NONE
-            | TRACKMODELCAPS_PURGE;
-}

=== added file 'mixxx/src/library/missingtablemodel.h'
--- mixxx/src/library/missingtablemodel.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/library/missingtablemodel.h	2013-05-18 16:32:26 +0000
@@ -0,0 +1,41 @@
+#ifndef MISSINGTABLEMODEL_H
+#define MISSINGTABLEMODEL_H
+
+#include <QtSql>
+#include <QItemDelegate>
+#include <QtCore>
+
+#include "trackmodel.h"
+#include "library/dao/trackdao.h"
+#include "library/basesqltablemodel.h"
+
+class TrackCollection;
+
+class MissingTableModel : public BaseSqlTableModel {
+    Q_OBJECT
+  public:
+    MissingTableModel(QObject* parent, TrackCollection* pTrackCollection);
+    virtual ~MissingTableModel();
+    virtual TrackPointer getTrack(const QModelIndex& index) const;
+    virtual void search(const QString& searchText);
+    virtual bool isColumnInternal(int column);
+    virtual bool isColumnHiddenByDefault(int column);
+    virtual void purgeTracks(const QModelIndexList& indices);
+    virtual bool addTrack(const QModelIndex& index, QString location);
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+    TrackModel::CapabilitiesFlags getCapabilities() const;
+
+  private slots:
+    void slotSearch(const QString& searchText);
+
+  signals:
+    void doSearch(const QString& searchText);
+
+  private:
+    TrackCollection* m_pTrackCollection;
+    TrackDAO& m_trackDao;
+    static const QString MISSINGFILTER;
+};
+
+#endif

=== removed file 'mixxx/src/library/missingtablemodel.h'
--- mixxx/src/library/missingtablemodel.h	2012-08-10 15:03:46 +0000
+++ mixxx/src/library/missingtablemodel.h	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#ifndef MISSINGTABLEMODEL_H
-#define MISSINGTABLEMODEL_H
-
-#include <QtSql>
-#include <QItemDelegate>
-#include <QtCore>
-
-#include "trackmodel.h"
-#include "library/dao/trackdao.h"
-#include "library/basesqltablemodel.h"
-
-class TrackCollection;
-
-class MissingTableModel : public BaseSqlTableModel {
-    Q_OBJECT
-  public:
-    MissingTableModel(QObject* parent, TrackCollection* pTrackCollection);
-    virtual ~MissingTableModel();
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
-    virtual void search(const QString& searchText);
-    virtual bool isColumnInternal(int column);
-    virtual bool isColumnHiddenByDefault(int column);
-    virtual void purgeTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
-
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    TrackModel::CapabilitiesFlags getCapabilities() const;
-
-  private slots:
-    void slotSearch(const QString& searchText);
-
-  signals:
-    void doSearch(const QString& searchText);
-
-  private:
-    TrackCollection* m_pTrackCollection;
-    TrackDAO& m_trackDao;
-    static const QString MISSINGFILTER;
-};
-
-#endif

=== modified file 'mixxx/src/library/mixxxlibraryfeature.cpp'
--- mixxx/src/library/mixxxlibraryfeature.cpp	2013-01-17 08:16:08 +0000
+++ mixxx/src/library/mixxxlibraryfeature.cpp	2013-05-18 16:32:26 +0000
@@ -1,13 +1,10 @@
 // mixxxlibraryfeature.cpp
 // Created 8/23/2009 by RJ Ryan ([e-mail])
 
-#include <QtDebug>
-
 #include "library/mixxxlibraryfeature.h"
 
 #include "library/basetrackcache.h"
 #include "library/librarytablemodel.h"
-#include "library/missingtablemodel.h"
 #include "library/hiddentablemodel.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
@@ -88,11 +85,14 @@
     connect(&m_trackDao, SIGNAL(dbTrackAdded(TrackPointer)),
             pBaseTrackCache, SLOT(slotDbTrackAdded(TrackPointer)));
 
+
     m_pBaseTrackCache = QSharedPointer<BaseTrackCache>(pBaseTrackCache);
     pTrackCollection->addTrackSource(QString("default"), m_pBaseTrackCache);
 
     // These rely on the 'default' track source being present.
-    m_pLibraryTableModel = new LibraryTableModel(this, pTrackCollection);
+    m_pLibraryTableModel = new LibraryTableModel(this, pTrackCollection,pConfig);
+    connect(this,SIGNAL(configChanged(QString,QString)),
+            m_pLibraryTableModel, SLOT(slotConfigChanged(QString, QString)));
 
     TreeItem* pRootItem = new TreeItem();
     TreeItem* pmissingChildItem = new TreeItem(kMissingTitle, kMissingTitle,

=== modified file 'mixxx/src/library/mixxxlibraryfeature.h'
--- mixxx/src/library/mixxxlibraryfeature.h	2013-01-17 08:16:08 +0000
+++ mixxx/src/library/mixxxlibraryfeature.h	2013-05-18 16:32:26 +0000
@@ -7,6 +7,7 @@
 #include <QStringListModel>
 
 #include "library/libraryfeature.h"
+#include "configobject.h"
 #include "library/dao/trackdao.h"
 #include "treeitemmodel.h"
 #include "configobject.h"
@@ -34,12 +35,16 @@
     void bindWidget(WLibrary* pLibrary,
                     MixxxKeyboard* pKeyboard);
 
+  signals:
+    void configChanged(QString, QString);
+
   public slots:
     void activate();
     void activateChild(const QModelIndex& index);
     void refreshLibraryModels();
 
   private:
+    TrackCollection* m_pTrackCollection;
     const QString kMissingTitle;
     const QString kHiddenTitle;
     QSharedPointer<BaseTrackCache> m_pBaseTrackCache;
@@ -49,7 +54,6 @@
     TreeItemModel m_childModel;
     TrackDAO& m_trackDao;
     ConfigObject<ConfigValue>* m_pConfig;
-    TrackCollection* m_pTrackCollection;
 };
 
 #endif /* MIXXXLIBRARYFEATURE_H */

=== modified file 'mixxx/src/library/playlistfeature.cpp'
--- mixxx/src/library/playlistfeature.cpp	2013-05-12 22:17:32 +0000
+++ mixxx/src/library/playlistfeature.cpp	2013-05-18 16:32:26 +0000
@@ -22,11 +22,12 @@
 PlaylistFeature::PlaylistFeature(QObject* parent,
                                  TrackCollection* pTrackCollection,
                                  ConfigObject<ConfigValue>* pConfig)
-        : BasePlaylistFeature(parent, pConfig, pTrackCollection,
-                              "PLAYLISTHOME") {
+        : BasePlaylistFeature(parent, pConfig, pTrackCollection,"PLAYLISTHOME") {
     m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection,
-                                                   "mixxx.db.model.playlist");
-
+                                                   "mixxx.db.model.playlist",
+                                                   pConfig);
+    connect(this, SIGNAL(configChanged(QString,QString)),
+            m_pPlaylistTableModel, SLOT(slotConfigChanged(QString,QString)));
     //construct child model
     TreeItem *rootItem = new TreeItem();
     m_childModel.setRootItem(rootItem);
@@ -179,7 +180,7 @@
 
         if (type != PlaylistDAO::PLHT_UNKNOWN) {
             // Switch the view to the playlist.
-            m_pPlaylistTableModel->setPlaylist(playlistId);
+            m_pPlaylistTableModel->setTableModel(playlistId);
             // Update selection
             emit(featureSelect(this, m_lastRightClickedIndex));
         }

=== modified file 'mixxx/src/library/playlistfeature.h'
--- mixxx/src/library/playlistfeature.h	2013-05-18 16:23:08 +0000
+++ mixxx/src/library/playlistfeature.h	2013-05-18 16:32:26 +0000
@@ -15,7 +15,8 @@
 class PlaylistFeature : public BasePlaylistFeature {
     Q_OBJECT
   public:
-    PlaylistFeature(QObject* parent, TrackCollection* pTrackCollection,
+    PlaylistFeature(QObject* parent, 
+                    TrackCollection* pTrackCollection,
                     ConfigObject<ConfigValue>* pConfig);
     virtual ~PlaylistFeature();
 
@@ -25,6 +26,9 @@
     bool dropAcceptChild(const QModelIndex& index, QList<QUrl> urls, QWidget *pSource);
     bool dragMoveAcceptChild(const QModelIndex& index, QUrl url);
 
+  signals:
+    void configChanged(QString,QString);
+
   public slots:
     void onRightClick(const QPoint& globalPos);
     void onRightClickChild(const QPoint& globalPos, QModelIndex index);

=== modified file 'mixxx/src/library/playlisttablemodel.cpp'
--- mixxx/src/library/playlisttablemodel.cpp	2013-05-12 22:17:32 +0000
+++ mixxx/src/library/playlisttablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -1,50 +1,56 @@
-#include <QtCore>
-#include <QtGui>
-#include <QtSql>
-#include <QDateTime>
-#include "library/trackcollection.h"
 #include "library/playlisttablemodel.h"
 #include "library/queryutil.h"
 #include "mixxxutils.cpp"
 #include "playermanager.h"
 
 PlaylistTableModel::PlaylistTableModel(QObject* parent,
-                                       TrackCollection* pTrackCollection,
-                                       QString settingsNamespace,
-                                       bool showAll)
-        : BaseSqlTableModel(parent, pTrackCollection,
-                            pTrackCollection->getDatabase(),
-                            settingsNamespace),
-          m_pTrackCollection(pTrackCollection),
-          m_playlistDao(m_pTrackCollection->getPlaylistDAO()),
-          m_trackDao(m_pTrackCollection->getTrackDAO()),
-          m_iPlaylistId(-1) {
-    connect(this, SIGNAL(doSearch(const QString&)),
-            this, SLOT(slotSearch(const QString&)));
-    m_showAll = showAll;
+                                    TrackCollection* pTrackCollection,
+                                    QString settingsNamespace,
+                                    ConfigObject<ConfigValue>* pConfig,
+                                    bool showAll)
+        : BaseSqlTableModel(parent, pTrackCollection, pConfig, settingsNamespace),
+                            m_playlistDao(m_pTrackCollection->getPlaylistDAO()),
+                            m_iPlaylistId(-1),
+                            m_showAll(showAll) {
 }
 
 PlaylistTableModel::~PlaylistTableModel() {
 }
 
-void PlaylistTableModel::setPlaylist(int playlistId) {
+void PlaylistTableModel::setTableModel(int playlistId) {
     //qDebug() << "PlaylistTableModel::setPlaylist" << playlistId;
 
-    if (m_iPlaylistId == playlistId) {
+    if (playlistId == m_iPlaylistId) {
         qDebug() << "Already focused on playlist " << playlistId;
         return;
+    } else if (playlistId == -1) {
+        // calls from parent class use -1 as id then just set the current playlist
+        playlistId = m_iPlaylistId;
     }
 
     m_iPlaylistId = playlistId;
-    QString playlistTableName = "playlist_" + QString::number(m_iPlaylistId);
+    QString playlistTableName = "playlist_" + QString::number(m_iPlaylistId)+"_";
+
     QSqlQuery query(m_pTrackCollection->getDatabase());
     FieldEscaper escaper(m_pTrackCollection->getDatabase());
 
     QStringList columns;
-    columns << PLAYLISTTRACKSTABLE_TRACKID + " as " + LIBRARYTABLE_ID
-            << PLAYLISTTRACKSTABLE_POSITION
-            << PLAYLISTTRACKSTABLE_DATETIMEADDED
-            << "'' as preview";
+    QStringList tableColumns;
+    QString filter;
+        columns << "PlaylistTracks."+PLAYLISTTRACKSTABLE_TRACKID + " as " + LIBRARYTABLE_ID
+                << "PlaylistTracks."+PLAYLISTTRACKSTABLE_POSITION
+                << "PlaylistTracks."+PLAYLISTTRACKSTABLE_DATETIMEADDED
+                << "'' as preview";
+        tableColumns << PLAYLISTTRACKSTABLE_TRACKID
+                    << PLAYLISTTRACKSTABLE_POSITION
+                    << PLAYLISTTRACKSTABLE_DATETIMEADDED;
+    bool showMissing = m_pConfig->getValueString(ConfigKey("[Library]","ShowMissingSongs"),"1").toInt();
+    if (showMissing) {
+        filter = "library.mixxx_deleted=0";
+        playlistTableName.append("_missing");
+    } else {
+        filter = "library.mixxx_deleted=0 AND track_locations.fs_deleted=0";
+    }
 
     // We drop files that have been explicitly deleted from mixxx
     // (mixxx_deleted=0) from the view. There was a bug in <= 1.9.0 where
@@ -54,12 +60,13 @@
         "CREATE TEMPORARY VIEW IF NOT EXISTS %1 AS "
         "SELECT %2 FROM PlaylistTracks "
         "INNER JOIN library ON library.id = PlaylistTracks.track_id "
+        "INNER JOIN track_locations ON track_locations.id=PlaylistTracks.track_id "
         "WHERE PlaylistTracks.playlist_id = %3")
             .arg(escaper.escapeString(playlistTableName),
                  columns.join(","),
                  QString::number(playlistId));
     if (!m_showAll) {
-        queryString.append(" AND library.mixxx_deleted = 0");
+        queryString.append(" AND " + filter);
     }
     query.prepare(queryString);
     if (!query.exec()) {
@@ -68,7 +75,7 @@
 
     columns[0] = LIBRARYTABLE_ID;
     columns[3] = "preview";
-    setTable(playlistTableName, columns[0], columns,
+    setTable(playlistTableName, tableColumns[0], tableColumns,
              m_pTrackCollection->getTrackSource("default"));
     initHeaderData();
     setSearch("");
@@ -76,45 +83,6 @@
     setSort(defaultSortColumn(), defaultSortOrder());
 }
 
-bool PlaylistTableModel::addTrack(const QModelIndex& index, QString location) {
-    const int positionColumn = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
-    int position = index.sibling(index.row(), positionColumn).data().toInt();
-
-    // Handle weird cases like a drag-and-drop to an invalid index
-    if (position <= 0) {
-        position = rowCount() + 1;
-    }
-
-    // If a track is dropped but it isn't in the library, then add it because
-    // the user probably dropped a file from outside Mixxx into this playlist.
-    QFileInfo fileInfo(location);
-
-    // Adds track, does not insert duplicates, handles unremoving logic.
-    int trackId = m_trackDao.addTrack(fileInfo, true);
-
-    // Do nothing if the location still isn't in the database.
-    if (trackId < 0) {
-        return false;
-    }
-
-    m_playlistDao.insertTrackIntoPlaylist(trackId, m_iPlaylistId, position);
-
-    // TODO(rryan) signal an add to the base, don't select
-    select(); //Repopulate the data model.
-    return true;
-}
-
-bool PlaylistTableModel::appendTrack(int trackId) {
-    if (trackId < 0) {
-        return false;
-    }
-
-    bool bSuccess = m_playlistDao.appendTrackToPlaylist(trackId, m_iPlaylistId);
-
-    select(); //Repopulate the data model.
-    return bSuccess;
-}
-
 int PlaylistTableModel::addTracks(const QModelIndex& index, QList<QString> locations) {
     const int positionColumn = fieldIndex(PLAYLISTTRACKSTABLE_POSITION);
     int position = index.sibling(index.row(), positionColumn).data().toInt();
@@ -129,7 +97,7 @@
         fileInfoList.append(QFileInfo(fileLocation));
     }
 
-    QList<int> trackIds = m_trackDao.addTracks(fileInfoList, true);
+    QList<int> trackIds = m_trackDAO.addTracks(fileInfoList, true);
 
     int tracksAdded = m_playlistDao.insertTracksIntoPlaylist(
         trackIds, m_iPlaylistId, position);
@@ -144,13 +112,15 @@
     return tracksAdded;
 }
 
-TrackPointer PlaylistTableModel::getTrack(const QModelIndex& index) const {
-    //FIXME: use position instead of location for playlist tracks?
-
-    //const int locationColumnIndex = this->fieldIndex(LIBRARYTABLE_LOCATION);
-    //QString location = index.sibling(index.row(), locationColumnIndex).data().toString();
-    int trackId = getTrackId(index);
-    return m_trackDao.getTrack(trackId);
+bool PlaylistTableModel::appendTrack(int trackId) {
+    if (trackId < 0) {
+        return false;
+    }
+
+    m_playlistDao.appendTrackToPlaylist(trackId, m_iPlaylistId);
+
+    select(); //Repopulate the data model.
+    return true;
 }
 
 void PlaylistTableModel::removeTrack(const QModelIndex& index) {
@@ -226,18 +196,17 @@
 
     //Insert the song into the PlaylistTracks table
 
-    /** ALGORITHM for code below
-      Case 1: destination < source (newPos < oldPos)
-        1) Set position = -1 where pos=source -- Gives that track a dummy index to keep stuff simple.
-        2) Decrement position where pos > source
-        3) increment position where pos > dest
-        4) Set position = dest where pos=-1 -- Move track from dummy pos to final destination.
+    // ALGORITHM for code below
+    // Case 1: destination < source (newPos < oldPos)
+    //    1) Set position = -1 where pos=source -- Gives that track a dummy index to keep stuff simple.
+    //    2) Decrement position where pos > source
+    //    3) increment position where pos > dest
+    //    4) Set position = dest where pos=-1 -- Move track from dummy pos to final destination.
 
-      Case 2: destination > source (newPos > oldPos)
-        1) Set position=-1 where pos=source -- Give track a dummy index again.
-        2) Decrement position where pos > source AND pos <= dest
-        3) Set postion=dest where pos=-1 -- Move that track from dummy pos to final destination
-    */
+     // Case 2: destination > source (newPos > oldPos)
+     //   1) Set position=-1 where pos=source -- Give track a dummy index again.
+     //   2) Decrement position where pos > source AND pos <= dest
+     //   3) Set postion=dest where pos=-1 -- Move that track from dummy pos to final destination
 
     QString queryString;
     if (newPosition < oldPosition) {
@@ -336,17 +305,6 @@
     select();
 }
 
-void PlaylistTableModel::search(const QString& searchText) {
-    // qDebug() << "PlaylistTableModel::search()" << searchText
-    //          << QThread::currentThread();
-    emit(doSearch(searchText));
-}
-
-void PlaylistTableModel::slotSearch(const QString& searchText) {
-    BaseSqlTableModel::search(
-        searchText, LibraryTableModel::DEFAULT_LIBRARYFILTER);
-}
-
 bool PlaylistTableModel::isColumnInternal(int column) {
     if (column == fieldIndex(LIBRARYTABLE_ID) ||
         column == fieldIndex(PLAYLISTTRACKSTABLE_TRACKID) ||
@@ -354,6 +312,7 @@
         column == fieldIndex(LIBRARYTABLE_MIXXXDELETED) ||
         column == fieldIndex(LIBRARYTABLE_BPM_LOCK) ||
         column == fieldIndex(TRACKLOCATIONSTABLE_FSDELETED) ||
+        column == fieldIndex(TRACKLOCATIONSTABLE_MAINDIRID) ||
         (PlayerManager::numPreviewDecks() == 0 && column == fieldIndex("preview"))) {
         return true;
     }
@@ -380,6 +339,7 @@
             | TRACKMODELCAPS_LOADTOSAMPLER
             | TRACKMODELCAPS_LOADTOPREVIEWDECK
             | TRACKMODELCAPS_REMOVE
+            | TRACKMODELCAPS_RELOCATE
             | TRACKMODELCAPS_BPMLOCK
             | TRACKMODELCAPS_CLEAR_BEATS
             | TRACKMODELCAPS_RESETPLAYED;

=== modified file 'mixxx/src/library/playlisttablemodel.h'
--- mixxx/src/library/playlisttablemodel.h	2012-08-10 15:03:46 +0000
+++ mixxx/src/library/playlisttablemodel.h	2013-05-18 16:32:26 +0000
@@ -1,54 +1,38 @@
 #ifndef PLAYLISTTABLEMODEL_H
 #define PLAYLISTTABLEMODEL_H
 
-#include <QtSql>
-#include <QItemDelegate>
-#include <QtCore>
-
 #include "library/basesqltablemodel.h"
 #include "library/dao/playlistdao.h"
-#include "library/dao/trackdao.h"
-#include "library/librarytablemodel.h"
-
-class TrackCollection;
 
 class PlaylistTableModel : public BaseSqlTableModel {
     Q_OBJECT
   public:
     PlaylistTableModel(QObject* parent, TrackCollection* pTrackCollection,
-                       QString settingsNamespace,bool showAll=false);
+                    QString settingsNamespace, 
+                    ConfigObject<ConfigValue>* pConfig,
+                    bool showAll=false);
     virtual ~PlaylistTableModel();
-    void setPlaylist(int playlistId);
+    void setTableModel(int playlistId = -1);
+
     int getPlaylist() const {
         return m_iPlaylistId;
     }
-    virtual TrackPointer getTrack(const QModelIndex& index) const;
 
-    virtual void search(const QString& searchText);
-    virtual bool isColumnInternal(int column);
-    virtual bool isColumnHiddenByDefault(int column);
-    virtual void removeTrack(const QModelIndex& index);
-    virtual void removeTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
-    virtual bool appendTrack(int trackId);
+    bool isColumnInternal(int column);
+    bool isColumnHiddenByDefault(int column);
+    void removeTrack(const QModelIndex& index);
+    void removeTracks(const QModelIndexList& indices);
     // Adding multiple tracks at one to a playlist. Returns the number of
     // successful additions.
-    virtual int addTracks(const QModelIndex& index, QList<QString> locations);
-    virtual void moveTrack(const QModelIndex& sourceIndex, const QModelIndex& destIndex);
-    virtual void shuffleTracks(const QModelIndex& shuffleStartIndex);
-
+    int addTracks(const QModelIndex& index, QList<QString> locations);
+    bool appendTrack(int trackId);
+    void moveTrack(const QModelIndex& sourceIndex,
+                           const QModelIndex& destIndex);
+    void shuffleTracks(const QModelIndex& shuffleStartIndex);
     TrackModel::CapabilitiesFlags getCapabilities() const;
 
-  private slots:
-    void slotSearch(const QString& searchText);
-
-  signals:
-    void doSearch(const QString& searchText);
-
   private:
-    TrackCollection* m_pTrackCollection;
     PlaylistDAO& m_playlistDao;
-    TrackDAO& m_trackDao;
     int m_iPlaylistId;
     bool m_showAll;
 };

=== modified file 'mixxx/src/library/preparelibrarytablemodel.cpp'
--- mixxx/src/library/preparelibrarytablemodel.cpp	2012-12-08 14:33:51 +0000
+++ mixxx/src/library/preparelibrarytablemodel.cpp	2013-05-18 16:32:26 +0000
@@ -2,34 +2,23 @@
 
 #include "preparelibrarytablemodel.h"
 #include "library/trackcollection.h"
+#include "configobject.h"
 
 const QString RECENT_FILTER = "datetime_added > datetime('now', '-7 days')";
 
 PrepareLibraryTableModel::PrepareLibraryTableModel(QObject* parent,
                                                    TrackCollection* pTrackCollection)
-        : LibraryTableModel(parent, pTrackCollection,
+        : LibraryTableModel(parent, pTrackCollection, NULL,
                             "mixxx.db.model.prepare") {
     m_bShowRecentSongs = true;
     setSearch("", RECENT_FILTER);
 
-    connect(this, SIGNAL(doSearch(const QString&)),
-            this, SLOT(slotSearch(const QString&)));
 }
 
 
 PrepareLibraryTableModel::~PrepareLibraryTableModel() {
 }
 
-void PrepareLibraryTableModel::search(const QString& searchText) {
-    // qDebug() << "PrepareLibraryTableModel::search()" << searchText
-    //          << QThread::currentThread();
-    emit(doSearch(searchText));
-}
-
-void PrepareLibraryTableModel::slotSearch(const QString& searchText) {
-    BaseSqlTableModel::search(searchText,
-                              m_bShowRecentSongs ? RECENT_FILTER : QString());
-}
 
 void PrepareLibraryTableModel::showRecentSongs() {
    m_bShowRecentSongs = true;

=== modified file 'mixxx/src/library/preparelibrarytablemodel.h'
--- mixxx/src/library/preparelibrarytablemodel.h	2012-11-25 11:17:13 +0000
+++ mixxx/src/library/preparelibrarytablemodel.h	2013-05-18 16:32:26 +0000
@@ -8,18 +8,13 @@
 {
     Q_OBJECT
   public:
-    PrepareLibraryTableModel(QObject* parent, TrackCollection* pTrackCollection);
+    PrepareLibraryTableModel(QObject* parent,
+                             TrackCollection* pTrackCollection);
     virtual ~PrepareLibraryTableModel();
 
-    virtual void search(const QString& searchText);
-
   public slots:
     void showRecentSongs();
     void showAllSongs();
-  private slots:
-    void slotSearch(const QString& searchText);
-  signals:
-    void doSearch(const QString& searchText);
   private:
     bool m_bShowRecentSongs;
 };

=== modified file 'mixxx/src/library/promotracksfeature.cpp'
--- mixxx/src/library/promotracksfeature.cpp	2012-12-12 17:23:33 +0000
+++ mixxx/src/library/promotracksfeature.cpp	2013-05-18 16:32:26 +0000
@@ -46,7 +46,7 @@
           m_pTrackCollection(pTrackCollection),
           m_pFeaturedArtistsView(NULL),
           m_pBundledSongsView(NULL),
-          m_downloadsTableModel(this, pTrackCollection),
+          m_downloadsTableModel(this, pTrackCollection,config),
           m_bFirstRun(firstRun) {
 
     m_sPromoRemoteHTMLLocation = QString("http://promo.mixxx.org/%1/index.html").arg(MIXXX_PROMO_VERSION); //m_pConfig->getConfigPath() + "/promo/promotracks.html";

=== modified file 'mixxx/src/library/proxytrackmodel.cpp'
--- mixxx/src/library/proxytrackmodel.cpp	2013-01-19 12:15:22 +0000
+++ mixxx/src/library/proxytrackmodel.cpp	2013-05-18 16:32:26 +0000
@@ -2,6 +2,7 @@
 // Created 10/22/2009 by RJ Ryan ([e-mail])
 
 #include <QtCore>
+#include <QMessageBox>
 #include <QVariant>
 
 #include "library/proxytrackmodel.h"
@@ -40,7 +41,8 @@
     return m_pTrackModel->getTrackLocation(indexSource);
 }
 
-void ProxyTrackModel::search(const QString& searchText) {
+void ProxyTrackModel::search(const QString& searchText, const QString& extraFilter) {
+    Q_UNUSED(extraFilter);
     if (m_bHandleSearches) {
         m_currentSearch = searchText;
         setFilterFixedString(searchText);
@@ -64,10 +66,6 @@
     return m_pTrackModel->isColumnHiddenByDefault(column);
 }
 
-void ProxyTrackModel::removeTrack(const QModelIndex& index) {
-    QModelIndex indexSource = mapToSource(index);
-    m_pTrackModel->removeTrack(indexSource);
-}
 
 void ProxyTrackModel::removeTracks(const QModelIndexList& indices) {
     QModelIndexList translatedList;
@@ -78,11 +76,6 @@
     m_pTrackModel->removeTracks(translatedList);
 }
 
-bool ProxyTrackModel::addTrack(const QModelIndex& index, QString location) {
-    QModelIndex indexSource = mapToSource(index);
-    return m_pTrackModel->addTrack(indexSource, location);
-}
-
 void ProxyTrackModel::moveTrack(const QModelIndex& sourceIndex,
                                 const QModelIndex& destIndex) {
     QModelIndex sourceIndexSource = mapToSource(sourceIndex);
@@ -95,7 +88,19 @@
 }
 
 TrackModel::CapabilitiesFlags ProxyTrackModel::getCapabilities() const {
-    return m_pTrackModel->getCapabilities();
+    return TRACKMODELCAPS_NONE
+            | TRACKMODELCAPS_DELETEFS;
+}
+
+void ProxyTrackModel::deleteTracks(const QModelIndexList& indices){
+    QMessageBox::StandardButton btn = QMessageBox::question(
+        NULL, tr("Confirm Delete"),
+        tr("Are you sure you want to delete these files?"),
+        QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    if (btn == QMessageBox::No) {
+        return ;
+    }
+    //TODO(kain88) ask rryan what the row of the location field is
 }
 
 bool ProxyTrackModel::filterAcceptsRow(int sourceRow,

=== modified file 'mixxx/src/library/proxytrackmodel.h'
--- mixxx/src/library/proxytrackmodel.h	2012-11-25 09:33:00 +0000
+++ mixxx/src/library/proxytrackmodel.h	2013-05-18 16:32:26 +0000
@@ -16,7 +16,7 @@
 // calling the composed TrackModel. If the bHandleSearches flag is set, the
 // TrackModel search calls will not be delivered to the composed TrackModel
 // because filtering is handled by the QSortFilterProxyModel.
-class ProxyTrackModel : public QSortFilterProxyModel, public virtual TrackModel {
+class ProxyTrackModel : public QSortFilterProxyModel, public TrackModel {
   public:
     // Construct a new ProxyTrackModel with pTrackModel as the TrackModel it
     // composes. If bHandleSearches is true, then search signals will not be
@@ -29,15 +29,14 @@
     virtual QString getTrackLocation(const QModelIndex& index) const;
     virtual int getTrackId(const QModelIndex& index) const;
     virtual const QLinkedList<int> getTrackRows(int trackId) const;
-    virtual void search(const QString& searchText);
+    virtual void search(const QString& searchText,const QString& extraFilter=QString());
     virtual const QString currentSearch() const;
     virtual bool isColumnInternal(int column);
     virtual bool isColumnHiddenByDefault(int column);
-    virtual void removeTrack(const QModelIndex& index);
     virtual void removeTracks(const QModelIndexList& indices);
-    virtual bool addTrack(const QModelIndex& index, QString location);
     virtual void moveTrack(const QModelIndex& sourceIndex,
                            const QModelIndex& destIndex);
+    void deleteTracks(const QModelIndexList& indices);
     virtual QAbstractItemDelegate* delegateForColumn(const int i, QObject* pParent);
     virtual TrackModel::CapabilitiesFlags getCapabilities() const;
 

=== modified file 'mixxx/src/library/rhythmbox/rhythmboxfeature.cpp'
--- mixxx/src/library/rhythmbox/rhythmboxfeature.cpp	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxfeature.cpp	2013-05-18 16:32:26 +0000
@@ -9,9 +9,11 @@
 #include "library/treeitem.h"
 #include "library/queryutil.h"
 
-RhythmboxFeature::RhythmboxFeature(QObject* parent, TrackCollection* pTrackCollection)
+RhythmboxFeature::RhythmboxFeature(QObject* parent, TrackCollection* pTrackCollection,
+                                   ConfigObject<ConfigValue> *pConfig)
         : BaseExternalLibraryFeature(parent, pTrackCollection),
           m_pTrackCollection(pTrackCollection),
+          m_pConfig(pConfig),
           m_cancelImport(false) {
     QString tableName = "rhythmbox_library";
     QString idColumn = "id";
@@ -37,13 +39,13 @@
         this, m_pTrackCollection,
         "mixxx.db.model.rhythmbox",
         "rhythmbox_library",
-        "rhythmbox");
+        "rhythmbox",m_pConfig);
     m_pRhythmboxPlaylistModel = new BaseExternalPlaylistModel(
         this, m_pTrackCollection,
         "mixxx.db.model.rhythmbox_playlist",
         "rhythmbox_playlists",
         "rhythmbox_playlist_tracks",
-        "rhythmbox");
+        "rhythmbox",m_pConfig);
 
     m_isActivated =  false;
     m_title = tr("Rhythmbox");
@@ -76,7 +78,7 @@
                                             "mixxx.db.model.rhythmbox_playlist",
                                             "rhythmbox_playlists",
                                             "rhythmbox_playlist_tracks",
-                                            "rhythmbox");
+                                            "rhythmbox", m_pConfig);
     pModel->setPlaylist(playlist);
     return pModel;
 }

=== modified file 'mixxx/src/library/rhythmbox/rhythmboxfeature.h'
--- mixxx/src/library/rhythmbox/rhythmboxfeature.h	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/rhythmbox/rhythmboxfeature.h	2013-05-18 16:32:26 +0000
@@ -14,6 +14,7 @@
 #include "library/baseexternallibraryfeature.h"
 #include "library/treeitemmodel.h"
 #include "library/trackcollection.h"
+#include "configobject.h"
 
 class BaseExternalTrackModel;
 class BaseExternalPlaylistModel;
@@ -21,7 +22,8 @@
 class RhythmboxFeature : public BaseExternalLibraryFeature {
     Q_OBJECT
  public:
-    RhythmboxFeature(QObject* parent, TrackCollection*);
+    RhythmboxFeature(QObject* parent, TrackCollection* pTrackCollection,
+                     ConfigObject<ConfigValue> *pConfig);
     virtual ~RhythmboxFeature();
     static bool isSupported();
 
@@ -54,6 +56,7 @@
     QFutureWatcher<TreeItem*> m_track_watcher;
     QFuture<TreeItem*> m_track_future;
     TreeItemModel m_childModel;
+    ConfigObject<ConfigValue> *m_pConfig;
     bool m_cancelImport;
 
     // Removes all rows from a given table

=== modified file 'mixxx/src/library/setlogfeature.cpp'
--- mixxx/src/library/setlogfeature.cpp	2013-05-12 22:17:32 +0000
+++ mixxx/src/library/setlogfeature.cpp	2013-05-18 16:32:26 +0000
@@ -17,11 +17,10 @@
 SetlogFeature::SetlogFeature(QObject* parent,
                              ConfigObject<ConfigValue>* pConfig,
                              TrackCollection* pTrackCollection)
-        : BasePlaylistFeature(parent, pConfig, pTrackCollection,
-                              "SETLOGHOME") {
+        : BasePlaylistFeature(parent, pConfig, pTrackCollection, "SETLOGHOME") {
     m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection,
                                                    "mixxx.db.model.setlog",
-                                                   true);//show all tracks
+                                                   pConfig, true);
     m_pJoinWithPreviousAction = new QAction(tr("Join with previous"), this);
     connect(m_pJoinWithPreviousAction, SIGNAL(triggered()),
             this, SLOT(slotJoinWithPrevious()));
@@ -181,7 +180,7 @@
             int previousPlaylistId = m_playlistDao.getPreviousPlaylist(currentPlaylistId, PlaylistDAO::PLHT_SET_LOG);
             if (previousPlaylistId >= 0) {
 
-                m_pPlaylistTableModel->setPlaylist(previousPlaylistId);
+                m_pPlaylistTableModel->setTableModel(previousPlaylistId);
 
                 if (currentPlaylistId == m_playlistId) {
                     // mark all the Tracks in the previous Playlist as played
@@ -252,6 +251,8 @@
             return;
         }
 
+        m_playlistDao.appendTrackToPlaylist(currentPlayingTrackId,
+                                            m_playlistId);
         if (m_pPlaylistTableModel->getPlaylist() == m_playlistId) {
             // View needs a refresh
             m_pPlaylistTableModel->appendTrack(currentPlayingTrackId);
@@ -277,7 +278,7 @@
 
         if (type != PlaylistDAO::PLHT_UNKNOWN) {
             // Switch the view to the playlist.
-            m_pPlaylistTableModel->setPlaylist(playlistId);
+            m_pPlaylistTableModel->setTableModel(playlistId);
             // Update selection
             emit(featureSelect(this, m_lastRightClickedIndex));
         }

=== modified file 'mixxx/src/library/stardelegate.cpp'
--- mixxx/src/library/stardelegate.cpp	2012-11-30 09:17:37 +0000
+++ mixxx/src/library/stardelegate.cpp	2013-05-18 16:32:26 +0000
@@ -18,15 +18,19 @@
 
 #include <QtDebug>
 #include <QtGui>
+#include <QTableView>
 
 #include "stardelegate.h"
 #include "stareditor.h"
 #include "starrating.h"
+#include "library/trackmodel.h"
+#include "library/dao/trackdao.h"
 
 StarDelegate::StarDelegate(QObject *pParent)
         : QStyledItemDelegate(pParent),
           m_isOneCellInEditMode(false) {
     m_pTableView = qobject_cast<QTableView *>(pParent);
+    m_pTrackModel = dynamic_cast<TrackModel*>(m_pTableView->model());
     connect(pParent, SIGNAL(entered(QModelIndex)),
             this, SLOT(cellEntered(QModelIndex)));
 }
@@ -41,7 +45,8 @@
     // Populate the correct colors based on the styling
     QStyleOptionViewItem newOption = option;
     initStyleOption(&newOption, index);
-
+    bool fsDeleted=index.sibling(index.row(),
+            m_pTrackModel->fieldIndex(TRACKLOCATIONSTABLE_FSDELETED)).data().toInt();
     // Set the palette appropriately based on whether the row is selected or
     // not. We also have to check if it is inactive or not and use the
     // appropriate ColorGroup.
@@ -54,7 +59,11 @@
         painter->setBrush(newOption.palette.color(
             colorGroup, QPalette::HighlightedText));
     } else {
-        painter->fillRect(newOption.rect, newOption.palette.base());
+        if (fsDeleted) {
+            painter->fillRect(newOption.rect, QColor(Qt::red));
+        } else {
+            painter->fillRect(newOption.rect, newOption.palette.base());
+        }
         painter->setBrush(newOption.palette.text());
     }
 
@@ -123,4 +132,3 @@
         m_currentEditedCellIndex = QModelIndex();
     }
 }
-

=== modified file 'mixxx/src/library/stardelegate.h'
--- mixxx/src/library/stardelegate.h	2012-06-03 14:37:44 +0000
+++ mixxx/src/library/stardelegate.h	2013-05-18 16:32:26 +0000
@@ -21,6 +21,7 @@
 
 #include <QStyledItemDelegate>
 #include <QTableView>
+#include "library/trackmodel.h"
 
 /*
  * When displaying data in a QListView, QTableView, or QTreeView,
@@ -57,6 +58,7 @@
     QTableView *m_pTableView;
     QPersistentModelIndex m_currentEditedCellIndex;
     bool m_isOneCellInEditMode;
+    TrackModel* m_pTrackModel;
 };
 
 #endif

=== modified file 'mixxx/src/library/trackcollection.cpp'
--- mixxx/src/library/trackcollection.cpp	2013-05-07 03:17:23 +0000
+++ mixxx/src/library/trackcollection.cpp	2013-05-18 16:32:26 +0000
@@ -18,9 +18,10 @@
           m_playlistDao(m_db),
           m_crateDao(m_db),
           m_cueDao(m_db),
+          m_directoryDao(m_db),
           m_analysisDao(m_db, pConfig),
           m_trackDao(m_db, m_cueDao, m_playlistDao, m_crateDao,
-                     m_analysisDao, pConfig),
+                     m_analysisDao, m_directoryDao, pConfig),
           m_supportedFileExtensionsRegex(
               SoundSourceProxy::supportedFileExtensionsRegex(),
               Qt::CaseInsensitive) {
@@ -72,7 +73,7 @@
         return false;
     }
 
-    int requiredSchemaVersion = 18;
+    int requiredSchemaVersion = 19;
     QString schemaFilename = m_pConfig->getResourcePath();
     schemaFilename.append("schema.xml");
     QString okToExit = tr("Click OK to exit.");
@@ -116,12 +117,19 @@
     return m_db;
 }
 
-/** Do a non-recursive import of all the songs in a directory. Does NOT decend into subdirectories.
-    @param trackDao The track data access object which provides a connection to the database. We use this parameter in order to make this function callable from separate threads. You need to use a different DB connection for each thread.
-    @return true if the scan completed without being cancelled. False if the scan was cancelled part-way through.
-*/
+// Do a non-recursive import of all the songs in a directory. Does NOT 
+// decend into subdirectories.
+// @param trackDao The track data access object which provides a 
+//   connection to the database. We use this parameter in order to make 
+//   this function callable from separate threads. You need to use a 
+//   different DB connection for each thread.
+// @return true if the scan completed without being cancelled.
+//   False if the scan was cancelled part-way through.
 bool TrackCollection::importDirectory(QString directory, TrackDAO &trackDao,
-                                    const QStringList & nameFilters, volatile bool* cancel) {
+                                      const QStringList & nameFilters,
+                                      QSet<int>& restoredTracks,
+                                      const int dirId,
+                                      volatile bool* cancel) {
     //qDebug() << "TrackCollection::importDirectory(" << directory<< ")";
 
     emit(startedLoading());
@@ -149,15 +157,17 @@
         // it. If it does exist in the database, then it is either in the
         // user's library OR the user has "removed" the track via
         // "Right-Click -> Remove". These tracks stay in the library, but
-        // their mixxx_deleted column is 1.
-        if (!trackDao.trackExistsInDatabase(absoluteFilePath)) {
+        // their mixxx_deleted column is 1. It is also possible that the
+        // track was deleted and now restored, set these in restoredTracks
+        if (trackDao.trackExistsInDatabase(absoluteFilePath)) {
+            restoredTracks.insert(trackDao.getTrackId(absoluteFilePath));
+        } else {
             //qDebug() << "Loading" << it.fileName();
             emit(progressLoading(it.fileName()));
 
             TrackPointer pTrack = TrackPointer(new TrackInfoObject(
                               absoluteFilePath), &QObject::deleteLater);
-
-            if (trackDao.addTracksAdd(pTrack.data(), false)) {
+            if (trackDao.addTracksAdd(pTrack.data(), false,dirId)) {
                 // Successful added
                 // signal the main instance of TrackDao, that there is a
                 // new Track in the database
@@ -183,13 +193,17 @@
     return m_playlistDao;
 }
 
+DirectoryDAO& TrackCollection::getDirectoryDAO() {
+    return m_directoryDao;
+}
+
 QSharedPointer<BaseTrackCache> TrackCollection::getTrackSource(
-    const QString name) {
+                               const QString name) {
     return m_trackSources.value(name, QSharedPointer<BaseTrackCache>());
 }
 
-void TrackCollection::addTrackSource(
-    const QString name, QSharedPointer<BaseTrackCache> trackSource) {
+void TrackCollection::addTrackSource(const QString name,
+                                     QSharedPointer<BaseTrackCache> trackSource) {
     Q_ASSERT(!m_trackSources.contains(name));
     m_trackSources[name] = trackSource;
 }

=== modified file 'mixxx/src/library/trackcollection.h'
--- mixxx/src/library/trackcollection.h	2013-02-09 22:06:46 +0000
+++ mixxx/src/library/trackcollection.h	2013-05-18 16:32:26 +0000
@@ -31,6 +31,7 @@
 #include "library/dao/cuedao.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/analysisdao.h"
+#include "library/dao/directorydao.h"
 
 class TrackInfoObject;
 
@@ -51,7 +52,10 @@
 
     /** Import the files in a given diretory, without recursing into subdirectories */
     bool importDirectory(QString directory, TrackDAO &trackDao,
-                         const QStringList & nameFilters, volatile bool* cancel);
+                         const QStringList & nameFilters,
+                         QSet<int>& restoredTracks,
+                         const int dirId,
+                         volatile bool* cancel);
 
     void resetLibaryCancellation();
     QSqlDatabase& getDatabase();
@@ -59,6 +63,7 @@
     CrateDAO& getCrateDAO();
     TrackDAO& getTrackDAO();
     PlaylistDAO& getPlaylistDAO();
+    DirectoryDAO& getDirectoryDAO();
     QSharedPointer<BaseTrackCache> getTrackSource(const QString name);
     void addTrackSource(const QString name, QSharedPointer<BaseTrackCache> trackSource);
     void cancelLibraryScan();
@@ -81,7 +86,13 @@
     CueDAO m_cueDao;
     AnalysisDao m_analysisDao;
     TrackDAO m_trackDao;
+    DirectoryDAO m_directoryDao;
     const QRegExp m_supportedFileExtensionsRegex;
+    // Flag to raise when library scan should be cancelled
+    int bCancelLibraryScan;
+    QMutex m_libraryScanMutex;
+
+
 };
 
 #endif

=== modified file 'mixxx/src/library/trackmodel.h'
--- mixxx/src/library/trackmodel.h	2012-11-25 09:33:00 +0000
+++ mixxx/src/library/trackmodel.h	2013-05-18 16:32:26 +0000
@@ -43,7 +43,8 @@
         TRACKMODELCAPS_RESETPLAYED       = 0x04000,
         TRACKMODELCAPS_HIDE              = 0x08000,
         TRACKMODELCAPS_UNHIDE            = 0x10000,
-        TRACKMODELCAPS_PURGE             = 0x20000
+        TRACKMODELCAPS_PURGE             = 0x20000,
+        TRACKMODELCAPS_DELETEFS          = 0x40000
     };
 
     typedef int CapabilitiesFlags; /** Enables us to do ORing */
@@ -63,7 +64,10 @@
     virtual const QLinkedList<int> getTrackRows(int trackId) const = 0;
 
     bool isTrackModel() { return true;}
-    virtual void search(const QString& searchText) = 0;
+    virtual void search(const QString& searchText, const QString& extraFilter=QString()) {
+        Q_UNUSED(searchText);
+        Q_UNUSED(extraFilter);
+    };
     virtual const QString currentSearch() const = 0;
     virtual bool isColumnInternal(int column) = 0;
     // if no header state exists, we may hide some columns so that the user can
@@ -71,9 +75,7 @@
     virtual bool isColumnHiddenByDefault(int column) = 0;
     virtual const QList<int>& showableColumns() const { return m_emptyColumns; }
     virtual const QList<int>& searchColumns() const { return m_emptyColumns; }
-    virtual void removeTrack(const QModelIndex& index) {
-        Q_UNUSED(index);
-    }
+
     virtual void removeTracks(const QModelIndexList& indices) {
         Q_UNUSED(indices);
     }
@@ -83,14 +85,15 @@
     virtual void unhideTracks(const QModelIndexList& indices) {
         Q_UNUSED(indices);
     }
+    virtual void relocateTracks(const QModelIndexList& indices) {
+        Q_UNUSED(indices);
+    }
+    virtual void deleteTracks(const QModelIndexList& indices) {
+        Q_UNUSED(indices);
+    }
     virtual void purgeTracks(const QModelIndexList& indices) {
         Q_UNUSED(indices);
     }
-    virtual bool addTrack(const QModelIndex& index, QString location) {
-        Q_UNUSED(index);
-        Q_UNUSED(location);
-        return false;
-    }
     virtual int addTracks(const QModelIndex& index, QList<QString> locations) {
         Q_UNUSED(index);
         Q_UNUSED(locations);
@@ -133,10 +136,13 @@
         m_iDefaultSortColumn = sortColumn;
         m_eDefaultSortOrder = sortOrder;
     }
-
+    
     virtual int fieldIndex(const QString& fieldName) const {
         Q_UNUSED(fieldName);
-        return 0;
+        return -1;
+    }
+
+    virtual void select() {
     }
 
   private:

=== modified file 'mixxx/src/library/traktor/traktorfeature.cpp'
--- mixxx/src/library/traktor/traktorfeature.cpp	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/traktor/traktorfeature.cpp	2013-05-18 16:32:26 +0000
@@ -11,17 +11,17 @@
 #include "library/traktor/traktorfeature.h"
 
 #include "library/librarytablemodel.h"
-#include "library/missingtablemodel.h"
 #include "library/queryutil.h"
 #include "library/trackcollection.h"
 #include "library/treeitem.h"
 
 TraktorTrackModel::TraktorTrackModel(QObject* parent,
-                                     TrackCollection* pTrackCollection)
+                                     TrackCollection* pTrackCollection,
+                                     ConfigObject<ConfigValue> *pConfig)
         : BaseExternalTrackModel(parent, pTrackCollection,
                                  "mixxx.db.model.traktor_tablemodel",
                                  "traktor_library",
-                                 "traktor") {
+                                 "traktor",pConfig) {
 }
 
 bool TraktorTrackModel::isColumnHiddenByDefault(int column) {
@@ -33,12 +33,13 @@
 }
 
 TraktorPlaylistModel::TraktorPlaylistModel(QObject* parent,
-                                           TrackCollection* pTrackCollection)
+                                           TrackCollection* pTrackCollection,
+                                           ConfigObject<ConfigValue> *pConfig)
         : BaseExternalPlaylistModel(parent, pTrackCollection,
                                     "mixxx.db.model.traktor.playlistmodel",
                                     "traktor_playlists",
                                     "traktor_playlist_tracks",
-                                    "traktor") {
+                                    "traktor", pConfig) {
 }
 
 bool TraktorPlaylistModel::isColumnHiddenByDefault(int column) {
@@ -49,10 +50,12 @@
     return false;
 }
 
-TraktorFeature::TraktorFeature(QObject* parent, TrackCollection* pTrackCollection)
+TraktorFeature::TraktorFeature(QObject* parent, TrackCollection* pTrackCollection,
+                               ConfigObject<ConfigValue> *pConfig)
         : BaseExternalLibraryFeature(parent, pTrackCollection),
           m_pTrackCollection(pTrackCollection),
-          m_cancelImport(false) {
+          m_cancelImport(false),
+          m_pConfig(pConfig) {
     QString tableName = "traktor_library";
     QString idColumn = "id";
     QStringList columns;
@@ -75,8 +78,8 @@
                            columns, false)));
 
     m_isActivated = false;
-    m_pTraktorTableModel = new TraktorTrackModel(this, m_pTrackCollection);
-    m_pTraktorPlaylistModel = new TraktorPlaylistModel(this, m_pTrackCollection);
+    m_pTraktorTableModel = new TraktorTrackModel(this, m_pTrackCollection,pConfig);
+    m_pTraktorPlaylistModel = new TraktorPlaylistModel(this, m_pTrackCollection,pConfig);
 
     m_title = tr("Traktor");
 
@@ -101,7 +104,8 @@
 }
 
 BaseSqlTableModel* TraktorFeature::getPlaylistModelForPlaylist(QString playlist) {
-    TraktorPlaylistModel* pModel = new TraktorPlaylistModel(this, m_pTrackCollection);
+    TraktorPlaylistModel* pModel = new TraktorPlaylistModel(this, m_pTrackCollection
+                                                            ,m_pConfig);
     pModel->setPlaylist(playlist);
     return pModel;
 }

=== modified file 'mixxx/src/library/traktor/traktorfeature.h'
--- mixxx/src/library/traktor/traktorfeature.h	2013-01-01 11:53:13 +0000
+++ mixxx/src/library/traktor/traktorfeature.h	2013-05-18 16:32:26 +0000
@@ -15,6 +15,7 @@
 #include "library/baseexternaltrackmodel.h"
 #include "library/baseexternalplaylistmodel.h"
 #include "library/treeitemmodel.h"
+#include "configobject.h"
 
 class LibraryTableModel;
 class MissingTableModel;
@@ -24,21 +25,24 @@
 class TraktorTrackModel : public BaseExternalTrackModel {
   public:
     TraktorTrackModel(QObject* parent,
-                      TrackCollection* pTrackCollection);
+                      TrackCollection* pTrackCollection,
+                      ConfigObject<ConfigValue> *pConfig);
     virtual bool isColumnHiddenByDefault(int column);
 };
 
 class TraktorPlaylistModel : public BaseExternalPlaylistModel {
   public:
     TraktorPlaylistModel(QObject* parent,
-                         TrackCollection* pTrackCollection);
+                         TrackCollection* pTrackCollection,
+                         ConfigObject<ConfigValue> *pConfig);
     virtual bool isColumnHiddenByDefault(int column);
 };
 
 class TraktorFeature : public BaseExternalLibraryFeature {
     Q_OBJECT
   public:
-    TraktorFeature(QObject* parent, TrackCollection*);
+    TraktorFeature(QObject* parent, TrackCollection*, 
+                   ConfigObject<ConfigValue> *pConfig);
     virtual ~TraktorFeature();
 
     QVariant title();
@@ -70,6 +74,7 @@
     TrackCollection* m_pTrackCollection;
     // A separate db connection for the worker parsing thread
     QSqlDatabase m_database;
+    ConfigObject<ConfigValue> *m_pConfig;
     TraktorTrackModel* m_pTraktorTableModel;
     TraktorPlaylistModel* m_pTraktorPlaylistModel;
 

=== modified file 'mixxx/src/library/treeitem.cpp'
--- mixxx/src/library/treeitem.cpp	2013-05-18 16:23:08 +0000
+++ mixxx/src/library/treeitem.cpp	2013-05-18 16:32:26 +0000
@@ -45,6 +45,12 @@
 }
 
 TreeItem::~TreeItem() {
+    qDebug() << "~TreeItem()";
+    //TODO(kain88) this causes a segfault during shutdown, no idea why
+    qDebug() << m_childItems << " empty " << m_childItems.isEmpty();
+    if (m_childItems.isEmpty()) {
+        return;
+    }
     qDeleteAll(m_childItems);
 }
 

=== modified file 'mixxx/src/mixxx.cpp'
--- mixxx/src/mixxx.cpp	2013-05-16 00:14:12 +0000
+++ mixxx/src/mixxx.cpp	2013-05-18 16:32:26 +0000
@@ -298,30 +298,14 @@
     m_pEngine->addChannel(pMicrophone);
     m_pSoundManager->registerInput(micInput, pMicrophone);
 
-    // Get Music dir
-    bool hasChanged_MusicDir = false;
-    QDir dir(m_pConfig->getValueString(ConfigKey("[Playlist]","Directory")));
-    if (m_pConfig->getValueString(
-        ConfigKey("[Playlist]","Directory")).length() < 1 || !dir.exists())
-    {
-        // TODO this needs to be smarter, we can't distinguish between an empty
-        // path return value (not sure if this is normally possible, but it is
-        // possible with the Windows 7 "Music" library, which is what
-        // QDesktopServices::storageLocation(QDesktopServices::MusicLocation)
-        // resolves to) and a user hitting 'cancel'. If we get a blank return
-        // but the user didn't hit cancel, we need to know this and let the
-        // user take some course of action -- bkgood
-        QString fd = QFileDialog::getExistingDirectory(
-            this, tr("Choose music library directory"),
-            QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
-
-        if (fd != "")
-        {
-            m_pConfig->set(ConfigKey("[Playlist]","Directory"), fd);
-            m_pConfig->Save();
-            hasChanged_MusicDir = true;
-        }
+    // library dies in seemingly unrelated qtsql error about not having a
+    // sqlite driver if this path doesn't exist. Normally config->Save()
+    // above would make it but if it doesn't get run for whatever reason
+    // we get hosed -- bkgood
+    if (!QDir(QDir::homePath().append("/").append(SETTINGS_PATH)).exists()) {
+        QDir().mkpath(QDir::homePath().append("/").append(SETTINGS_PATH));
     }
+
     // Do not write meta data back to ID3 when meta data has changed
     // Because multiple TrackDao objects can exists for a particular track
     // writing meta data may ruine your MP3 file if done simultaneously.
@@ -375,6 +359,46 @@
                              bFirstRun || bUpgraded,
                              m_pRecordingManager);
     m_pPlayerManager->bindToLibrary(m_pLibrary);
+    connect(this, SIGNAL(dirsChanged(QString,QString)),
+            m_pLibrary, SLOT(slotDirsChanged(QString,QString)));
+
+    // Check if we update from an old db without relative library paths
+    // getValueString will return "" if no value was set
+    bool oldLibrary = m_pConfig->getValueString(ConfigKey("[Library]","newVersion"))=="";
+    qDebug() << "kain88 status of library version" << oldLibrary;
+    //TODO(kain88) mode this into update code
+    if (oldLibrary) {
+        QString dir = m_pConfig->getValueString(ConfigKey("[Playlist]","Directory"));
+        // adds the current library path to the directories table and updates
+        // track_locations for all tracks
+        if (dir!="") {
+            emit(dirsChanged("update",dir));
+            m_pConfig->set(ConfigKey("[Library]","newVersion"),ConfigValue((int)true));
+            m_pConfig->Save();
+        }
+    }
+
+    // Get Music dir
+    bool hasChanged_MusicDir = false;
+
+    QStringList dirs = m_pLibrary->getDirs();
+    if (dirs.size() < 1) {
+        // TODO(XXX) this needs to be smarter, we can't distinguish between an empty
+        // path return value (not sure if this is normally possible, but it is
+        // possible with the Windows 7 "Music" library, which is what
+        // QDesktopServices::storageLocation(QDesktopServices::MusicLocation)
+        // resolves to) and a user hitting 'cancel'. If we get a blank return
+        // but the user didn't hit cancel, we need to know this and let the
+        // user take some course of action -- bkgood
+        QString fd = QFileDialog::getExistingDirectory(
+            this, tr("Choose music library directory"),
+            QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+        if (fd != "") {
+            //adds Folder to database
+            emit(dirsChanged("added",fd));
+            hasChanged_MusicDir = true;
+        }
+    }
 
     // Call inits to invoke all other construction parts
 
@@ -414,6 +438,11 @@
     // Initialize preference dialog
     m_pPrefDlg = new DlgPreferences(this, m_pSkinLoader, m_pSoundManager, m_pPlayerManager,
                                     m_pControllerManager, m_pVCManager, m_pConfig);
+    connect(m_pPrefDlg, SIGNAL(configChanged(QString,QString)),
+            m_pLibrary, SIGNAL(configChanged(QString,QString)));
+    connect(m_pPrefDlg, SIGNAL(dirsChanged(QString,QString)),
+            m_pLibrary, SLOT(slotDirsChanged(QString,QString)));
+
     m_pPrefDlg->setWindowIcon(QIcon(":/images/ic_mixxx_window.png"));