Change behaviour of scrobbler to clear sent scrobbles when successful…

… --- TODO handle batching
inflatablefriends · Aug 23, 2017 · 89ce093 · 89ce093
1 parent 2e5619e
commit 89ce093
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/src/IF.Lastfm.Core.Tests/Scrobblers/ScrobblerTestsBase.cs b/src/IF.Lastfm.Core.Tests/Scrobblers/ScrobblerTestsBase.cs
@@ -178,6 +178,9 @@ public async Task ScrobblesExistingCachedTracks()
             var scrobbleResponse2 = await ExecuteTestInternal(scrobblesToSend, responseMessage2, requestMessage2);
 
             Assert.IsTrue(scrobbleResponse2.Success);
+
+            var remainingCount = await Scrobbler.GetCachedCountAsync();
+            Assert.AreEqual(0, remainingCount);
         }
 
         [Test]

diff --git a/src/IF.Lastfm.Core/Scrobblers/Scrobbler.cs b/src/IF.Lastfm.Core/Scrobblers/Scrobbler.cs
@@ -20,6 +20,15 @@ public override Task<IEnumerable<Scrobble>> GetCachedAsync()
             return Task.FromResult(Enumerable.Empty<Scrobble>());
         }
 
+        public override async Task ClearCacheAsync()
+        {
+        }
+
+        public override Task<int> GetCachedCountAsync()
+        {
+            return Task.FromResult(0);
+        }
+
         protected override Task<LastResponseStatus> CacheAsync(IEnumerable<Scrobble> scrobble, LastResponseStatus originalResponseStatus)
         {
             return Task.FromResult(originalResponseStatus);

diff --git a/src/IF.Lastfm.Core/Scrobblers/ScrobblerBase.cs b/src/IF.Lastfm.Core/Scrobblers/ScrobblerBase.cs
@@ -77,6 +77,8 @@ public async Task<ScrobbleResponse> ScrobbleAsyncInternal(IEnumerable<Scrobble>
             if (!responses.Any() || responses.All(r => r.Success))
             {
                 scrobblerResponse = new ScrobbleResponse(LastResponseStatus.Successful);
+
+                await ClearCacheAsync();
             }
             else
             {
@@ -110,6 +112,10 @@ public async Task<ScrobbleResponse> ScrobbleAsyncInternal(IEnumerable<Scrobble>
 
         public abstract Task<IEnumerable<Scrobble>> GetCachedAsync();
 
+        public abstract Task ClearCacheAsync(); 
+
+        public abstract Task<int> GetCachedCountAsync();
+
         protected abstract Task<LastResponseStatus> CacheAsync(IEnumerable<Scrobble> scrobble, LastResponseStatus originalResponseStatus);
     }
 }
diff --git a/src/IF.Lastfm.SQLite.Tests.Integration/SQLiteScrobblerTests.cs b/src/IF.Lastfm.SQLite.Tests.Integration/SQLiteScrobblerTests.cs
@@ -12,7 +12,7 @@ public class SQLiteScrobblerTests : ScrobblerTestsBase
 
         public override void Initialise()
         {
-            var dbPath = Path.GetFullPath("test.db");
+            var dbPath = Path.GetFullPath($"test-{DateTime.UtcNow.ToFileTimeUtc()}.sqlite");
             File.Delete(dbPath);
             using (File.Create(dbPath))
             {
@@ -25,9 +25,9 @@ public override void Initialise()
 
         public override void Cleanup()
         {
-            GC.Collect();
-            GC.WaitForPendingFinalizers();
-            File.Delete(_dbPath);
+            //GC.Collect();
+            //GC.WaitForPendingFinalizers();
+            //File.Delete(_dbPath);
 
             base.Cleanup();
         }