Merge pull request #12 from kctekn/master

修正：unique Id 为空，和描述长度大于Windows最长文件名的情况
K12f · Dec 17, 2024 · befe0d4 · befe0d4
2 parents d359a91 + ae8ed85
commit befe0d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/BlueCatKoKo.Ui/Services/DouYinShortVideoService.cs b/src/BlueCatKoKo.Ui/Services/DouYinShortVideoService.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Net.Http;
 using System.Text.RegularExpressions;
+using System.Xml;
 using BlueCatKoKo.Ui.Constants;
 using BlueCatKoKo.Ui.Models;
 using Downloader;
@@ -108,7 +109,7 @@ public async Task<VideoModel> ExtractVideoDataAsync(string url)
                 Platform = ShortVideoPlatformEnum.DouYin,
                 VideoId = videoInfoData.AwemeId,
                 AuthorName = videoInfoData.Author.Nickname,
-                UniqueId = videoInfoData.Author.UniqueId,
+                UniqueId = videoInfoData.Author.UniqueId==""?videoInfoData.Author.ShortId:videoInfoData.Author.UniqueId,
                 AuthorAvatar = videoInfoData.Author.AvatarThumb.UrlList.First().ToString(),
                 Title = videoInfoData.Author.Signature,
                 Cover = videoInfoData.Video.Cover.UrlList.Last().ToString(),

diff --git a/src/BlueCatKoKo.Ui/ViewModels/Pages/HomeViewModel.cs b/src/BlueCatKoKo.Ui/ViewModels/Pages/HomeViewModel.cs
@@ -177,7 +177,8 @@ private async Task DownloadAll()
                 }
 
                 var filepath = _appConfig.Value.DownloadPath;
-                var filename = "#" + Data.AuthorName + "#" + Data.UniqueId + "# "+ Data.Desc + ".mp4";
+                var filename = "#" + Data.AuthorName + "#" + Data.UniqueId + "# " + Data.Desc;
+                filename = filename.Substring(0, Math.Min(250, ("#" + Data.AuthorName + "#" + Data.UniqueId + "# " + Data.Desc).Length))+".mp4";
 
                 var replaceFilename = filename.ReplaceInvalidCharacters();