Mirror-Tools
/
N_m3u8DL-RE
mirror of https://github.com/nilaoda/N_m3u8DL-RE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化分片数量计算

This commit is contained in:
nilaoda 2022-08-15 00:15:30 +08:00
parent a875815f87
commit 9be32b2872
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/N_m3u8DL-RE.Common/Entity/StreamSpec.cs
View File

@ -74,6 +74,8 @@ namespace N_m3u8DL_RE.Common.Entity
var prefixStr = ""; var prefixStr = "";
var returnStr = ""; var returnStr = "";
var encStr = string.Empty; var encStr = string.Empty;
var segmentsCount = Playlist != null ? Playlist.MediaParts.Sum(x => x.MediaSegments.Count) : 0;
var segmentsCountStr = segmentsCount == 0 ? "" : (segmentsCount > 1 ? $"{segmentsCount} Segments" : $"{segmentsCount} Segment");
//增加加密标志 //增加加密标志
if (Playlist != null && Playlist.MediaParts.Any(m => m.MediaSegments.Any(s => s.EncryptInfo.Method != EncryptMethod.NONE))) if (Playlist != null && Playlist.MediaParts.Any(m => m.MediaSegments.Any(s => s.EncryptInfo.Method != EncryptMethod.NONE)))
@ -85,19 +87,19 @@ namespace N_m3u8DL_RE.Common.Entity
if (MediaType == Enum.MediaType.AUDIO) if (MediaType == Enum.MediaType.AUDIO)
{ {
prefixStr = $"[deepskyblue3]Aud[/] {encStr}"; prefixStr = $"[deepskyblue3]Aud[/] {encStr}";
var d = $"{GroupId} | {(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Codecs} | {Language} | {(Channels != null ? Channels + "CH" : "")} | {(Playlist != null ? Playlist.MediaParts.Sum(x => x.MediaSegments.Count) + " Segments" : "")}"; var d = $"{GroupId} | {(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Codecs} | {Language} | {(Channels != null ? Channels + "CH" : "")} | {segmentsCountStr}";
returnStr = d.EscapeMarkup(); returnStr = d.EscapeMarkup();
} }
else if (MediaType == Enum.MediaType.SUBTITLES) else if (MediaType == Enum.MediaType.SUBTITLES)
{ {
prefixStr = $"[deepskyblue3_1]Sub[/] {encStr}"; prefixStr = $"[deepskyblue3_1]Sub[/] {encStr}";
var d = $"{GroupId} | {Language} | {Name} | {Codecs} | {(Playlist != null ? Playlist.MediaParts.Sum(x => x.MediaSegments.Count) + " Segments" : "")}"; var d = $"{GroupId} | {Language} | {Name} | {Codecs} | {segmentsCountStr}";
returnStr = d.EscapeMarkup(); returnStr = d.EscapeMarkup();
} }
else else
{ {
prefixStr = $"[aqua]Vid[/] {encStr}"; prefixStr = $"[aqua]Vid[/] {encStr}";
var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {(Playlist != null ? Playlist.MediaParts.Sum(x => x.MediaSegments.Count) + " Segments" : "")}"; var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {segmentsCountStr}";
returnStr = d.EscapeMarkup(); returnStr = d.EscapeMarkup();
} }