From 1b1cef9a94737a2a4d67c5c8d3bc8a541265e6c9 Mon Sep 17 00:00:00 2001
From: nilaoda <nilaoda@live.com>
Date: Wed, 11 Jan 2023 22:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Master=E7=9A=84=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extractor/HLSExtractor.cs                 | 58 +++++++++++--------
 src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs |  2 +-
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/N_m3u8DL-RE.Parser/Extractor/HLSExtractor.cs b/src/N_m3u8DL-RE.Parser/Extractor/HLSExtractor.cs
index 1b9a3c8..0bb55fd 100644
--- a/src/N_m3u8DL-RE.Parser/Extractor/HLSExtractor.cs
+++ b/src/N_m3u8DL-RE.Parser/Extractor/HLSExtractor.cs
@@ -23,7 +23,6 @@ namespace N_m3u8DL_RE.Parser.Extractor
         private string BaseUrl = string.Empty;
         private string M3u8Content = string.Empty;
         private bool MasterM3u8Flag = false;
-        private bool FirstFetchFlag = true;
 
         public ParserConfig ParserConfig { get; set; }
 
@@ -84,14 +83,10 @@ namespace N_m3u8DL_RE.Parser.Extractor
             return url;
         }
 
-        private bool IsMaster()
-        {
-            MasterM3u8Flag = M3u8Content.Contains(HLSTags.ext_x_stream_inf);
-            return MasterM3u8Flag;
-        }
-
         private async Task<List<StreamSpec>> ParseMasterListAsync()
         {
+            MasterM3u8Flag = true;
+
             List<StreamSpec> streams = new List<StreamSpec>();
 
             using StringReader sr = new StringReader(M3u8Content);
@@ -475,7 +470,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
         {
             this.M3u8Content = rawText;
             this.PreProcessContent();
-            if (IsMaster())
+            if (M3u8Content.Contains(HLSTags.ext_x_stream_inf))
             {
                 Logger.Warn(ResString.masterM3u8Found);
                 var lists = await ParseMasterListAsync();
@@ -523,30 +518,44 @@ namespace N_m3u8DL_RE.Parser.Extractor
             this.PreProcessContent();
         }
 
-        public async Task FetchPlayListAsync(List<StreamSpec> lists)
+        /// <summary>
+        /// 从Master链接中刷新各个流的URL
+        /// </summary>
+        /// <param name="lists"></param>
+        /// <returns></returns>
+        private async Task RefreshUrlFromMaster(List<StreamSpec> lists)
         {
-            //首次加载不需要刷新URL
-            if (!FirstFetchFlag && MasterM3u8Flag)
+            //重新加载master m3u8, 刷新选中流的URL
+            await LoadM3u8FromUrlAsync(ParserConfig.Url);
+            var newStreams = await ParseMasterListAsync();
+            newStreams = newStreams.DistinctBy(p => p.Url).ToList();
+            foreach (var l in lists)
             {
-                //重新加载master m3u8, 刷新选中流的URL
-                await LoadM3u8FromUrlAsync(ParserConfig.Url);
-                var newStreams = await ParseMasterListAsync();
-                newStreams = newStreams.DistinctBy(p => p.Url).ToList();
-                foreach (var l in lists)
+                var match = newStreams.Where(n => n.ToShortString() == l.ToShortString());
+                if (match.Any())
                 {
-                    var match = newStreams.Where(n => n.ToShortString() == l.ToShortString());
-                    if (match.Any())
-                    {
-                        Logger.DebugMarkUp($"{l.Url} => {match.First().Url}");
-                        l.Url = match.First().Url;
-                    }
+                    Logger.DebugMarkUp($"{l.Url} => {match.First().Url}");
+                    l.Url = match.First().Url;
                 }
             }
+        }
 
+        public async Task FetchPlayListAsync(List<StreamSpec> lists)
+        {
             for (int i = 0; i < lists.Count; i++)
             {
-                //重新加载m3u8
-                await LoadM3u8FromUrlAsync(lists[i].Url!);
+                try
+                {
+                    //直接重新加载m3u8
+                    await LoadM3u8FromUrlAsync(lists[i].Url!);
+                }
+                catch (HttpRequestException) when (MasterM3u8Flag == true)
+                {
+                    Logger.WarnMarkUp("Can not load m3u8. Try refreshing url from master url...");
+                    //当前URL无法加载 尝试从Master链接中刷新URL
+                    await RefreshUrlFromMaster(lists);
+                    await LoadM3u8FromUrlAsync(lists[i].Url!);
+                }
 
                 var newPlaylist = await ParseListAsync();
                 if (lists[i].Playlist?.MediaInit != null)
@@ -570,7 +579,6 @@ namespace N_m3u8DL_RE.Parser.Extractor
 
         public async Task RefreshPlayListAsync(List<StreamSpec> streamSpecs)
         {
-            FirstFetchFlag = false;
             await FetchPlayListAsync(streamSpecs);
         }
     }
diff --git a/src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs b/src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs
index d21e89d..66c9382 100644
--- a/src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs
+++ b/src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs
@@ -18,7 +18,7 @@ namespace N_m3u8DL_RE.CommandLine
 {
     internal partial class CommandInvoker
     {
-        public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20221221";
+        public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20230111";
 
         [GeneratedRegex("((best|worst)\\d*|all)")]
         private static partial Regex ForStrRegex();