Merge pull request #835 from ywmoyue/dev

4.7.4 fix
ywmoyue · Sep 30, 2024 · a8ed48e · a8ed48e
2 parents 99c5a9d + c3d75ce
commit a8ed48e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/BiliLite.UWP/Controls/Player.xaml.cs b/src/BiliLite.UWP/Controls/Player.xaml.cs
@@ -142,7 +142,7 @@ public double BufferCache
         }
 
         public static readonly DependencyProperty BufferCacheProperty =
-            DependencyProperty.Register("BufferCache", typeof(double), typeof(Player), new PropertyMetadata(1));
+            DependencyProperty.Register("BufferCache", typeof(double), typeof(Player), new PropertyMetadata(1d));
 
         /// <summary>
         /// 播放速度

diff --git a/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs b/src/BiliLite.UWP/Controls/PlayerControl.xaml.cs
@@ -1363,7 +1363,7 @@ private void SetSoundQuality()
             BottomSoundQuality.SelectionChanged -= BottomSoundQuality_SelectionChanged;
             BottomSoundQuality.SelectedItem = playUrlInfo.CurrentAudioQuality;
             BottomSoundQuality.SelectionChanged += BottomSoundQuality_SelectionChanged;
-            ChangeQuality(current_quality_info, playUrlInfo.CurrentAudioQuality).RunWithoutAwait();
+            // ChangeQuality(current_quality_info, playUrlInfo.CurrentAudioQuality).RunWithoutAwait();
         }
 
         private void SetQuality()
@@ -1584,7 +1584,6 @@ private async Task<PlayerOpenResult> ChangeQualityPlayVideo(BiliPlayUrlInfo qual
 
                     if (!result.result)
                     {
-
                         result = await Player.PlayerDashUseNative(quality.DashInfo, quality.UserAgent, quality.Referer, positon: _postion);
                     }
                 }

diff --git a/src/BiliLite.UWP/Pages/DownloadPage.xaml.cs b/src/BiliLite.UWP/Pages/DownloadPage.xaml.cs
@@ -179,6 +179,7 @@ private async void btnEpisodesDelete_Click(object sender, RoutedEventArgs e)
                 var folder = await StorageFolder.GetFolderFromPathAsync(item.FilePath);
                 await folder.DeleteAsync(StorageDeleteOption.PermanentDelete);
                 data.Epsidoes.Remove(item);
+                m_downloadService.RemoveDbSubItem(item.CID);
             }
             catch (Exception ex)
             {
@@ -238,6 +239,7 @@ private async void btnMenuDetele_Click(object sender, RoutedEventArgs e)
                 var folder = await StorageFolder.GetFolderFromPathAsync(data.Path);
                 await folder.DeleteAsync(StorageDeleteOption.PermanentDelete);
                 m_viewModel.DownloadedViewModels.Remove(data);
+                m_downloadService.RemoveDbItem(data.ID);
             }
             catch (Exception ex)
             {

diff --git a/src/BiliLite.UWP/Services/DownloadService.cs b/src/BiliLite.UWP/Services/DownloadService.cs
@@ -225,6 +225,7 @@ private async void DeleteItem(DownloadingItemViewModel data)
                 m_loadDownloadingCts[data.EpisodeID].Cancel();
                 var folder = await StorageFolder.GetFolderFromPathAsync(data.Path);
                 await folder.DeleteAsync(StorageDeleteOption.PermanentDelete);
+                RemoveDbSubItem(data.EpisodeID);
             }
             catch (Exception ex)
             {
@@ -270,6 +271,7 @@ private async void DeleteAll()
                     m_loadDownloadingCts[item.EpisodeID].Cancel();
                     var folder = await StorageFolder.GetFolderFromPathAsync(item.Path);
                     await folder.DeleteAsync(StorageDeleteOption.PermanentDelete);
+                    RemoveDbSubItem(item.EpisodeID);
                 }
                 catch (Exception ex)
                 {
@@ -396,6 +398,26 @@ public int CheckExist(string id, bool isSeason = false)
             return 0;
         }
 
+        public void RemoveDbItem(string id)
+        {
+            var entity = m_biliLiteDbContext.DownloadedItems
+                .Include(x => x.Epsidoes)
+                .FirstOrDefault(x => x.ID == id);
+            if (entity == null) return;
+            m_biliLiteDbContext.DownloadedSubItems.RemoveRange(entity.Epsidoes);
+            m_biliLiteDbContext.DownloadedItems.Remove(entity);
+            m_biliLiteDbContext.SaveChanges();
+        }
+
+        public void RemoveDbSubItem(string id)
+        {
+            var entity = m_biliLiteDbContext.DownloadedSubItems
+                .FirstOrDefault(x => x.CID == id);
+            if (entity == null) return;
+            m_biliLiteDbContext.DownloadedSubItems.Remove(entity);
+            m_biliLiteDbContext.SaveChanges();
+        }
+
         public void RefreshDownloaded()
         {
             if (m_downloadPageViewModel.LoadingDownloaded) return;