Austin/BililiveRecorder
1
0
Fork 0
mirror of https://github.com/BililiveRecorder/BililiveRecorder.git synced 2024-11-16 03:32:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: retry cover download up to 3 times

Browse Source
This commit is contained in:
genteure 2022-09-03 22:14:53 +08:00
parent f99a9b59e4
commit e0cd372efc
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
BililiveRecorder.Core/Room.cs
View File

@ -52,6 +52,14 @@ namespace BililiveRecorder.Core
private DateTimeOffset danmakuClientConnectTime;
private static readonly TimeSpan danmakuClientReconnectNoDelay = TimeSpan.FromMinutes(1);
private static readonly HttpClient coverDownloadHttpClient = new HttpClient();
static Room()
{
coverDownloadHttpClient.Timeout = TimeSpan.FromSeconds(10);
coverDownloadHttpClient.DefaultRequestHeaders.UserAgent.Clear();
}
public Room(IServiceScope scope, RoomConfig roomConfig, int initDelayFactor, ILogger logger, IDanmakuClient danmakuClient, IApiClient apiClient, IBasicDanmakuWriter basicDanmakuWriter, IRecordTaskFactory recordTaskFactory)
{
this.scope = scope ?? throw new ArgumentNullException(nameof(scope));
@ -423,40 +431,47 @@ namespace BililiveRecorder.Core
if (this.RoomConfig.SaveStreamCover)
{
// 保存直播间封面
_ = Task.Run(async () =>
{
try
{
var coverUrl = this.RawBilibiliApiJsonData?["room_info"]?["cover"]?.ToObject<string>();
if (string.IsNullOrWhiteSpace(coverUrl))
{
this.logger.Information("没有直播间封面信息");
return;
}
var targetPath = Path.ChangeExtension(e.FullPath, "cover" + Path.GetExtension(coverUrl));
using var http = new HttpClient();
http.DefaultRequestHeaders.UserAgent.Clear();
var stream = await http.GetStreamAsync(coverUrl).ConfigureAwait(false);
using var file = new FileStream(targetPath, FileMode.Create, FileAccess.Write, FileShare.None);
await stream.CopyToAsync(file).ConfigureAwait(false);
this.logger.Debug("直播间封面已成功从 {CoverUrl} 保存到 {FilePath}", coverUrl, targetPath);
}
catch (Exception ex)
{
this.logger.Warning(ex, "保存直播间封面时出错");
}
});
_ = Task.Run(() => this.SaveStreamCoverAsync(e.FullPath));
}
RecordFileOpening?.Invoke(this, e);
}
private async Task SaveStreamCoverAsync(string flvFullPath)
{
const int MAX_ATTEMPT = 3;
var attempt = 0;
retry:
try
{
var coverUrl = this.RawBilibiliApiJsonData?["room_info"]?["cover"]?.ToObject<string>();
if (string.IsNullOrWhiteSpace(coverUrl))
{
this.logger.Information("没有直播间封面信息");
return;
}
var targetPath = Path.ChangeExtension(flvFullPath, "cover" + Path.GetExtension(coverUrl));
var stream = await coverDownloadHttpClient.GetStreamAsync(coverUrl).ConfigureAwait(false);
using var file = new FileStream(targetPath, FileMode.Create, FileAccess.Write, FileShare.None);
await stream.CopyToAsync(file).ConfigureAwait(false);
this.logger.Debug("直播间封面已成功从 {CoverUrl} 保存到 {FilePath}", coverUrl, targetPath);
}
catch (Exception ex)
{
if (attempt++ < MAX_ATTEMPT)
{
this.logger.Debug(ex, "保存直播间封面时出错, 次数 {Attempt}", attempt);
goto retry;
}
this.logger.Warning(ex, "保存直播间封面时出错");
}
}
///
private void RecordTask_RecordSessionEnded(object sender, EventArgs e)
{