fix: 修复下载时开启自动添加后缀文件夹不存在时闪退问题 Fixes: #78 #74

DownKyi/Services/Download/AddToDownloadService.cs

@@ -241,7 +241,8 @@ await dialogService.ShowDialogAsync(ViewDownloadSetterViewModel.Tag, null, resul
     /// <param name="directory">下载路径</param>
     /// <param name="isAll">是否下载所有，包括未选中项</param>
     /// <returns>添加的数量</returns>
-    public async Task<int> AddToDownload(IEventAggregator eventAggregator, IDialogService dialogService, string? directory, bool isAll = false)
+    public async Task<int> AddToDownload(IEventAggregator eventAggregator, IDialogService dialogService,
+        string? directory, bool isAll = false)
     {
         if (string.IsNullOrEmpty(directory))
         {
@@ -302,10 +303,12 @@ public async Task<int> AddToDownload(IEventAggregator eventAggregator, IDialogSe
                         continue;
                     }
 
-                    if (item.DownloadBase.Cid == page.Cid && item.Resolution.Id == page.VideoQuality.Quality && item.AudioCodec.Name == page.AudioQualityFormat &&
+                    if (item.DownloadBase.Cid == page.Cid && item.Resolution.Id == page.VideoQuality.Quality &&
+                        item.AudioCodec.Name == page.AudioQualityFormat &&
                         item.VideoCodecName == page.VideoQuality.SelectedVideoCodec)
                     {
-                        eventAggregator.GetEvent<MessageEvent>().Publish($"{page.Name}{DictionaryResource.GetString("TipAlreadyToAddDownloading")}");
+                        eventAggregator.GetEvent<MessageEvent>()
+                            .Publish($"{page.Name}{DictionaryResource.GetString("TipAlreadyToAddDownloading")}");
                         isDownloading = true;
                         break;
                     }
@@ -325,7 +328,8 @@ public async Task<int> AddToDownload(IEventAggregator eventAggregator, IDialogSe
                         continue;
                     }
 
-                    if (item.DownloadBase.Cid == page.Cid && item.Resolution.Id == page.VideoQuality.Quality && item.AudioCodec.Name == page.AudioQualityFormat &&
+                    if (item.DownloadBase.Cid == page.Cid && item.Resolution.Id == page.VideoQuality.Quality &&
+                        item.AudioCodec.Name == page.AudioQualityFormat &&
                         item.VideoCodecName == page.VideoQuality.SelectedVideoCodec)
                     {
                         // eventAggregator.GetEvent<MessageEvent>().Publish($"{page.Name}{DictionaryResource.GetString("TipAlreadyToAddDownloaded")}");
@@ -447,19 +451,22 @@ await dialogService.ShowDialogAsync(ViewAlreadyDownloadedDialogViewModel.Tag, pa
                     // 如果存在同名文件，自动重命名
                     // todo 如果重新下载呢。还没想好
                     var directoryName = Path.GetDirectoryName(filePath);
-                    var files = Directory.GetFiles(directoryName).Select(Path.GetFileNameWithoutExtension).Distinct().ToList();
-
-                    if (files.Contains(Path.GetFileNameWithoutExtension(filePath)))
+                    if (Directory.Exists(directoryName))
                     {
-                        var count = 1;
-                        var newFilePath = filePath;
-                        while (files.Contains(Path.GetFileNameWithoutExtension(newFilePath)))
+                        var files = Directory.GetFiles(directoryName).Select(Path.GetFileNameWithoutExtension).Distinct().ToList();
+
+                        if (files.Contains(Path.GetFileNameWithoutExtension(filePath)))
                         {
-                            newFilePath = Path.Combine(directory, $"{fileName.RelativePath()}({count})");
-                            count++;
-                        }
+                            var count = 1;
+                            var newFilePath = filePath;
+                            while (files.Contains(Path.GetFileNameWithoutExtension(newFilePath)))
+                            {
+                                newFilePath = Path.Combine(directory, $"{fileName.RelativePath()}({count})");
+                                count++;
+                            }
 
-                        filePath = newFilePath;
+                            filePath = newFilePath;
+                        }
                     }
                 }
 
@@ -518,7 +525,8 @@ await dialogService.ShowDialogAsync(ViewAlreadyDownloadedDialogViewModel.Tag, pa
                         Name = page.Name,
                         Duration = page.Duration,
                         VideoCodecName = page.VideoQuality.SelectedVideoCodec,
-                        Resolution = new Quality { Name = page.VideoQuality.QualityFormat, Id = page.VideoQuality.Quality },
+                        Resolution = new Quality
+                            { Name = page.VideoQuality.QualityFormat, Id = page.VideoQuality.Quality },
                         AudioCodec = Constant.GetAudioQualities().FirstOrDefault(t => { return t.Name == page.AudioQualityFormat; }),
                         Page = page.Page
                     };