nanxun/douyin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
lijianyou
2025-10-10 13:04:29 +08:00
parent 0e826c3cfa
commit e4dedcad30
13 changed files with 86 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
job/DouYinFavoritSyncJob.cs
+18 -11
View File
@@ -51,17 +51,17 @@ namespace dy.net.job
foreach (var cookie in cookies)
{
Serilog.Log.Debug($"favorite-开始同步 Cookie-[{cookie.UserName}]喜欢的视频");
if (string.IsNullOrEmpty(cookie.Cookies)|| cookie.Cookies.Length<1000)
if (string.IsNullOrWhiteSpace(cookie.Cookies)|| cookie.Cookies.Length<1000)
{
Serilog.Log.Debug($"favorite-Cookie-[{cookie.UserName}]无效，跳过");
continue;
}
if(string.IsNullOrEmpty(cookie.FavSavePath))
if(string.IsNullOrWhiteSpace(cookie.FavSavePath))
{
Serilog.Log.Debug($"favorite-Cookie-[{cookie.UserName}]未设置保存路径，跳过");
continue;
}
if (string.IsNullOrEmpty(cookie.SecUserId)) {
if (string.IsNullOrWhiteSpace(cookie.SecUserId)|| cookie.SecUserId.Length<10) {
Serilog.Log.Debug($"favorite-Cookie-[{cookie.UserName}]未设置SecUserId，跳过");
continue;
}
@@ -82,7 +82,8 @@ namespace dy.net.job
Serilog.Log.Debug($"favorite-Cookie[{cookie.UserName}]获取喜欢的数据失败，请检查一下Cookie和sec_user_id");
break;
}
cursor = data != null && !string.IsNullOrEmpty(data.MaxCursor) ? data.MaxCursor : "0";
cursor = data != null && !string.IsNullOrWhiteSpace(data.MaxCursor) ? data.MaxCursor : "0";
if (data.AwemeList == null || !data.AwemeList.Any())
{
break;
@@ -102,7 +103,7 @@ namespace dy.net.job
if (v == null) continue;
var videoUrl = v.PlayAddr.UrlList != null && v.PlayAddr.UrlList.Any() ? v.PlayAddr.UrlList[0] : null;
if (string.IsNullOrEmpty(videoUrl)) continue;
if (string.IsNullOrWhiteSpace(videoUrl)) continue;
var tag1 = tags.FirstOrDefault(x => x.Level == 1)?.TagName;
var tag2 = tags.FirstOrDefault(x => x.Level == 2)?.TagName;
@@ -119,6 +120,8 @@ namespace dy.net.job
if (!File.Exists(savePath))
{
Serilog.Log.Debug($"favorite-视频[{SanitizePath(item.Desc)}]开始下载");
var downVideo = await _douyinService.DownloadAsync(videoUrl, savePath, cookie.Cookies);
Serilog.Log.Debug($"favorite-视频[{SanitizePath(item.Desc)}]下载{(downVideo ? "成功" : "失败")}");
if (downVideo)
@@ -197,7 +200,7 @@ namespace dy.net.job
// 收集所有需要删除的目录（去重）
foreach (var video in videos)
{
if (!string.IsNullOrEmpty(video.VideoSavePath) && Directory.Exists(video.VideoSavePath))
if (!string.IsNullOrWhiteSpace(video.VideoSavePath) && Directory.Exists(video.VideoSavePath))
{
var deletePath = Path.GetDirectoryName(video.VideoSavePath);
Directory.Delete(deletePath, recursive: true);
@@ -241,7 +244,7 @@ namespace dy.net.job
{
var coverUrl = item.Video.Cover.UrlList != null && item.Video.Cover.UrlList.Any()
? item.Video.Cover.UrlList[0] : null;
if (string.IsNullOrEmpty(coverUrl)) return;
if (string.IsNullOrWhiteSpace(coverUrl)) return;
var coverImgName = "poster.jpg";
var coverSavePath = Path.Combine(saveFolder, coverImgName);
@@ -273,11 +276,11 @@ namespace dy.net.job
var avatarUrl = item.Author.AvatarLarger?.UrlList != null && item.Author.AvatarLarger.UrlList.Any()
? item.Author.AvatarLarger.UrlList[0] : null;
if (string.IsNullOrEmpty(avatarUrl)) {
if (string.IsNullOrWhiteSpace(avatarUrl)) {
avatarUrl = item.Author.AvatarThumb?.UrlList != null && item.Author.AvatarThumb.UrlList.Any()
? item.Author.AvatarThumb.UrlList[0] : null;
}
if (string.IsNullOrEmpty(avatarUrl)) return;
if (string.IsNullOrWhiteSpace(avatarUrl)) return;
var path = Path.Combine(mainPath, "author");
if (!Directory.Exists(path))
{
@@ -302,10 +305,10 @@ namespace dy.net.job
private static string CreateSaveFolder(DyUserCookies cookie, Aweme item, string? tag1, string? tag2)
{
// 路径中避免特殊字符，用ID替代描述
var safeTag1 = string.IsNullOrEmpty(tag1) ? "other" : SanitizePath(tag1);
var safeTag1 = string.IsNullOrWhiteSpace(tag1) ? "other" : SanitizePath(tag1);
List<string> pathParts = new List<string> { cookie.FavSavePath, safeTag1 };
return Path.Combine(pathParts[0], string.Join("-", pathParts.Skip(1)), SanitizePath(item.Desc) + "@" + item.AwemeId);
//if (string.IsNullOrEmpty(tag2))
//if (string.IsNullOrWhiteSpace(tag2))
// return Path.Combine(pathParts[0], string.Join("-", pathParts.Skip(1)), SanitizePath(item.Desc) + "@" + item.AwemeId);
//else
// return Path.Combine(pathParts[0], string.Join("-", pathParts.Skip(1)), tag2 + "@" + item.AwemeId);
@@ -314,6 +317,10 @@ namespace dy.net.job
// 清理路径中的特殊字符（避免创建文件夹失败）
private static string SanitizePath(string path)
{
if (string.IsNullOrWhiteSpace(path))
{
path = "其他";
}
foreach (var c in Path.GetInvalidFileNameChars())
{
path = path.Replace(c, '_');