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

fix #179

This commit is contained in:
nilaoda 2023-06-01 22:19:08 +08:00
parent 681f287439
commit 3bb4c4cb0c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/N_m3u8DL-RE.Parser/Extractor/DASHExtractor2.cs
View File

@ -8,6 +8,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using System.Xml.Linq; using System.Xml.Linq;
@ -151,7 +152,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
streamSpec.GroupId = representation.Attribute("id")?.Value; streamSpec.GroupId = representation.Attribute("id")?.Value;
streamSpec.Bandwidth = Convert.ToInt32(bandwidth?.Value ?? "0"); streamSpec.Bandwidth = Convert.ToInt32(bandwidth?.Value ?? "0");
streamSpec.Codecs = representation.Attribute("codecs")?.Value ?? adaptationSet.Attribute("codecs")?.Value; streamSpec.Codecs = representation.Attribute("codecs")?.Value ?? adaptationSet.Attribute("codecs")?.Value;
streamSpec.Language = representation.Attribute("lang")?.Value ?? adaptationSet.Attribute("lang")?.Value; streamSpec.Language = FilterLanguage(representation.Attribute("lang")?.Value ?? adaptationSet.Attribute("lang")?.Value);
streamSpec.FrameRate = frameRate ?? GetFrameRate(representation); streamSpec.FrameRate = frameRate ?? GetFrameRate(representation);
streamSpec.Resolution = representation.Attribute("width")?.Value != null ? $"{representation.Attribute("width")?.Value}x{representation.Attribute("height")?.Value}" : null; streamSpec.Resolution = representation.Attribute("width")?.Value != null ? $"{representation.Attribute("width")?.Value}x{representation.Attribute("height")?.Value}" : null;
streamSpec.Url = MpdUrl; streamSpec.Url = MpdUrl;
@ -511,6 +512,18 @@ namespace N_m3u8DL_RE.Parser.Extractor
return streamList; return streamList;
} }
/// <summary>
/// 如果有非法字符 返回und
/// </summary>
/// <param name="v"></param>
/// <returns></returns>
private string? FilterLanguage(string? v)
{
if (v == null) return null;
if (Regex.IsMatch(v, "^[\\w_\\-\\d]+$")) return v;
return "und";
}
public async Task RefreshPlayListAsync(List<StreamSpec> streamSpecs) public async Task RefreshPlayListAsync(List<StreamSpec> streamSpecs)
{ {
if (streamSpecs.Count == 0) return; if (streamSpecs.Count == 0) return;