Merge pull request #14 from kctekn/master

必要更新
K12f · Jan 16, 2025 · 20af65b · 20af65b
2 parents befe0d4 + 2e14323
commit 20af65b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/BlueCatKoKo.Ui/Models/VideoModel.cs b/src/BlueCatKoKo.Ui/Models/VideoModel.cs
@@ -57,4 +57,6 @@ public class VideoModel
 
     // 视频时长
     public string? Duration { get; set; }
+
+    public string? ShareId { get; set; }
 }
diff --git a/src/BlueCatKoKo.Ui/ViewModels/Pages/HomeViewModel.cs b/src/BlueCatKoKo.Ui/ViewModels/Pages/HomeViewModel.cs
@@ -111,6 +111,7 @@ private async Task Parse()
                 {
                     var downloadUrl = await _douYinShortVideoService.ExtractUrlAsync(DownloadUrlText);
                     Data = await _douYinShortVideoService.ExtractVideoDataAsync(downloadUrl);
+                    Data.ShareId = downloadUrl.Replace("https://v.douyin.com/", "").Replace("/", "");
                 }
                 else if (DownloadUrlText.Contains(ShortVideoPlatformEnum.KuaiShou.ToString().ToLower()))
                 {
@@ -145,7 +146,8 @@ private async Task Parse()
 
         [RelayCommand]
         private void PlayOrPauseVideo()
-        {
+        {
+            MediaPlayer.AspectRatio = null;
             if (!MediaPlayer.IsPlaying)
             {
                 MediaPlayer.Play();
@@ -177,11 +179,15 @@ private async Task DownloadAll()
                 }
 
                 var filepath = _appConfig.Value.DownloadPath;
-                var filename = "#" + Data.AuthorName + "#" + Data.UniqueId + "# " + Data.Desc;
-                filename = filename.Substring(0, Math.Min(250, ("#" + Data.AuthorName + "#" + Data.UniqueId + "# " + Data.Desc).Length))+".mp4";
+                var filename = "#" + Data.AuthorName + "#" + Data.UniqueId + "#" + Data.ShareId + "# " + Data.Desc;
+                filename = filename.Substring(0, Math.Min(200, (filename).Length))+".mp4";
 
                 var replaceFilename = filename.ReplaceInvalidCharacters();
 
+                if(File.Exists(filepath+replaceFilename) ){
+                    throw new ValidationException("文件已存在");
+                }
+
                 switch (Data.Platform)
                 {
                     case ShortVideoPlatformEnum.DouYin: