Fix possible channels duplicates when importing multiple times

laurencee · Jul 3, 2016 · 29981e0 · 29981e0
1 parent bd3beea
commit 29981e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs
@@ -22,5 +22,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.5.1.0")]
+[assembly: AssemblyFileVersion("2.5.1.0")]
diff --git a/Livestream.Monitor/Model/Monitoring/MonitorStreamsModel.cs b/Livestream.Monitor/Model/Monitoring/MonitorStreamsModel.cs
@@ -129,10 +129,13 @@ public async Task ImportFollows(string username, IApiClient apiClient)
             var followedChannelsQueryResults = await apiClient.GetUserFollows(username);
             followedChannelsQueryResults.EnsureAllQuerySuccess();
 
-            var newChannels = followedChannelsQueryResults.Select(x => x.ChannelIdentifier).ToList();
-            Livestreams.AddRange(followedChannelsQueryResults.Select(x => x.LivestreamModel));
-            newChannels.ForEach(x => x.ApiClient.AddChannelWithoutQuerying(x));
-            AddChannels(newChannels.ToArray());
+            // Ignore duplicate channels
+            var newChannels = followedChannelsQueryResults.Where(x => !channelIdentifiers.Contains(x.ChannelIdentifier)).ToList();
+            if (newChannels.Count == 0) return;
+
+            Livestreams.AddRange(newChannels.Select(x => x.LivestreamModel));
+            newChannels.ForEach(x => x.ChannelIdentifier.ApiClient.AddChannelWithoutQuerying(x.ChannelIdentifier));
+            AddChannels(newChannels.Select(x => x.ChannelIdentifier).ToArray());
             await RefreshLivestreams();
         }