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

Merge branch 'nilaoda:main' into main

This commit is contained in:
ImAleeexx 2022-12-20 09:42:02 +01:00 committed by GitHub
parent 8b9e412ab7 dbd81abcc4
commit 04e7d403ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/N_m3u8DL-RE.Parser/Processor/HLS/DefaultHLSContentProcessor.cs
View File

@ -22,6 +22,8 @@ namespace N_m3u8DL_RE.Parser.Processor.HLS
private static partial Regex OrderFixRegex();
[GeneratedRegex("#EXT-X-MAP.*\\.apple\\.com/")]
private static partial Regex ATVRegex();
[GeneratedRegex("(#EXT-X-KEY:[\\s\\S]*?)(#EXT-X-DISCONTINUITY|#EXT-X-ENDLIST)")]
private static partial Regex ATVRegex2();
public override bool CanProcess(ExtractorType extractorType, string rawText, ParserConfig parserConfig) => extractorType == ExtractorType.HLS;
@ -80,7 +82,7 @@ namespace N_m3u8DL_RE.Parser.Processor.HLS
if (m3u8Content.Contains("#EXT-X-DISCONTINUITY") && m3u8Content.Contains("#EXT-X-MAP") && (m3u8Url.Contains(".apple.com/") || ATVRegex().IsMatch(m3u8Content)))
{
//只取加密部分即可
Regex ykmap = DNSPRegex();
Regex ykmap = ATVRegex2();
if (ykmap.IsMatch(m3u8Content))
{
m3u8Content = "#EXTM3U\r\n" + ykmap.Match(m3u8Content).Groups[1].Value + "\r\n#EXT-X-ENDLIST";

2
src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs
View File

@ -18,7 +18,7 @@ namespace N_m3u8DL_RE.CommandLine
{
internal partial class CommandInvoker
{
public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20221212";
public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20221220";
[GeneratedRegex("((best|worst)\\d*|all)")]
private static partial Regex ForStrRegex();

4
src/N_m3u8DL-RE/DownloadManager/SimpleDownloadManager.cs
View File

@ -323,7 +323,7 @@ namespace N_m3u8DL_RE.DownloadManager
//校验分片数量
if (DownloaderConfig.MyOptions.CheckSegmentsCount && FileDic.Values.Any(s => s == null))
{
Logger.WarnMarkUp(ResString.segmentCountCheckNotPass, totalCount, FileDic.Values.Where(s => s != null).Count());
Logger.ErrorMarkUp(ResString.segmentCountCheckNotPass, totalCount, FileDic.Values.Where(s => s != null).Count());
return false;
}
@ -670,6 +670,8 @@ namespace N_m3u8DL_RE.DownloadManager
var task = kp.Value;
var result = await DownloadStreamAsync(kp.Key, task, SpeedContainerDic[task.Id]);
Results[kp.Key] = result;
//失败不再下载后续
if (!result) break;
}
}
else

2
src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs
View File

@ -799,7 +799,7 @@ namespace N_m3u8DL_RE.DownloadManager
//创建任务
var dic = SelectedSteams.Select(item =>
{
var task = ctx.AddTask(item.ToShortString(), autoStart: false, maxValue: 0);
var task = ctx.AddTask(item.ToShortShortString(), autoStart: false, maxValue: 0);
SpeedContainerDic[task.Id] = new SpeedContainer(); //速度计算
LastFileNameDic[task.Id] = "";
DateTimeDic[task.Id] = 0L;

13
src/N_m3u8DL-RE/Downloader/SimpleDownloader.cs
View File

@ -85,12 +85,19 @@ namespace N_m3u8DL_RE.Downloader
cancellationTokenSource = new();
var des = Path.ChangeExtension(path, null);
//已下载过跳过
//已下载跳过
if (File.Exists(des))
{
return new DownloadResult() { ActualContentLength = 0, ActualFilePath = des };
}
//已解密跳过
var dec = Path.Combine(Path.GetDirectoryName(des)!, Path.GetFileNameWithoutExtension(des) + "_dec" + Path.GetExtension(des));
if (File.Exists(dec))
{
return new DownloadResult() { ActualContentLength = 0, ActualFilePath = dec };
}
//另起线程进行监控
using var watcher = Task.Factory.StartNew(async () =>
{
@ -128,6 +135,10 @@ namespace N_m3u8DL_RE.Downloader
await Task.Delay(1000);
goto retry;
}
else
{
Logger.WarnMarkUp($"[grey]{ex.Message.EscapeMarkup()}[/]");
}
//throw new Exception("download failed", ex);
return null;
}

2
src/N_m3u8DL-RE/N_m3u8DL-RE.csproj
View File

@ -7,7 +7,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<Version>0.1.5</Version>
<Version>0.1.5.2</Version>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>

28
src/N_m3u8DL-RE/Util/MP4DecryptUtil.cs
View File

@ -7,17 +7,26 @@ namespace N_m3u8DL_RE.Util
{
internal class MP4DecryptUtil
{
private static string ZeroKid = "00000000000000000000000000000000";
public static async Task<bool> DecryptAsync(bool shakaPackager, string bin, string[]? keys, string source, string dest, string? kid, string init = "")
{
if (keys == null || keys.Length == 0) return false;
var keyPair = keys.First();
string? keyPair = null;
string? trackId = null;
if (!string.IsNullOrEmpty(kid))
{
var test = keys.Where(k => k.StartsWith(kid));
if (test.Any()) keyPair = test.First();
}
//Apple
if (kid == ZeroKid)
{
keyPair = keys.First();
trackId = "1";
}
if (keyPair == null) return false;
//shakaPackager 无法单独解密init文件
@ -37,12 +46,19 @@ namespace N_m3u8DL_RE.Util
enc = tmpFile;
}
cmd = $"--enable_raw_key_decryption input=\"{enc}\",stream=0,output=\"{dest}\" " +
$"--keys key_id={keyPair.Split(':')[0]}:key={keyPair.Split(':')[1]}";
cmd = $"--quiet --enable_raw_key_decryption input=\"{enc}\",stream=0,output=\"{dest}\" " +
$"--keys {(trackId != null ? $"label={trackId}:" : "")}key_id={(trackId != null ? ZeroKid : kid)}:key={keyPair.Split(':')[1]}";
}
else
{
cmd = string.Join(" ", keys.Select(k => $"--key {k}"));
if (trackId == null)
{
cmd = string.Join(" ", keys.Select(k => $"--key {k}"));
}
else
{
cmd = string.Join(" ", keys.Select(k => $"--key {trackId}:{k.Split(':')[1]}"));
}
if (init != "")
{
cmd += $" --fragments-info \"{init}\" ";
@ -69,8 +85,8 @@ namespace N_m3u8DL_RE.Util
{
FileName = name,
Arguments = arg,
RedirectStandardOutput = true,
RedirectStandardError = true,
//RedirectStandardOutput = true,
//RedirectStandardError = true,
CreateNoWindow = true,
UseShellExecute = false
})!.WaitForExitAsync();