Add support for the dash role scheme

src/N_m3u8DL-RE.Common/Entity/StreamSpec.cs

@@ -31,6 +31,9 @@ namespace N_m3u8DL_RE.Common.Entity
         public string? Channels { get; set; }
         public string? Extension { get; set; }
 
+        //Dash
+        public RoleType? Role { get; set; }
+
         //补充信息-色域
         public string? VideoRange { get; set; }
         //补充信息-特征
@@ -74,19 +77,19 @@ namespace N_m3u8DL_RE.Common.Entity
             if (MediaType == Enum.MediaType.AUDIO)
             {
                 prefixStr = $"[deepskyblue3]Aud[/] {encStr}";
-                var d = $"{GroupId} | {(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Codecs} | {Language} | {(Channels != null ? Channels + "CH" : "")}";
+                var d = $"{GroupId} | {(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Codecs} | {Language} | {(Channels != null ? Channels + "CH" : "")} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
             else if (MediaType == Enum.MediaType.SUBTITLES)
             {
                 prefixStr = $"[deepskyblue3_1]Sub[/] {encStr}";
-                var d = $"{GroupId} | {Language} | {Name} | {Codecs}";
+                var d = $"{GroupId} | {Language} | {Name} | {Codecs} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
             else
             {
                 prefixStr = $"[aqua]Vid[/] {encStr}";
-                var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {VideoRange}";
+                var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {VideoRange} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
 
@@ -108,19 +111,19 @@ namespace N_m3u8DL_RE.Common.Entity
             if (MediaType == Enum.MediaType.AUDIO)
             {
                 prefixStr = $"[deepskyblue3]Aud[/] {encStr}";
-                var d = $"{(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Language} | {(Channels != null ? Channels + "CH" : "")}";
+                var d = $"{(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Language} | {(Channels != null ? Channels + "CH" : "")} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
             else if (MediaType == Enum.MediaType.SUBTITLES)
             {
                 prefixStr = $"[deepskyblue3_1]Sub[/] {encStr}";
-                var d = $"{Language} | {Name} | {Codecs}";
+                var d = $"{Language} | {Name} | {Codecs} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
             else
             {
                 prefixStr = $"[aqua]Vid[/] {encStr}";
-                var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {FrameRate} | {VideoRange}";
+                var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {FrameRate} | {VideoRange} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
 
@@ -150,19 +153,19 @@ namespace N_m3u8DL_RE.Common.Entity
             if (MediaType == Enum.MediaType.AUDIO)
             {
                 prefixStr = $"[deepskyblue3]Aud[/] {encStr}";
-                var d = $"{GroupId} | {(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Codecs} | {Language} | {(Channels != null ? Channels + "CH" : "")} | {segmentsCountStr}";
+                var d = $"{GroupId} | {(Bandwidth != null ? (Bandwidth / 1000) + " Kbps" : "")} | {Name} | {Codecs} | {Language} | {(Channels != null ? Channels + "CH" : "")} | {segmentsCountStr} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
             else if (MediaType == Enum.MediaType.SUBTITLES)
             {
                 prefixStr = $"[deepskyblue3_1]Sub[/] {encStr}";
-                var d = $"{GroupId} | {Language} | {Name} | {Codecs} | {Characteristics} | {segmentsCountStr}";
+                var d = $"{GroupId} | {Language} | {Name} | {Codecs} | {Characteristics} | {segmentsCountStr} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
             else
             {
                 prefixStr = $"[aqua]Vid[/] {encStr}";
-                var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {VideoRange} | {segmentsCountStr}";
+                var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {VideoRange} | {segmentsCountStr} | {Role}";
                 returnStr = d.EscapeMarkup();
             }
 

src/N_m3u8DL-RE.Common/Enum/RoleType.cs

@@ -0,0 +1,15 @@
+namespace N_m3u8DL_RE.Common.Enum
+{
+    public enum RoleType
+    {
+        Subtitle = 0,
+        Main = 1,
+        Alternate = 2,
+        Supplementary = 3,
+        Commentary = 4,
+        Dub = 5,
+        Description = 6,
+        Sign = 7,
+        Metadata = 8,
+    }
+}

src/N_m3u8DL-RE.Parser/Extractor/DASHExtractor2.cs

@@ -1,4 +1,4 @@
-using N_m3u8DL_RE.Common.Entity;
+using N_m3u8DL_RE.Common.Entity;
 using N_m3u8DL_RE.Common.Enum;
 using N_m3u8DL_RE.Common.Util;
 using N_m3u8DL_RE.Parser.Config;
@@ -189,10 +189,17 @@ namespace N_m3u8DL_RE.Parser.Extractor
                         if (role != null)
                         {
                             var v = role.Attribute("value")?.Value;
-                            if (v == "subtitle")
+                            if (Enum.TryParse(v, true, out RoleType roleType))
-                                streamSpec.MediaType = MediaType.SUBTITLES;
+                            {
-                            if (mType != null && mType.Contains("ttml"))
+                                streamSpec.Role = roleType;
-                                streamSpec.Extension = "ttml";
+
+                                if (roleType == RoleType.Subtitle)
+                                {
+                                    streamSpec.MediaType = MediaType.SUBTITLES;
+                                    if (mType != null && mType.Contains("ttml"))
+                                        streamSpec.Extension = "ttml";
+                                }
+                            }
                         }
                         streamSpec.Playlist.IsLive = isLive;
                         //设置刷新间隔 timeShiftBufferDepth / 2
@@ -213,7 +220,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
                         {
                             streamSpec.PublishTime = DateTime.Parse(publishTime);
                         }
-                        
+
 
                         //第一种形式 SegmentBase
                         var segmentBaseElement = representation.Elements().Where(e => e.Name.LocalName == "SegmentBase").FirstOrDefault();
@@ -439,7 +446,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
                         }
 
                         //判断加密情况
-                        if (adaptationSet.Elements().Concat(representation.Elements()).Any(e => e.Name.LocalName == "ContentProtection")) 
+                        if (adaptationSet.Elements().Concat(representation.Elements()).Any(e => e.Name.LocalName == "ContentProtection"))
                         {
                             if (streamSpec.Playlist.MediaInit != null)
                             {
@@ -453,7 +460,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
 
                         //处理同一ID分散在不同Period的情况
                         var _index = streamList.FindIndex(_f => _f.PeriodId != streamSpec.PeriodId && _f.GroupId == streamSpec.GroupId && _f.Resolution == streamSpec.Resolution && _f.MediaType == streamSpec.MediaType);
-                        if (_index > -1) 
+                        if (_index > -1)
                         {
                             if (isLive)
                             {

src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs

@@ -1,4 +1,4 @@
-using N_m3u8DL_RE.Common.Enum;
+using N_m3u8DL_RE.Common.Enum;
 using N_m3u8DL_RE.Common.Log;
 using N_m3u8DL_RE.Common.Resource;
 using N_m3u8DL_RE.Common.Util;
@@ -99,7 +99,7 @@ namespace N_m3u8DL_RE.CommandLine
         private readonly static Option<StreamFilter?> VideoFilter = new(new string[] { "-sv", "--select-video" }, description: ResString.cmd_selectVideo, parseArgument: ParseStreamFilter) { ArgumentHelpName = "OPTIONS" };
         private readonly static Option<StreamFilter?> AudioFilter = new(new string[] { "-sa", "--select-audio" }, description: ResString.cmd_selectAudio, parseArgument: ParseStreamFilter) { ArgumentHelpName = "OPTIONS" };
         private readonly static Option<StreamFilter?> SubtitleFilter = new(new string[] { "-ss", "--select-subtitle" }, description: ResString.cmd_selectSubtitle, parseArgument: ParseStreamFilter) { ArgumentHelpName = "OPTIONS" };
-        
+
         private readonly static Option<StreamFilter?> DropVideoFilter = new(new string[] { "-dv", "--drop-video" }, description: ResString.cmd_dropVideo, parseArgument: ParseStreamFilter) { ArgumentHelpName = "OPTIONS" };
         private readonly static Option<StreamFilter?> DropAudioFilter = new(new string[] { "-da", "--drop-audio" }, description: ResString.cmd_dropAudio, parseArgument: ParseStreamFilter) { ArgumentHelpName = "OPTIONS" };
         private readonly static Option<StreamFilter?> DropSubtitleFilter = new(new string[] { "-ds", "--drop-subtitle" }, description: ResString.cmd_dropSubtitle, parseArgument: ParseStreamFilter) { ArgumentHelpName = "OPTIONS" };
@@ -178,7 +178,7 @@ namespace N_m3u8DL_RE.CommandLine
                 return null;
             }
         }
-        
+
         /// <summary>
         /// 解析用户代理
         /// </summary>
@@ -367,6 +367,10 @@ namespace N_m3u8DL_RE.CommandLine
             if (!string.IsNullOrEmpty(plistDurMax))
                 streamFilter.PlaylistMaxDur = OtherUtil.ParseSeconds(plistDurMax);
 
+            var role = p.GetValue("role");
+            if (System.Enum.TryParse(role, true, out RoleType roleType))
+                streamFilter.Role = roleType;
+
             return streamFilter;
         }
 
@@ -553,7 +557,7 @@ namespace N_m3u8DL_RE.CommandLine
 
                 //混流设置
                 var muxAfterDoneValue = bindingContext.ParseResult.GetValueForOption(MuxAfterDone);
-                if (muxAfterDoneValue != null) 
+                if (muxAfterDoneValue != null)
                 {
                     option.MuxAfterDone = true;
                     option.MuxOptions = muxAfterDoneValue;
@@ -571,7 +575,7 @@ namespace N_m3u8DL_RE.CommandLine
         {
             var argList = new List<string>(args);
             var index = -1;
-            if ((index = argList.IndexOf("--morehelp")) >= 0 && argList.Count > index + 1) 
+            if ((index = argList.IndexOf("--morehelp")) >= 0 && argList.Count > index + 1)
             {
                 var option = argList[index + 1];
                 var msg = option switch

src/N_m3u8DL-RE/Entity/StreamFilter.cs

@@ -23,6 +23,7 @@ namespace N_m3u8DL_RE.Entity
         public long? SegmentsMaxCount { get; set; }
         public double? PlaylistMinDur {  get; set; }
         public double? PlaylistMaxDur {  get; set; }
+        public RoleType? Role { get; set; }
 
         public string For { get; set; } = "best";
 
@@ -43,6 +44,7 @@ namespace N_m3u8DL_RE.Entity
             if (SegmentsMaxCount != null) sb.Append($"SegmentsMaxCount: {SegmentsMaxCount} ");
             if (PlaylistMinDur != null) sb.Append($"PlaylistMinDur: {PlaylistMinDur} ");
             if (PlaylistMaxDur != null) sb.Append($"PlaylistMaxDur: {PlaylistMaxDur} ");
+            if (Role.HasValue) sb.Append($"Role: {Role} ");
 
             return sb.ToString() + $"For: {For}";
         }

src/N_m3u8DL-RE/Util/FilterUtil.cs

@@ -46,6 +46,8 @@ namespace N_m3u8DL_RE.Util
                 inputs = inputs.Where(i => i.Playlist?.TotalDuration > filter.PlaylistMinDur);
             if (filter.PlaylistMaxDur != null)
                 inputs = inputs.Where(i => i.Playlist?.TotalDuration < filter.PlaylistMaxDur);
+            if (filter.Role.HasValue)
+                inputs = inputs.Where(i => i.Role == filter.Role);
 
             var bestNumberStr = filter.For.Replace("best", "");
             var worstNumberStr = filter.For.Replace("worst", "");