Merge pull request #2065 from daschuer/lp1821514

Purge issue fix: Lp1821514

Author: uklotzde

src/library/dao/trackdao.cpp

@@ -467,7 +467,9 @@ namespace {
     bool insertTrackLibrary(QSqlQuery* pTrackLibraryInsert, const Track& track, DbId trackLocationId, QDateTime trackDateAdded) {
         bindTrackLibraryValues(pTrackLibraryInsert, track);
 
-        DEBUG_ASSERT(track.getDateAdded().isNull());
+        if (!track.getDateAdded().isNull()) {
+            qDebug() << "insertTrackLibrary: Track was added" << "track.getDateAdded()" << "and purged";
+        }
         pTrackLibraryInsert->bindValue(":datetime_added", trackDateAdded);
 
         // Written only once upon insert
@@ -640,7 +642,7 @@ TrackPointer TrackDAO::addTracksAddFile(const QFileInfo& fileInfo, bool unremove
         qDebug() << "TrackDAO::addTracksAddFile:"
                 << "Track has already been added to the database"
                 << oldTrackId;
-        return TrackPointer();
+        return pTrack;
     }
     // Keep the GlobalTrackCache locked until the id of the Track
     // object is known and has been updated in the cache.
@@ -857,6 +859,7 @@ bool TrackDAO::onPurgingTracks(
 
     QStringList idList;
     for (const auto& trackId: trackIds) {
+        GlobalTrackCacheLocker().purgeTrackId(trackId);
         idList.append(trackId.toString());
     }
     QString idListJoined = idList.join(",");
@@ -905,12 +908,14 @@ bool TrackDAO::onPurgingTracks(
         }
     }
     {
-        // mark LibraryHash with needs_verification and invalidate the hash
+        // invalidate the hash in LibraryHash,
         // in case the file was not deleted to detect it on a rescan
+        // Note: -1 is used as return value for missing entries,
+        // needs_verification is a temporary coloumn used during the scan only.
         // TODO(XXX) delegate to libraryHashDAO
         FwdSqlQuery query(m_database, QString(
-                "UPDATE LibraryHashes SET needs_verification=1, "
-                "hash=-1 WHERE directory_path in (%1)").arg(
+                "UPDATE LibraryHashes SET "
+                "hash=-2 WHERE directory_path in (%1)").arg(
                         SqlStringFormatter::formatList(m_database, directories)));
         if (query.hasError() || !query.execPrepared()) {
             return false;

src/track/globaltrackcache.cpp

@@ -133,6 +133,11 @@ void GlobalTrackCacheLocker::relocateCachedTracks(
     m_pInstance->relocateTracks(pRelocator);
 }
 
+void GlobalTrackCacheLocker::purgeTrackId(const TrackId& trackId) {
+    DEBUG_ASSERT(m_pInstance);
+    return m_pInstance->purgeTrackId(trackId);
+}
+
 void GlobalTrackCacheLocker::deactivateCache() const {
     DEBUG_ASSERT(m_pInstance);
     m_pInstance->deactivate();
@@ -580,6 +585,17 @@ TrackRef GlobalTrackCache::initTrackId(
     return trackRefWithId;
 }
 
+void GlobalTrackCache::purgeTrackId(TrackId trackId) {
+    DEBUG_ASSERT(trackId.isValid());
+
+    const auto trackById(m_tracksById.find(trackId));
+    if (m_tracksById.end() != trackById) {
+        Track* track = trackById->second->getPlainPtr();
+        track->resetId();
+        m_tracksById.erase(trackById);
+    }
+}
+
 void GlobalTrackCache::evictAndSave(
         GlobalTrackCacheEntryPointer chacheEntryPtr) {
     DEBUG_ASSERT(chacheEntryPtr);

src/track/globaltrackcache.h

@@ -78,6 +78,8 @@ class GlobalTrackCacheLocker {
     void relocateCachedTracks(
             GlobalTrackCacheRelocator* /*nullable*/ pRelocator) const;
 
+    void purgeTrackId(const TrackId& trackId);
+
     // Enforces the eviction of all cached tracks including invocation
     // of the callback and disables the cache permanently.
     void deactivateCache() const;
@@ -216,6 +218,8 @@ private slots:
             TrackRef trackRef,
             TrackId trackId);
 
+    void purgeTrackId(TrackId trackId);
+
     bool evict(Track* plainPtr);
     bool isEvicted(Track* plainPtr) const;
 

src/track/track.cpp

@@ -698,6 +698,11 @@ void Track::initId(TrackId id) {
     // generated by the Database itself.
 }
 
+void Track::resetId() {
+    QMutexLocker lock(&m_qMutex);
+    m_record.setId(TrackId());
+}
+
 void Track::setURL(const QString& url) {
     QMutexLocker lock(&m_qMutex);
     if (compareAndSet(&m_record.refUrl(), url)) {

src/track/track.h

@@ -325,7 +325,11 @@ class Track : public QObject {
   private:
     // Set a unique identifier for the track. Only used by
     // GlobalTrackCacheResolver!
-    void initId(TrackId id); // write-once
+    void initId(TrackId id);
+    // Reset the unique identifier after purged from library
+    // which undos a previous add. Only used by
+    // GlobalTrackCacheResolver!
+    void resetId();
 
     void relocate(
             QFileInfo fileInfo,