mirror of
https://github.com/BililiveRecorder/BililiveRecorder.git
synced 2024-11-16 03:32:20 +08:00
feat: retry cover download up to 3 times
This commit is contained in:
parent
f99a9b59e4
commit
e0cd372efc
|
@ -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,9 +431,17 @@ namespace BililiveRecorder.Core
|
|||
|
||||
if (this.RoomConfig.SaveStreamCover)
|
||||
{
|
||||
// 保存直播间封面
|
||||
_ = Task.Run(async () =>
|
||||
_ = 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>();
|
||||
|
@ -436,12 +452,9 @@ namespace BililiveRecorder.Core
|
|||
return;
|
||||
}
|
||||
|
||||
var targetPath = Path.ChangeExtension(e.FullPath, "cover" + Path.GetExtension(coverUrl));
|
||||
var targetPath = Path.ChangeExtension(flvFullPath, "cover" + Path.GetExtension(coverUrl));
|
||||
|
||||
using var http = new HttpClient();
|
||||
http.DefaultRequestHeaders.UserAgent.Clear();
|
||||
|
||||
var stream = await http.GetStreamAsync(coverUrl).ConfigureAwait(false);
|
||||
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);
|
||||
|
||||
|
@ -449,12 +462,14 @@ namespace BililiveRecorder.Core
|
|||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
this.logger.Warning(ex, "保存直播间封面时出错");
|
||||
}
|
||||
});
|
||||
if (attempt++ < MAX_ATTEMPT)
|
||||
{
|
||||
this.logger.Debug(ex, "保存直播间封面时出错, 次数 {Attempt}", attempt);
|
||||
goto retry;
|
||||
}
|
||||
|
||||
RecordFileOpening?.Invoke(this, e);
|
||||
this.logger.Warning(ex, "保存直播间封面时出错");
|
||||
}
|
||||
}
|
||||
|
||||
///
|
||||
|
|
Loading…
Reference in New Issue
Block a user