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

feat: Improve error handling in DanmakuMergerHandler

Browse Source 
Also returns file name of the source of exception in error message.
This commit is contained in:
genteure 2024-06-22 22:22:06 +08:00
parent c428086ccb
commit c8a63cc71b
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
BililiveRecorder.ToolBox/Tool/DanmakuMerger/DanmakuMergerHandler.cs
View File

@ -174,7 +174,22 @@ namespace BililiveRecorder.ToolBox.Tool.DanmakuMerger
for (var i = 0; i < inputLength; i++) for (var i = 0; i < inputLength; i++)
{ {
var r = readers[i]!; var r = readers[i]!;
var el = ReadDanmakuElement(r); XElement? el = null;
try
{
el = ReadDanmakuElement(r);
}
catch (Exception readEx)
{
return new CommandResponse<DanmakuMergerResponse>
{
Status = ResponseStatus.InputIOError,
Exception = readEx,
ErrorMessage = request.Inputs[i] + ": " + readEx.Message
};
}
if (el is null) if (el is null)
{ {
readers[i] = null; readers[i] = null;
@ -206,7 +221,23 @@ namespace BililiveRecorder.ToolBox.Tool.DanmakuMerger
if (reader is not null) if (reader is not null)
{ {
readNextElementFromSameReader: readNextElementFromSameReader:
var newEl = ReadDanmakuElement(reader);
XElement? newEl = null;
try
{
newEl = ReadDanmakuElement(reader);
}
catch (Exception readEx)
{
return new CommandResponse<DanmakuMergerResponse>
{
Status = ResponseStatus.InputIOError,
Exception = readEx,
ErrorMessage = request.Inputs[readerIndex] + ": " + readEx.Message
};
}
if (newEl is null) if (newEl is null)
{ {
// 文件已结束 // 文件已结束