renun/downkyicore
1
0
Fork 0
mirror of https://github.com/yaobiao131/downkyicore.git synced 2025-08-10 00:52:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 添加使用WebPage方式解析解决风控问题(仅限普通视频，番剧、课程未实现) #37 #36

Browse Source
This commit is contained in:
姚彪
2024-03-04 23:43:29 +08:00
parent 38ed21993f
commit 602e29ce8d
12 changed files with 361 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DownKyi.Core/BiliApi/BiliUtils/VideoParseType.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace DownKyi.Core.BiliApi.BiliUtils;
public class VideoParseType
{
public string? Name { get; set; }
public int? Id { get; set; }
}

78
DownKyi.Core/BiliApi/VideoStream/VideoStream.cs
View File

@@ -1,4 +1,5 @@
using DownKyi.Core.BiliApi.Models.Json;
using System.Text.RegularExpressions;
using DownKyi.Core.BiliApi.Models.Json;
using DownKyi.Core.BiliApi.Sign;
using DownKyi.Core.BiliApi.VideoStream.Models;
using DownKyi.Core.Logging;
@@ -128,12 +129,34 @@ public static class VideoStream
return null;
}
string query = WbiSign.ParametersToQuery(WbiSign.EncodeWbi(parameters));
string url = $"https://api.bilibili.com/x/player/wbi/playurl?{query}";
var query = WbiSign.ParametersToQuery(WbiSign.EncodeWbi(parameters));
var url = $"https://api.bilibili.com/x/player/wbi/playurl?{query}";
return GetPlayUrl(url);
}
/// <summary>
/// 获取普通视频的视频流（WebPage方式）
/// </summary>
/// <param name="avid"></param>
/// <param name="bvid"></param>
/// <param name="p"></param>
/// <returns></returns>
public static PlayUrl GetVideoPlayUrlWebPage(long avid, string bvid, int p)
{
var url = "https://www.bilibili.com/video";
if (bvid == string.Empty)
{
url = $"{url}/{bvid}/?p={p}";
}
else if (avid > -1)
{
url = $"{url}/av{avid}/?p={p}";
}
return GetPlayUrlWebPage(url);
}
/// <summary>
/// 获取番剧的视频流
/// </summary>
@@ -205,8 +228,8 @@ public static class VideoStream
/// <returns></returns>
private static PlayUrl GetPlayUrl(string url)
{
string referer = "https://m.bilibili.com";
string response = WebClient.RequestWeb(url, referer);
const string referer = "https://m.bilibili.com";
var response = WebClient.RequestWeb(url, referer);
try
{
@@ -235,4 +258,49 @@ public static class VideoStream
return null;
}
}
/// <summary>
/// 获取视频流（WebPage方式）
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
private static PlayUrl GetPlayUrlWebPage(string url)
{
const string referer = "https://www.bilibili.com";
var response = WebClient.RequestWeb(url, referer);
try
{
var regex = new Regex(@"<script>window\.__playinfo__=(.*?)<\/script>");
var m = regex.Match(response);
PlayUrlOrigin? playUrl = null;
if (m.Success)
{
playUrl = JsonConvert.DeserializeObject<PlayUrlOrigin>(m.Groups[1].ToString());
}
if (playUrl == null)
{
return null;
}
else if (playUrl.Data != null)
{
return playUrl.Data;
}
else if (playUrl.Result != null)
{
return playUrl.Result;
}
else
{
return null;
}
}
catch (Exception e)
{
Console.PrintLine("GetPlayUrlPc()发生异常: {0}", e);
LogManager.Error("GetPlayUrlPc()", e);
return null;
}
}
}

1
DownKyi.Core/Settings/Models/VideoSettings.cs
View File

@@ -10,6 +10,7 @@ public class VideoSettings
public int VideoCodecs { get; set; } = -1; // AVC or HEVC
public int Quality { get; set; } = -1; // 画质
public int AudioQuality { get; set; } = -1; // 音质
public int VideoParseType { get; set; } = 1; // 视频解析类型
public AllowStatus IsTranscodingFlvToMp4 { get; set; } = AllowStatus.NONE; // 是否将flv转为mp4
public string SaveVideoRootPath { get; set; } = null; // 视频保存路径
public List<string> HistoryVideoRootPaths { get; set; } = null; // 历史视频保存路径

31
DownKyi.Core/Settings/SettingsManager.Video.cs
View File

@@ -14,6 +14,9 @@ public partial class SettingsManager
// 设置优先下载音质
private readonly int audioQuality = 30280;
// 设置首选视频解析方式
private const int VideoParseType = 1;
// 是否下载flv视频后转码为mp4
private readonly AllowStatus isTranscodingFlvToMp4 = AllowStatus.YES;
@@ -135,6 +138,34 @@ public partial class SettingsManager
appSettings.Video.AudioQuality = quality;
return SetSettings();
}
/// <summary>
/// 获取首选视频解析方式
/// </summary>
/// <returns></returns>
public int GetVideoParseType()
{
appSettings = GetSettings();
if (appSettings.Video.VideoParseType == null)
{
// 第一次获取，先设置默认值
SetVideoParseType(VideoParseType);
return VideoParseType;
}
return appSettings.Video.VideoParseType;
}
/// <summary>
/// 设置首选视频解析方式
/// </summary>
/// <param name="videoParseType"></param>
/// <returns></returns>
public bool SetVideoParseType(int videoParseType)
{
appSettings.Video.VideoParseType = videoParseType;
return SetSettings();
}
/// <summary>
/// 获取是否下载flv视频后转码为mp4

