Fix Folder has 'new' label if all videos are played

tmk907 · May 8, 2019 · 37dd9e2 · 37dd9e2
1 parent 85f0c11
commit 37dd9e2
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/VideoPlayerTrimmer/VideoPlayerTrimmer/Services/VideoLibrary.cs b/VideoPlayerTrimmer/VideoPlayerTrimmer/Services/VideoLibrary.cs
@@ -29,22 +29,27 @@ public async Task Refresh()
         {
             await libraryUpdater.UpdateAsync();
             var videos = await database.GetAsync<VideoFileTable>(e => e.VideoId, e => !e.IsDeleted);
-            folderItems.Clear();
             videoItems.Clear();
-            foreach(var directoryGroup in videos.GroupBy(e => e.Directory))
+            foreach(var video in videos)
+            {
+                videoItems.Add(video.ToVideoItem());
+            }
+            RefreshFolders();
+        }
+
+        private void RefreshFolders()
+        {
+            folderItems.Clear();
+            foreach(var group in videoItems.GroupBy(v => v.FolderPath))
             {
                 folderItems.Add(new FolderItem()
                 {
-                    AreNewVideos = directoryGroup.Any(e => e.IsNew),
-                    FolderName = Path.GetFileName(directoryGroup.Key),
-                    FolderPath = directoryGroup.Key,
-                    VideoCount = directoryGroup.Count()
+                    AreNewVideos = group.Any(e => e.IsNew),
+                    FolderName = Path.GetFileName(group.Key),
+                    FolderPath = group.Key,
+                    VideoCount = group.Count()
                 });
             }
-            foreach(var video in videos)
-            {
-                videoItems.Add(video.ToVideoItem());
-            }
         }
 
         public async Task<List<FolderItem>> GetFolderItemsAsync(bool forceUpdate = false)
@@ -53,6 +58,10 @@ public async Task<List<FolderItem>> GetFolderItemsAsync(bool forceUpdate = false
             {
                 await Refresh();
             }
+            else
+            {
+                RefreshFolders();
+            }
             return folderItems;
         }
 
@@ -63,7 +72,7 @@ public Task<VideoItem> GetVideoItemAsync(string filePath)
 
         public async Task<List<VideoItem>> GetVideoItemsAsync(string folderPath, bool forceUpdate = false)
         {
-            if (folderItems.Count == 0 || forceUpdate)
+            if (videoItems.Count == 0 || forceUpdate)
             {
                 await Refresh();
             }