Add new functions resolveTrackIdsFromUrls() and resolveTrackIdsFromLo…

…cations() to remove duplicates

src/library/analysisfeature.cpp

@@ -193,11 +193,8 @@ void AnalysisFeature::cleanupAnalyzer() {
 }
 
 bool AnalysisFeature::dropAccept(QList<QUrl> urls, QObject* pSource) {
-    Q_UNUSED(pSource);
-    QList<QFileInfo> files = DragAndDropHelper::supportedTracksFromUrls(urls, false, true);
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(files,
-            TrackDAO::ResolveTrackIdOption::UnhideHidden
-                    | TrackDAO::ResolveTrackIdOption::AddMissing);
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromUrls(urls,
+            !pSource);
     analyzeTracks(trackIds);
     return trackIds.size() > 0;
 }

src/library/autodj/autodjfeature.cpp

@@ -138,21 +138,13 @@ void AutoDJFeature::activate() {
 }
 
 bool AutoDJFeature::dropAccept(QList<QUrl> urls, QObject* pSource) {
-    QList<QFileInfo> files = DragAndDropHelper::supportedTracksFromUrls(urls, false, true);
-    if (!files.size()) {
-        return false;
-    }
-
     // If a track is dropped onto the Auto DJ tree node, but the track isn't in the
     // library, then add the track to the library before adding it to the
     // Auto DJ playlist.
     // pSource != nullptr it is a drop from inside Mixxx and indicates all
     // tracks already in the DB
-    TrackDAO::ResolveTrackIdOptions options = TrackDAO::ResolveTrackIdOption::UnhideHidden;
-    if (pSource == nullptr) {
-        options |= TrackDAO::ResolveTrackIdOption::AddMissing;
-    }
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(files, options);
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromUrls(urls,
+            !pSource);
     if (!trackIds.size()) {
         return false;
     }

src/library/crate/cratefeature.cpp

@@ -203,21 +203,13 @@ bool CrateFeature::dropAcceptChild(const QModelIndex& index, QList<QUrl> urls,
     VERIFY_OR_DEBUG_ASSERT(crateId.isValid()) {
         return false;
     }
-    QList<QFileInfo> files = DragAndDropHelper::supportedTracksFromUrls(urls, false, true);
-    if (!files.size()) {
-        return false;
-    }
-
     // If a track is dropped onto a crate's name, but the track isn't in the
     // library, then add the track to the library before adding it to the
     // playlist.
     // pSource != nullptr it is a drop from inside Mixxx and indicates all
     // tracks already in the DB
-    TrackDAO::ResolveTrackIdOptions options = TrackDAO::ResolveTrackIdOption::UnhideHidden;
-    if (pSource == nullptr) {
-        options |= TrackDAO::ResolveTrackIdOption::AddMissing;
-    }
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(files, options);
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromUrls(urls,
+            !pSource);
     if (!trackIds.size()) {
         return false;
     }

src/library/crate/cratetablemodel.cpp

@@ -146,15 +146,8 @@ int CrateTableModel::addTracks(const QModelIndex& index,
     Q_UNUSED(index);
     // 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 crate.
-    QList<QFileInfo> fileInfoList;
-    foreach(QString fileLocation, locations) {
-        QFileInfo fileInfo(fileLocation);
-        fileInfoList.append(fileInfo);
-    }
-
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(fileInfoList,
-            TrackDAO::ResolveTrackIdOption::UnhideHidden
-                    | TrackDAO::ResolveTrackIdOption::AddMissing);
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromLocations(
+            locations);
     if (m_pTrackCollection->addCrateTracks(m_selectedCrate, trackIds)) {
         select();
         return trackIds.size();

src/library/librarytablemodel.cpp

@@ -61,13 +61,8 @@ void LibraryTableModel::setTableModel(int id) {
 int LibraryTableModel::addTracks(const QModelIndex& index,
                                  const QList<QString>& locations) {
     Q_UNUSED(index);
-    QList<QFileInfo> fileInfoList;
-    foreach (QString fileLocation, locations) {
-        fileInfoList.append(QFileInfo(fileLocation));
-    }
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(fileInfoList,
-            TrackDAO::ResolveTrackIdOption::UnhideHidden
-                    | TrackDAO::ResolveTrackIdOption::AddMissing);
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromLocations(
+            locations);
     select();
     return trackIds.size();
 }

src/library/mixxxlibraryfeature.cpp

@@ -181,10 +181,8 @@ bool MixxxLibraryFeature::dropAccept(QList<QUrl> urls, QObject* pSource) {
     if (pSource) {
         return false;
     } else {
-        QList<QFileInfo> files = DragAndDropHelper::supportedTracksFromUrls(urls, false, true);
-        QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(files,
-                TrackDAO::ResolveTrackIdOption::UnhideHidden
-                        | TrackDAO::ResolveTrackIdOption::AddMissing);
+        QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromUrls(
+                urls, true);
         return trackIds.size() > 0;
     }
 }

src/library/playlistfeature.cpp

@@ -106,22 +106,13 @@ bool PlaylistFeature::dropAcceptChild(const QModelIndex& index, QList<QUrl> urls
     VERIFY_OR_DEBUG_ASSERT(playlistId >= 0) {
         return false;
     }
-
-    QList<QFileInfo> files = DragAndDropHelper::supportedTracksFromUrls(urls, false, true);
-    if (!files.size()) {
-        return false;
-    }
-
     // If a track is dropped onto a playlist's name, but the track isn't in the
     // library, then add the track to the library before adding it to the
     // playlist.
     // pSource != nullptr it is a drop from inside Mixxx and indicates all
     // tracks already in the DB
-    TrackDAO::ResolveTrackIdOptions options = TrackDAO::ResolveTrackIdOption::UnhideHidden;
-    if (pSource == nullptr) {
-        options |= TrackDAO::ResolveTrackIdOption::AddMissing;
-    }
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(files, options);
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromUrls(urls,
+            !pSource);
     if (!trackIds.size()) {
         return false;
     }

src/library/playlisttablemodel.cpp

@@ -78,6 +78,9 @@ int PlaylistTableModel::addTracks(const QModelIndex& index,
         return 0;
     }
 
+    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIdsFromLocations(
+            locations);
+
     const int positionColumn = fieldIndex(ColumnCache::COLUMN_PLAYLISTTRACKSTABLE_POSITION);
     int position = index.sibling(index.row(), positionColumn).data().toInt();
 
@@ -86,16 +89,6 @@ int PlaylistTableModel::addTracks(const QModelIndex& index,
         position = rowCount() + 1;
     }
 
-    QList<QFileInfo> fileInfoList;
-    foreach (QString fileLocation, locations) {
-        QFileInfo fileInfo(fileLocation);
-        fileInfoList.append(fileInfo);
-    }
-
-    QList<TrackId> trackIds = m_pTrackCollection->resolveTrackIds(fileInfoList,
-            TrackDAO::ResolveTrackIdOption::UnhideHidden
-                    | TrackDAO::ResolveTrackIdOption::AddMissing);
-
     int tracksAdded = m_pTrackCollection->getPlaylistDAO().insertTracksIntoPlaylist(
             trackIds, m_iPlaylistId, position);
 

src/library/trackcollection.cpp

@@ -9,6 +9,7 @@
 #include "util/db/sqltransaction.h"
 
 #include "util/assert.h"
+#include "util/dnd.h"
 
 
 namespace {
@@ -96,6 +97,36 @@ QList<TrackId> TrackCollection::resolveTrackIds(
     return trackIds;
 }
 
+QList<TrackId> TrackCollection::resolveTrackIdsFromUrls(
+        const QList<QUrl>& urls, bool addMissing) {
+    QList<QFileInfo> files = DragAndDropHelper::supportedTracksFromUrls(urls, false, true);
+    if (!files.size()) {
+        return QList<TrackId>();
+    }
+
+    TrackDAO::ResolveTrackIdOptions options =
+            TrackDAO::ResolveTrackIdOption::UnhideHidden;
+    if (addMissing) {
+        options |= TrackDAO::ResolveTrackIdOption::AddMissing;
+    }
+    return resolveTrackIds(files, options);
+}
+
+QList<TrackId> TrackCollection::resolveTrackIdsFromLocations(
+        const QList<QString>& locations) {
+    QList<QFileInfo> fileInfoList;
+    foreach(QString fileLocation, locations) {
+        QFileInfo fileInfo(fileLocation);
+        fileInfoList.append(fileInfo);
+    }
+    return resolveTrackIds(fileInfoList,
+            TrackDAO::ResolveTrackIdOption::UnhideHidden
+                    | TrackDAO::ResolveTrackIdOption::AddMissing);
+}
+
+QList<TrackId> resolveTrackIdsFromUrls(const QList<QUrl>& urls,
+        TrackDAO::ResolveTrackIdOptions options);
+
 bool TrackCollection::hideTracks(const QList<TrackId>& trackIds) {
     DEBUG_ASSERT(QApplication::instance()->thread() == QThread::currentThread());
 

src/library/trackcollection.h

@@ -68,7 +68,12 @@ class TrackCollection : public QObject,
 
     // This function returns a track ID of all file in the list not already visible,
     // it adds and unhides the tracks as well.
-    QList<TrackId> resolveTrackIds(const QList<QFileInfo>& files, TrackDAO::ResolveTrackIdOptions options);
+    QList<TrackId> resolveTrackIds(const QList<QFileInfo> &files,
+            TrackDAO::ResolveTrackIdOptions options);
+    QList<TrackId> resolveTrackIdsFromUrls(const QList<QUrl>& urls,
+            bool addMissing);
+    QList<TrackId> resolveTrackIdsFromLocations(
+            const QList<QString>& locations);
 
     bool hideTracks(const QList<TrackId>& trackIds);
     bool unhideTracks(const QList<TrackId>& trackIds);