优化m4s命名

Author: nilaoda

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

@@ -337,9 +337,12 @@ public async Task<List<StreamSpec>> ExtractStreamsAsync(string rawText)
                                     var _repeatCount = Convert.ToInt64(_repeatCountStr);
                                     varDic[DASHTags.TemplateTime] = currentTime;
                                     varDic[DASHTags.TemplateNumber] = segNumber++;
-                                    var mediaUrl = ParserUtil.ReplaceVars(ParserUtil.CombineURL(segBaseUrl, media!), varDic);
+                                    var oriUrl = ParserUtil.CombineURL(segBaseUrl, media!);
+                                    var mediaUrl = ParserUtil.ReplaceVars(oriUrl, varDic);
                                     MediaSegment mediaSegment = new();
                                     mediaSegment.Url = mediaUrl;
+                                    if (oriUrl.Contains(DASHTags.TemplateTime))
+                                        mediaSegment.NameFromVar = currentTime.ToString();
                                     mediaSegment.Duration = _duration / (double)timescale;
                                     mediaSegment.Index = segIndex++;
                                     streamSpec.Playlist.MediaParts[0].MediaSegments.Add(mediaSegment);
@@ -354,10 +357,13 @@ public async Task<List<StreamSpec>> ExtractStreamsAsync(string rawText)
                                         MediaSegment _mediaSegment = new();
                                         varDic[DASHTags.TemplateTime] = currentTime;
                                         varDic[DASHTags.TemplateNumber] = segNumber++;
-                                        var _mediaUrl = ParserUtil.ReplaceVars(ParserUtil.CombineURL(segBaseUrl, media!), varDic);
+                                        var _oriUrl = ParserUtil.CombineURL(segBaseUrl, media!);
+                                        var _mediaUrl = ParserUtil.ReplaceVars(_oriUrl, varDic);
                                         _mediaSegment.Url = _mediaUrl;
                                         _mediaSegment.Index = segIndex++;
                                         _mediaSegment.Duration = _duration / (double)timescale;
+                                        if (_oriUrl.Contains(DASHTags.TemplateTime))
+                                            _mediaSegment.NameFromVar = currentTime.ToString();
                                         streamSpec.Playlist.MediaParts[0].MediaSegments.Add(_mediaSegment);
                                     }
                                     currentTime += _duration;
@@ -387,9 +393,12 @@ public async Task<List<StreamSpec>> ExtractStreamsAsync(string rawText)
                                 for (long index = startNumber, segIndex = 0; index < startNumber + totalNumber; index++, segIndex++)
                                 {
                                     varDic[DASHTags.TemplateNumber] = index;
-                                    var mediaUrl = ParserUtil.ReplaceVars(ParserUtil.CombineURL(segBaseUrl, media!), varDic);
+                                    var oriUrl = ParserUtil.CombineURL(segBaseUrl, media!);
+                                    var mediaUrl = ParserUtil.ReplaceVars(oriUrl, varDic);
                                     MediaSegment mediaSegment = new();
                                     mediaSegment.Url = mediaUrl;
+                                    if (oriUrl.Contains(DASHTags.TemplateNumber))
+                                        mediaSegment.NameFromVar = index.ToString();
                                     mediaSegment.Index = isLive ? index : segIndex; //直播直接用startNumber
                                     mediaSegment.Duration = duration / (double)timescale;
                                     streamSpec.Playlist.MediaParts[0].MediaSegments.Add(mediaSegment);

src/N_m3u8DL-RE/DownloadManager/SimpleLiveRecordManager2.cs

@@ -98,13 +98,19 @@ private long GetUnixTimestamp(DateTime dateTime)
         /// <returns></returns>
         private string GetSegmentName(MediaSegment segment, bool allHasDatetime, bool allSamePath)
         {
+            if (!string.IsNullOrEmpty(segment.NameFromVar))
+            {
+                return segment.NameFromVar;
+            }
+
             bool hls = StreamExtractor.ExtractorType == ExtractorType.HLS;
 
             string name = OtherUtil.GetFileNameFromInput(segment.Url, false);
             if (allSamePath)
             {
                 name = OtherUtil.GetValidFileName(segment.Url.Split('?').Last(), "_");
             }
+
             if (hls && allHasDatetime)
             {
                 name = GetUnixTimestamp(segment.DateTime!.Value).ToString();