1
DownKyi/Languanges/Default.axaml
View File

@@ -211,6 +211,7 @@
<system:String x:Key="FirstVideoCodecs">优先下载的视频编码：</system:String>
<system:String x:Key="FirstVideoQuality">优先下载的视频画质：</system:String>
<system:String x:Key="FirstAudioQuality">优先下载的视频音质：</system:String>
<system:String x:Key="VideoParseType">首选视频解析方式：</system:String>
<system:String x:Key="IsTranscodingFlvToMp4">下载FLV视频后转码为mp4</system:String>
<system:String x:Key="IsUseDefaultDirectory">使用默认下载目录</system:String>
<system:String x:Key="DefaultDirectory">默认下载目录：</system:String>

3
DownKyi/Models/DownloadBase.cs
View File

@@ -70,4 +70,7 @@ public class DownloadBase
// 文件大小
public string FileSize { get; set; }
// 视频分p(默认为1)
public int Page { get; set; } = 1;
}

3
DownKyi/Services/Download/AddToDownloadService.cs
View File

@@ -522,7 +522,8 @@ public class AddToDownloadService
Duration = page.Duration,
VideoCodecName = page.VideoQuality.SelectedVideoCodec,
Resolution = new Quality { Name = page.VideoQuality.QualityFormat, Id = page.VideoQuality.Quality },
AudioCodec = Constant.GetAudioQualities().FirstOrDefault(t => { return t.Name == page.AudioQualityFormat; })
AudioCodec = Constant.GetAudioQualities().FirstOrDefault(t => { return t.Name == page.AudioQualityFormat; }),
Page = page.Page
};
var downloading = new Downloading
{

8
DownKyi/Services/Download/DownloadService.cs
View File

@@ -358,8 +358,12 @@ public abstract class DownloadService
switch (downloading.Downloading.PlayStreamType)
{
case PlayStreamType.VIDEO:
downloading.PlayUrl = VideoStream.GetVideoPlayUrl(downloading.DownloadBase.Avid,
downloading.DownloadBase.Bvid, downloading.DownloadBase.Cid);
downloading.PlayUrl = SettingsManager.GetInstance().GetVideoParseType() switch
{
0 => VideoStream.GetVideoPlayUrl(downloading.DownloadBase.Avid, downloading.DownloadBase.Bvid, downloading.DownloadBase.Cid),
1 => VideoStream.GetVideoPlayUrlWebPage(downloading.DownloadBase.Avid, downloading.DownloadBase.Bvid, downloading.DownloadBase.Page),
_ => null
};
break;
case PlayStreamType.BANGUMI:
downloading.PlayUrl = VideoStream.GetBangumiPlayUrl(downloading.DownloadBase.Avid,

15
DownKyi/Services/VideoInfoService.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using Avalonia.Media.Imaging;
using Avalonia.Threading;
using DownKyi.Core.BiliApi.BiliUtils;
@@ -97,7 +98,8 @@ public class VideoInfoService : IInfoService
FirstFrame = page.FirstFrame,
Order = order,
Name = name,
Duration = "N/A"
Duration = "N/A",
Page = page.Page
};
// UP主信息
@@ -185,7 +187,8 @@ public class VideoInfoService : IInfoService
Name = episode.Title,
Duration = "N/A",
// UP主信息
Owner = _videoView.Owner
Owner = _videoView.Owner,
Page = episode.Page.Page
};
if (page.Owner == null)
@@ -232,7 +235,13 @@ public class VideoInfoService : IInfoService
/// <param name="page"></param>
public void GetVideoStream(VideoPage page)
{
var playUrl = VideoStream.GetVideoPlayUrl(page.Avid, page.Bvid, page.Cid);
var playUrl = SettingsManager.GetInstance().GetVideoParseType() switch
{
0 => VideoStream.GetVideoPlayUrl(page.Avid, page.Bvid, page.Cid),
1 => VideoStream.GetVideoPlayUrlWebPage(page.Avid, page.Bvid, page.Page),
_ => null
};
Dispatcher.UIThread.Invoke(() => { Utils.VideoPageInfo(playUrl, page); });
}

2
DownKyi/ViewModels/PageViewModels/VideoPage.cs
View File

@@ -25,6 +25,8 @@ public class VideoPage : BindableBase
public string FirstFrame { get; set; }
public int Page { get; set; }
private bool isSelected;
public bool IsSelected

423
DownKyi/ViewModels/Settings/ViewVideoViewModel.cs
View File

@@ -48,156 +48,172 @@ public class ViewVideoViewModel : ViewModelBase
set => SetProperty(ref videoQualityList, value);
}
private Quality selectedVideoQuality;
private Quality _selectedVideoQuality;
public Quality SelectedVideoQuality
{
get => selectedVideoQuality;
set => SetProperty(ref selectedVideoQuality, value);
get => _selectedVideoQuality;
set => SetProperty(ref _selectedVideoQuality, value);
}
private List<Quality> audioQualityList;
private List<Quality> _audioQualityList;
public List<Quality> AudioQualityList
{
get => audioQualityList;
set => SetProperty(ref audioQualityList, value);
get => _audioQualityList;
set => SetProperty(ref _audioQualityList, value);
}
private Quality selectedAudioQuality;
private Quality _selectedAudioQuality;
public Quality SelectedAudioQuality
{
get => selectedAudioQuality;
set => SetProperty(ref selectedAudioQuality, value);
get => _selectedAudioQuality;
set => SetProperty(ref _selectedAudioQuality, value);
}
private bool isTranscodingFlvToMp4;
private List<VideoParseType> _videoParseTypeList;
public List<VideoParseType> VideoParseTypeList
{
get => _videoParseTypeList;
set => SetProperty(ref _videoParseTypeList, value);
}
private VideoParseType _selectedVideoParseType;
public VideoParseType SelectedVideoParseType
{
get => _selectedVideoParseType;
set => SetProperty(ref _selectedVideoParseType, value);
}
private bool _isTranscodingFlvToMp4;
public bool IsTranscodingFlvToMp4
{
get => isTranscodingFlvToMp4;
set => SetProperty(ref isTranscodingFlvToMp4, value);
get => _isTranscodingFlvToMp4;
set => SetProperty(ref _isTranscodingFlvToMp4, value);
}
private bool isUseDefaultDirectory;
private bool _isUseDefaultDirectory;
public bool IsUseDefaultDirectory
{
get => isUseDefaultDirectory;
set => SetProperty(ref isUseDefaultDirectory, value);
get => _isUseDefaultDirectory;
set => SetProperty(ref _isUseDefaultDirectory, value);
}
private string saveVideoDirectory;
private string _saveVideoDirectory;
public string SaveVideoDirectory
{
get => saveVideoDirectory;
set => SetProperty(ref saveVideoDirectory, value);
get => _saveVideoDirectory;
set => SetProperty(ref _saveVideoDirectory, value);
}
private bool downloadAll;
private bool _downloadAll;
public bool DownloadAll
{
get { return downloadAll; }
set { SetProperty(ref downloadAll, value); }
get => _downloadAll;
set => SetProperty(ref _downloadAll, value);
}
private bool downloadAudio;
private bool _downloadAudio;
public bool DownloadAudio
{
get { return downloadAudio; }
set { SetProperty(ref downloadAudio, value); }
get => _downloadAudio;
set => SetProperty(ref _downloadAudio, value);
}
private bool downloadVideo;
private bool _downloadVideo;
public bool DownloadVideo
{
get { return downloadVideo; }
set { SetProperty(ref downloadVideo, value); }
get => _downloadVideo;
set => SetProperty(ref _downloadVideo, value);
}
private bool downloadDanmaku;
private bool _downloadDanmaku;
public bool DownloadDanmaku
{
get { return downloadDanmaku; }
set { SetProperty(ref downloadDanmaku, value); }
get => _downloadDanmaku;
set => SetProperty(ref _downloadDanmaku, value);
}
private bool downloadSubtitle;
private bool _downloadSubtitle;
public bool DownloadSubtitle
{
get { return downloadSubtitle; }
set { SetProperty(ref downloadSubtitle, value); }
get => _downloadSubtitle;
set => SetProperty(ref _downloadSubtitle, value);
}
private bool downloadCover;
private bool _downloadCover;
public bool DownloadCover
{
get { return downloadCover; }
set { SetProperty(ref downloadCover, value); }
get => _downloadCover;
set => SetProperty(ref _downloadCover, value);
}
private ObservableCollection<DisplayFileNamePart> selectedFileName;
private ObservableCollection<DisplayFileNamePart> _selectedFileName;
public ObservableCollection<DisplayFileNamePart> SelectedFileName
{
get => selectedFileName;
set => SetProperty(ref selectedFileName, value);
get => _selectedFileName;
set => SetProperty(ref _selectedFileName, value);
}
private ObservableCollection<DisplayFileNamePart> optionalFields;
private ObservableCollection<DisplayFileNamePart> _optionalFields;
public ObservableCollection<DisplayFileNamePart> OptionalFields
{
get => optionalFields;
set => SetProperty(ref optionalFields, value);
get => _optionalFields;
set => SetProperty(ref _optionalFields, value);
}
private int selectedOptionalField;
private int _selectedOptionalField;
public int SelectedOptionalField
{
get => selectedOptionalField;
set => SetProperty(ref selectedOptionalField, value);
get => _selectedOptionalField;
set => SetProperty(ref _selectedOptionalField, value);
}
private List<string> fileNamePartTimeFormatList;
private List<string> _fileNamePartTimeFormatList;
public List<string> FileNamePartTimeFormatList
{
get => fileNamePartTimeFormatList;
set => SetProperty(ref fileNamePartTimeFormatList, value);
get => _fileNamePartTimeFormatList;
set => SetProperty(ref _fileNamePartTimeFormatList, value);
}
private string selectedFileNamePartTimeFormat;
private string _selectedFileNamePartTimeFormat;
public string SelectedFileNamePartTimeFormat
{
get => selectedFileNamePartTimeFormat;
set => SetProperty(ref selectedFileNamePartTimeFormat, value);
get => _selectedFileNamePartTimeFormat;
set => SetProperty(ref _selectedFileNamePartTimeFormat, value);
}
private List<OrderFormatDisplay> orderFormatList;
private List<OrderFormatDisplay> _orderFormatList;
public List<OrderFormatDisplay> OrderFormatList
{
get => orderFormatList;
set => SetProperty(ref orderFormatList, value);
get => _orderFormatList;
set => SetProperty(ref _orderFormatList, value);
}
private OrderFormatDisplay orderFormatDisplay;
private OrderFormatDisplay _orderFormatDisplay;
public OrderFormatDisplay OrderFormatDisplay
{
get => orderFormatDisplay;
set => SetProperty(ref orderFormatDisplay, value);
get => _orderFormatDisplay;
set => SetProperty(ref _orderFormatDisplay, value);
}
#endregion
@@ -220,29 +236,32 @@ public class ViewVideoViewModel : ViewModelBase
// 优先下载音质
AudioQualityList = Constant.GetAudioQualities();
//AudioQualityList.RemoveAt(3);
AudioQualityList[3].Id = AudioQualityList[3].Id + 1000;
AudioQualityList[4].Id = AudioQualityList[4].Id + 1000;
AudioQualityList[3].Id += 1000;
AudioQualityList[4].Id += 1000;
// 首选视频解析方式
VideoParseTypeList = new List<VideoParseType>
{
new() { Name = "API(解析快、易风控)", Id = 0 },
new() { Name = "WebPage(解析慢、不易风控)", Id = 1 },
};
// 文件命名格式
SelectedFileName = new ObservableCollection<DisplayFileNamePart>();
SelectedFileName.CollectionChanged += new NotifyCollectionChangedEventHandler((sender, e) =>
SelectedFileName.CollectionChanged += (sender, e) =>
{
// 当前显示的命名格式part
List<FileNamePart> fileName = new List<FileNamePart>();
foreach (DisplayFileNamePart item in SelectedFileName)
{
fileName.Add(item.Id);
}
var fileName = SelectedFileName.Select(item => item.Id).ToList();
bool isSucceed = SettingsManager.GetInstance().SetFileNameParts(fileName);
var isSucceed = SettingsManager.GetInstance().SetFileNameParts(fileName);
PublishTip(isSucceed);
});
};
OptionalFields = new ObservableCollection<DisplayFileNamePart>();
foreach (FileNamePart item in Enum.GetValues(typeof(FileNamePart)))
{
string display = DisplayFileNamePart(item);
var display = DisplayFileNamePart(item);
OptionalFields.Add(new DisplayFileNamePart { Id = item, Title = display });
}
@@ -279,31 +298,35 @@ public class ViewVideoViewModel : ViewModelBase
isOnNavigatedTo = true;
// 优先下载的视频编码
int videoCodecs = SettingsManager.GetInstance().GetVideoCodecs();
var videoCodecs = SettingsManager.GetInstance().GetVideoCodecs();
//SelectedVideoCodec = GetVideoCodecsString(videoCodecs);
SelectedVideoCodec = VideoCodecs.FirstOrDefault(t => { return t.Id == videoCodecs; });
// 优先下载画质
int quality = SettingsManager.GetInstance().GetQuality();
SelectedVideoQuality = VideoQualityList.FirstOrDefault(t => { return t.Id == quality; });
var quality = SettingsManager.GetInstance().GetQuality();
SelectedVideoQuality = VideoQualityList.FirstOrDefault(t => t.Id == quality);
// 优先下载音质
int audioQuality = SettingsManager.GetInstance().GetAudioQuality();
SelectedAudioQuality = AudioQualityList.FirstOrDefault(t => { return t.Id == audioQuality; });
var audioQuality = SettingsManager.GetInstance().GetAudioQuality();
SelectedAudioQuality = AudioQualityList.FirstOrDefault(t => t.Id == audioQuality);
// 首选视频解析方式
var videoParseType = SettingsManager.GetInstance().GetVideoParseType();
SelectedVideoParseType = VideoParseTypeList.FirstOrDefault(t => t.Id == videoParseType);
// 是否下载flv视频后转码为mp4
AllowStatus isTranscodingFlvToMp4 = SettingsManager.GetInstance().IsTranscodingFlvToMp4();
var isTranscodingFlvToMp4 = SettingsManager.GetInstance().IsTranscodingFlvToMp4();
IsTranscodingFlvToMp4 = isTranscodingFlvToMp4 == AllowStatus.YES;
// 是否使用默认下载目录
AllowStatus isUseSaveVideoRootPath = SettingsManager.GetInstance().IsUseSaveVideoRootPath();
var isUseSaveVideoRootPath = SettingsManager.GetInstance().IsUseSaveVideoRootPath();
IsUseDefaultDirectory = isUseSaveVideoRootPath == AllowStatus.YES;
// 默认下载目录
SaveVideoDirectory = SettingsManager.GetInstance().GetSaveVideoRootPath();
// 下载内容
VideoContentSettings videoContent = SettingsManager.GetInstance().GetVideoContent();
var videoContent = SettingsManager.GetInstance().GetVideoContent();
DownloadAudio = videoContent.DownloadAudio;
DownloadVideo = videoContent.DownloadVideo;
@@ -321,11 +344,11 @@ public class ViewVideoViewModel : ViewModelBase
}
// 文件命名格式
List<FileNamePart> fileNameParts = SettingsManager.GetInstance().GetFileNameParts();
var fileNameParts = SettingsManager.GetInstance().GetFileNameParts();
SelectedFileName.Clear();
foreach (FileNamePart item in fileNameParts)
foreach (var item in fileNameParts)
{
string display = DisplayFileNamePart(item);
var display = DisplayFileNamePart(item);
SelectedFileName.Add(new DisplayFileNamePart { Id = item, Title = display });
}
@@ -342,11 +365,9 @@ public class ViewVideoViewModel : ViewModelBase
#region 命令申明
// 优先下载的视频编码事件
private DelegateCommand<object> videoCodecsCommand;
private DelegateCommand<object>? _videoCodecsCommand;
public DelegateCommand<object> VideoCodecsCommand => videoCodecsCommand ??
(videoCodecsCommand =
new DelegateCommand<object>(ExecuteVideoCodecsCommand));
public DelegateCommand<object> VideoCodecsCommand => _videoCodecsCommand ??= new DelegateCommand<object>(ExecuteVideoCodecsCommand);
/// <summary>
/// 优先下载的视频编码事件
@@ -356,21 +377,19 @@ public class ViewVideoViewModel : ViewModelBase
{
//VideoCodecs videoCodecs = GetVideoCodecs(parameter);
if (!(parameter is Quality videoCodecs))
if (parameter is not Quality videoCodecs)
{
return;
}
bool isSucceed = SettingsManager.GetInstance().SetVideoCodecs(videoCodecs.Id);
var isSucceed = SettingsManager.GetInstance().SetVideoCodecs(videoCodecs.Id);
PublishTip(isSucceed);
}
// 优先下载画质事件
private DelegateCommand<object> videoQualityCommand;
private DelegateCommand<object>? _videoQualityCommand;
public DelegateCommand<object> VideoQualityCommand => videoQualityCommand ??
(videoQualityCommand =
new DelegateCommand<object>(ExecuteVideoQualityCommand));
public DelegateCommand<object> VideoQualityCommand => _videoQualityCommand ??= new DelegateCommand<object>(ExecuteVideoQualityCommand);
/// <summary>
/// 优先下载画质事件
@@ -388,11 +407,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 优先下载音质事件
private DelegateCommand<object> audioQualityCommand;
private DelegateCommand<object>? _audioQualityCommand;
public DelegateCommand<object> AudioQualityCommand => audioQualityCommand ??
(audioQualityCommand =
new DelegateCommand<object>(ExecuteAudioQualityCommand));
public DelegateCommand<object> AudioQualityCommand => _audioQualityCommand ??= new DelegateCommand<object>(ExecuteAudioQualityCommand);
/// <summary>
/// 优先下载音质事件
@@ -409,51 +426,63 @@ public class ViewVideoViewModel : ViewModelBase
PublishTip(isSucceed);
}
// 是否下载flv视频后转码为mp4事件
private DelegateCommand isTranscodingFlvToMp4Command;
public DelegateCommand IsTranscodingFlvToMp4Command => isTranscodingFlvToMp4Command ??
(isTranscodingFlvToMp4Command =
new DelegateCommand(
ExecuteIsTranscodingFlvToMp4Command));
// 首选视频解析线路事件
private DelegateCommand<object>? _videoParseTypeCommand;
public DelegateCommand<object> VideoParseTypeCommand => _videoParseTypeCommand ??= new DelegateCommand<object>(ExecuteVideoParseTypeCommand);
/// <summary>
/// 首选视频解析线路事件
/// </summary>
/// <param name="parameter"></param>
private void ExecuteVideoParseTypeCommand(object parameter)
{
if (parameter is not VideoParseType type)
{
return;
}
var isSucceed = SettingsManager.GetInstance().SetVideoParseType(type.Id ?? 1);
PublishTip(isSucceed);
}
// 是否下载flv视频后转码为mp4事件
private DelegateCommand? _isTranscodingFlvToMp4Command;
public DelegateCommand IsTranscodingFlvToMp4Command => _isTranscodingFlvToMp4Command ??= new DelegateCommand(ExecuteIsTranscodingFlvToMp4Command);
/// <summary>
/// 是否下载flv视频后转码为mp4事件
/// </summary>
private void ExecuteIsTranscodingFlvToMp4Command()
{
AllowStatus isTranscodingFlvToMp4 = IsTranscodingFlvToMp4 ? AllowStatus.YES : AllowStatus.NO;
var isTranscodingFlvToMp4 = IsTranscodingFlvToMp4 ? AllowStatus.YES : AllowStatus.NO;
bool isSucceed = SettingsManager.GetInstance().IsTranscodingFlvToMp4(isTranscodingFlvToMp4);
var isSucceed = SettingsManager.GetInstance().IsTranscodingFlvToMp4(isTranscodingFlvToMp4);
PublishTip(isSucceed);
}
// 是否使用默认下载目录事件
private DelegateCommand isUseDefaultDirectoryCommand;
private DelegateCommand? _isUseDefaultDirectoryCommand;
public DelegateCommand IsUseDefaultDirectoryCommand => isUseDefaultDirectoryCommand ??
(isUseDefaultDirectoryCommand =
new DelegateCommand(
ExecuteIsUseDefaultDirectoryCommand));
public DelegateCommand IsUseDefaultDirectoryCommand => _isUseDefaultDirectoryCommand ??= new DelegateCommand(ExecuteIsUseDefaultDirectoryCommand);
/// <summary>
/// 是否使用默认下载目录事件
/// </summary>
private void ExecuteIsUseDefaultDirectoryCommand()
{
AllowStatus isUseDefaultDirectory = IsUseDefaultDirectory ? AllowStatus.YES : AllowStatus.NO;
var isUseDefaultDirectory = IsUseDefaultDirectory ? AllowStatus.YES : AllowStatus.NO;
bool isSucceed = SettingsManager.GetInstance().IsUseSaveVideoRootPath(isUseDefaultDirectory);
var isSucceed = SettingsManager.GetInstance().IsUseSaveVideoRootPath(isUseDefaultDirectory);
PublishTip(isSucceed);
}
// 修改默认下载目录事件
private DelegateCommand changeSaveVideoDirectoryCommand;
private DelegateCommand? _changeSaveVideoDirectoryCommand;
public DelegateCommand ChangeSaveVideoDirectoryCommand => changeSaveVideoDirectoryCommand ??
(changeSaveVideoDirectoryCommand =
new DelegateCommand(
ExecuteChangeSaveVideoDirectoryCommand));
public DelegateCommand ChangeSaveVideoDirectoryCommand => _changeSaveVideoDirectoryCommand ??= new DelegateCommand(ExecuteChangeSaveVideoDirectoryCommand);
/// <summary>
/// 修改默认下载目录事件
@@ -461,11 +490,14 @@ public class ViewVideoViewModel : ViewModelBase
private async void ExecuteChangeSaveVideoDirectoryCommand()
{
var directory = await DialogUtils.SetDownloadDirectory();
if (string.IsNullOrEmpty(directory)) { return; }
bool isSucceed = SettingsManager.GetInstance().SetSaveVideoRootPath(directory);
if (string.IsNullOrEmpty(directory))
{
return;
}
var isSucceed = SettingsManager.GetInstance().SetSaveVideoRootPath(directory);
PublishTip(isSucceed);
if (isSucceed)
{
SaveVideoDirectory = directory;
@@ -473,10 +505,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 所有内容选择事件
private DelegateCommand downloadAllCommand;
private DelegateCommand? _downloadAllCommand;
public DelegateCommand DownloadAllCommand =>
downloadAllCommand ?? (downloadAllCommand = new DelegateCommand(ExecuteDownloadAllCommand));
public DelegateCommand DownloadAllCommand => _downloadAllCommand ??= new DelegateCommand(ExecuteDownloadAllCommand);
/// <summary>
/// 所有内容选择事件
@@ -504,11 +535,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 音频选择事件
private DelegateCommand downloadAudioCommand;
private DelegateCommand? _downloadAudioCommand;
public DelegateCommand DownloadAudioCommand => downloadAudioCommand ??
(downloadAudioCommand =
new DelegateCommand(ExecuteDownloadAudioCommand));
public DelegateCommand DownloadAudioCommand => _downloadAudioCommand ??= new DelegateCommand(ExecuteDownloadAudioCommand);
/// <summary>
/// 音频选择事件
@@ -529,11 +558,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 视频选择事件
private DelegateCommand downloadVideoCommand;
private DelegateCommand? _downloadVideoCommand;
public DelegateCommand DownloadVideoCommand => downloadVideoCommand ??
(downloadVideoCommand =
new DelegateCommand(ExecuteDownloadVideoCommand));
public DelegateCommand DownloadVideoCommand => _downloadVideoCommand ??= new DelegateCommand(ExecuteDownloadVideoCommand);
/// <summary>
/// 视频选择事件
@@ -554,11 +581,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 弹幕选择事件
private DelegateCommand downloadDanmakuCommand;
private DelegateCommand? _downloadDanmakuCommand;
public DelegateCommand DownloadDanmakuCommand => downloadDanmakuCommand ??
(downloadDanmakuCommand =
new DelegateCommand(ExecuteDownloadDanmakuCommand));
public DelegateCommand DownloadDanmakuCommand => _downloadDanmakuCommand ??= new DelegateCommand(ExecuteDownloadDanmakuCommand);
/// <summary>
/// 弹幕选择事件
@@ -579,11 +604,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 字幕选择事件
private DelegateCommand downloadSubtitleCommand;
private DelegateCommand? _downloadSubtitleCommand;
public DelegateCommand DownloadSubtitleCommand => downloadSubtitleCommand ??
(downloadSubtitleCommand =
new DelegateCommand(ExecuteDownloadSubtitleCommand));
public DelegateCommand DownloadSubtitleCommand => _downloadSubtitleCommand ??= new DelegateCommand(ExecuteDownloadSubtitleCommand);
/// <summary>
/// 字幕选择事件
@@ -604,11 +627,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 封面选择事件
private DelegateCommand downloadCoverCommand;
private DelegateCommand? _downloadCoverCommand;
public DelegateCommand DownloadCoverCommand => downloadCoverCommand ??
(downloadCoverCommand =
new DelegateCommand(ExecuteDownloadCoverCommand));
public DelegateCommand DownloadCoverCommand => _downloadCoverCommand ??= new DelegateCommand(ExecuteDownloadCoverCommand);
/// <summary>
/// 封面选择事件
@@ -629,12 +650,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 选中文件名字段右键点击事件
private DelegateCommand<object> selectedFileNameRightCommand;
private DelegateCommand<object>? _selectedFileNameRightCommand;
public DelegateCommand<object> SelectedFileNameRightCommand => selectedFileNameRightCommand ??
(selectedFileNameRightCommand =
new DelegateCommand<object>(
ExecuteSelectedFileNameRightCommand));
public DelegateCommand<object> SelectedFileNameRightCommand => _selectedFileNameRightCommand ??= new DelegateCommand<object>(ExecuteSelectedFileNameRightCommand);
/// <summary>
/// 选中文件名字段右键点击事件
@@ -667,12 +685,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 可选文件名字段点击事件
private DelegateCommand<object> optionalFieldsCommand;
private DelegateCommand<object>? _optionalFieldsCommand;
public DelegateCommand<object> OptionalFieldsCommand => optionalFieldsCommand ??
(optionalFieldsCommand =
new DelegateCommand<object>(
ExecuteOptionalFieldsCommand));
public DelegateCommand<object> OptionalFieldsCommand => _optionalFieldsCommand ??= new DelegateCommand<object>(ExecuteOptionalFieldsCommand);
/// <summary>
/// 可选文件名字段点击事件
@@ -687,35 +702,35 @@ public class ViewVideoViewModel : ViewModelBase
SelectedFileName.Add((DisplayFileNamePart)parameter);
List<FileNamePart> fileName = new List<FileNamePart>();
foreach (DisplayFileNamePart item in SelectedFileName)
var fileName = new List<FileNamePart>();
foreach (var item in SelectedFileName)
{
fileName.Add(item.Id);
}
bool isSucceed = SettingsManager.GetInstance().SetFileNameParts(fileName);
var isSucceed = SettingsManager.GetInstance().SetFileNameParts(fileName);
PublishTip(isSucceed);
SelectedOptionalField = -1;
}
// 重置选中文件名字段
private DelegateCommand resetCommand;
public DelegateCommand ResetCommand => resetCommand ?? (resetCommand = new DelegateCommand(ExecuteResetCommand));
private DelegateCommand? _resetCommand;
public DelegateCommand ResetCommand => _resetCommand ??= new DelegateCommand(ExecuteResetCommand);
/// <summary>
/// 重置选中文件名字段
/// </summary>
private void ExecuteResetCommand()
{
bool isSucceed = SettingsManager.GetInstance().SetFileNameParts(null);
var isSucceed = SettingsManager.GetInstance().SetFileNameParts(null);
PublishTip(isSucceed);
List<FileNamePart> fileNameParts = SettingsManager.GetInstance().GetFileNameParts();
var fileNameParts = SettingsManager.GetInstance().GetFileNameParts();
SelectedFileName.Clear();
foreach (FileNamePart item in fileNameParts)
foreach (var item in fileNameParts)
{
string display = DisplayFileNamePart(item);
var display = DisplayFileNamePart(item);
SelectedFileName.Add(new DisplayFileNamePart { Id = item, Title = display });
}
@@ -723,12 +738,9 @@ public class ViewVideoViewModel : ViewModelBase
}
// 文件命名中的时间格式事件
private DelegateCommand<object> fileNamePartTimeFormatCommand;
private DelegateCommand<object>? _fileNamePartTimeFormatCommand;
public DelegateCommand<object> FileNamePartTimeFormatCommand => fileNamePartTimeFormatCommand ??
(fileNamePartTimeFormatCommand =
new DelegateCommand<object>(
ExecuteFileNamePartTimeFormatCommand));
public DelegateCommand<object> FileNamePartTimeFormatCommand => _fileNamePartTimeFormatCommand ??= new DelegateCommand<object>(ExecuteFileNamePartTimeFormatCommand);
/// <summary>
/// 文件命名中的时间格式事件
@@ -736,22 +748,19 @@ public class ViewVideoViewModel : ViewModelBase
/// <param name="parameter"></param>
private void ExecuteFileNamePartTimeFormatCommand(object parameter)
{
if (!(parameter is string timeFormat))
if (parameter is not string timeFormat)
{
return;
}
bool isSucceed = SettingsManager.GetInstance().SetFileNamePartTimeFormat(timeFormat);
var isSucceed = SettingsManager.GetInstance().SetFileNamePartTimeFormat(timeFormat);
PublishTip(isSucceed);
}
// 文件命名中的序号格式事件
private DelegateCommand<object> orderFormatCommand;
private DelegateCommand<object>? _orderFormatCommand;
public DelegateCommand<object> OrderFormatCommand => orderFormatCommand ??
(orderFormatCommand =
new DelegateCommand<object>(
ExecuteOrderFormatCommandCommand));
public DelegateCommand<object> OrderFormatCommand => _orderFormatCommand ??= new DelegateCommand<object>(ExecuteOrderFormatCommandCommand);
/// <summary>
/// 文件命名中的序号格式事件
@@ -759,12 +768,12 @@ public class ViewVideoViewModel : ViewModelBase
/// <param name="parameter"></param>
private void ExecuteOrderFormatCommandCommand(object parameter)
{
if (!(parameter is OrderFormatDisplay orderFormatDisplay))
if (parameter is not OrderFormatDisplay orderFormatDisplay)
{
return;
}
bool isSucceed = SettingsManager.GetInstance().SetOrderFormat(orderFormatDisplay.OrderFormat);
var isSucceed = SettingsManager.GetInstance().SetOrderFormat(orderFormatDisplay.OrderFormat);
PublishTip(isSucceed);
}
@@ -824,7 +833,7 @@ public class ViewVideoViewModel : ViewModelBase
/// </summary>
private void SetVideoContent()
{
VideoContentSettings videoContent = new VideoContentSettings
var videoContent = new VideoContentSettings
{
DownloadAudio = DownloadAudio,
DownloadVideo = DownloadVideo,
@@ -833,7 +842,7 @@ public class ViewVideoViewModel : ViewModelBase
DownloadCover = DownloadCover
};
bool isSucceed = SettingsManager.GetInstance().SetVideoContent(videoContent);
var isSucceed = SettingsManager.GetInstance().SetVideoContent(videoContent);
PublishTip(isSucceed);
}
@@ -844,54 +853,26 @@ public class ViewVideoViewModel : ViewModelBase
/// <returns></returns>
private string DisplayFileNamePart(FileNamePart item)
{
string display = string.Empty;
switch (item)
var display = item switch
{
case FileNamePart.ORDER:
display = DictionaryResource.GetString("DisplayOrder");
break;
case FileNamePart.SECTION:
display = DictionaryResource.GetString("DisplaySection");
break;
case FileNamePart.MAIN_TITLE:
display = DictionaryResource.GetString("DisplayMainTitle");
break;
case FileNamePart.PAGE_TITLE:
display = DictionaryResource.GetString("DisplayPageTitle");
break;
case FileNamePart.VIDEO_ZONE:
display = DictionaryResource.GetString("DisplayVideoZone");
break;
case FileNamePart.AUDIO_QUALITY:
display = DictionaryResource.GetString("DisplayAudioQuality");
break;
case FileNamePart.VIDEO_QUALITY:
display = DictionaryResource.GetString("DisplayVideoQuality");
break;
case FileNamePart.VIDEO_CODEC:
display = DictionaryResource.GetString("DisplayVideoCodec");
break;
case FileNamePart.VIDEO_PUBLISH_TIME:
display = DictionaryResource.GetString("DisplayVideoPublishTime");
break;
case FileNamePart.AVID:
display = "avid";
break;
case FileNamePart.BVID:
display = "bvid";
break;
case FileNamePart.CID:
display = "cid";
break;
case FileNamePart.UP_MID:
display = DictionaryResource.GetString("DisplayUpMid");
break;
case FileNamePart.UP_NAME:
display = DictionaryResource.GetString("DisplayUpName");
break;
}
FileNamePart.ORDER => DictionaryResource.GetString("DisplayOrder"),
FileNamePart.SECTION => DictionaryResource.GetString("DisplaySection"),
FileNamePart.MAIN_TITLE => DictionaryResource.GetString("DisplayMainTitle"),
FileNamePart.PAGE_TITLE => DictionaryResource.GetString("DisplayPageTitle"),
FileNamePart.VIDEO_ZONE => DictionaryResource.GetString("DisplayVideoZone"),
FileNamePart.AUDIO_QUALITY => DictionaryResource.GetString("DisplayAudioQuality"),
FileNamePart.VIDEO_QUALITY => DictionaryResource.GetString("DisplayVideoQuality"),
FileNamePart.VIDEO_CODEC => DictionaryResource.GetString("DisplayVideoCodec"),
FileNamePart.VIDEO_PUBLISH_TIME => DictionaryResource.GetString("DisplayVideoPublishTime"),
FileNamePart.AVID => "avid",
FileNamePart.BVID => "bvid",
FileNamePart.CID => "cid",
FileNamePart.UP_MID => DictionaryResource.GetString("DisplayUpMid"),
FileNamePart.UP_NAME => DictionaryResource.GetString("DisplayUpName"),
_ => string.Empty
};
if (((int)item) >= 100)
if ((int)item >= 100)
{
display = HyphenSeparated.Hyphen[(int)item];
}

21
DownKyi/Views/Settings/ViewVideo.axaml
View File

@@ -77,6 +77,27 @@
</i:Interaction.Behaviors>
</ComboBox>
</StackPanel>
<StackPanel Margin="0,20,0,0" Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
FontSize="12"
Foreground="{DynamicResource BrushTextDark}"
Text="{DynamicResource VideoParseType}" />
<ComboBox
Name="NameVideoParseTypeList"
Width="200"
VerticalContentAlignment="Center"
DisplayMemberBinding="{Binding Name}"
ItemsSource="{Binding VideoParseTypeList}"
SelectedItem="{Binding SelectedVideoParseType}">
<i:Interaction.Behaviors>
<ia:EventTriggerBehavior EventName="SelectionChanged">
<ia:InvokeCommandAction Command="{Binding VideoParseTypeCommand}"
CommandParameter="{Binding ElementName=NameVideoParseTypeList,Path=SelectedValue}" />
</ia:EventTriggerBehavior>
</i:Interaction.Behaviors>
</ComboBox>
</StackPanel>
<CheckBox
Margin="0,20,0,0"
HorizontalAlignment="Left"