refactor: replace ytarchive with yt-dlp live-from-start (#12)

bot0419 · web-flow · commit cdfce8a4c807 · 2026-01-21T23:17:11.000+08:00
## 內容 - 移除 ytarchive 服務與 DI 註冊，改由 yt-dlp 支援 live-from-start 直播錄製 - 更新 IDownloaderService 介面與各 downloader 實作 - 調整 YouTube 錄製流程與 NameHelper 對應，清理設定字典 ## 變更檔案 - Interfaces/IDownloaderService.cs - SingletonServices/Downloader/YtdlpService.cs - SingletonServices/Downloader/FC2LiveDLService.cs - SingletonServices/Downloader/StreamlinkService.cs - SingletonServices/Downloader/TwitcastingRecorderService.cs - SingletonServices/Downloader/YtarchiveService.cs (removed) - SingletonServices/RecordService.cs - ScopedServices/PlatformService/YoutubeService.cs - Helper/NameHelper.cs - Program.cs - LivestreamRecorderService.sln.DotSettings ## 測試 - `dotnet build -c ApacheCouchDB_Release` (失敗: TOOLBOX_PATH 未設定) - `dotnet build -c AzureCosmosDB_Release` (失敗: TOOLBOX_PATH 未設定) Resolves #11 Signed-off-by: Jim Chen <Jim@ChenJ.im>
diff --git a/Helper/NameHelper.cs b/Helper/NameHelper.cs
@@ -25,7 +25,7 @@ public static string GetFileName(Video video, string platform)
     {
         return platform switch
         {
-            "Youtube" or IYtarchiveService.Name or IYtdlpService.Name => $"{video.id}.mp4",
+            "Youtube" or IYtdlpService.Name => $"{video.id}.mp4",
             "Twitch" or IStreamlinkService.Name => $"{video.id}.mp4",
             "Twitcasting" or ITwitcastingRecorderService.Name => $"{video.ChannelId}_{DateTime.UtcNow:yyyyMMddHHmmss}.mp4",
             "FC2" or IFc2LiveDLService.Name => $"{video.ChannelId}_{DateTime.UtcNow:yyyyMMddHHmmss}.mp4",
@@ -45,7 +45,7 @@ public static string PlatformType(string channelId, string platform)
             {
                 return platform switch
                 {
-                    "Youtube" or IYtarchiveService.Name or IYtdlpService.Name
+                    "Youtube" or IYtdlpService.Name
                         => channelId, // Youtube channelId already starts with "UC"
                     "Twitch" or IStreamlinkService.Name
                         => channelId.StartsWith("TW") ? channelId[2..] : channelId,
@@ -61,7 +61,7 @@ public static string DatabaseType(string channelId, string platform)
             {
                 return platform switch
                 {
-                    "Youtube" or IYtarchiveService.Name or IYtdlpService.Name
+                    "Youtube" or IYtdlpService.Name
                         => channelId, // Youtube channelId always starts with "UC"
                     "Twitch" or IStreamlinkService.Name
                         => channelId.StartsWith("TW") ? channelId : "TW" + channelId,
@@ -80,7 +80,7 @@ public static string PlatformType(string videoId, string platform)
             {
                 return platform switch
                 {
-                    "Youtube" or IYtarchiveService.Name or IYtdlpService.Name
+                    "Youtube" or IYtdlpService.Name
                         => videoId.StartsWith('Y') ? videoId[1..] : videoId,
                     "Twitch" or IStreamlinkService.Name
                         => videoId.StartsWith("TW") ? videoId[2..] : videoId,
@@ -96,7 +96,7 @@ public static string DatabaseType(string videoId, string platform)
             {
                 return platform switch
                 {
-                    "Youtube" or IYtarchiveService.Name or IYtdlpService.Name
+                    "Youtube" or IYtdlpService.Name
                         => "Y" + videoId,
                     "Twitch" or IStreamlinkService.Name
                         => "TW" + videoId,
diff --git a/Interfaces/IDownloaderService.cs b/Interfaces/IDownloaderService.cs
@@ -7,6 +7,7 @@ public interface IDownloaderService
     Task CreateJobAsync(Video video,
                         bool useCookiesFile = false,
                         string? url = null,
+                        bool liveFromStart = false,
                         CancellationToken cancellation = default);
 }
 
@@ -25,11 +26,6 @@ public interface ITwitcastingRecorderService : IDownloaderService
     public const string Name = "twitcastingrecorder";
 }
 
-public interface IYtarchiveService : IDownloaderService
-{
-    public const string Name = "ytarchive";
-}
-
 public interface IYtdlpService : IDownloaderService
 {
     public const string Name = "ytdlp";
diff --git a/LivestreamRecorderService.sln.DotSettings b/LivestreamRecorderService.sln.DotSettings
@@ -4,4 +4,4 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=streamid/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=telop/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=twitcasting/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=ytarchive/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	</wpf:ResourceDictionary>
diff --git a/Program.cs b/Program.cs
@@ -112,7 +112,6 @@
 
                 services.AddDiscordService(configuration);
 
-                services.AddSingleton<IYtarchiveService, YtarchiveService>();
                 services.AddSingleton<IYtdlpService, YtdlpService>();
                 services.AddSingleton<IStreamlinkService, StreamlinkService>();
                 services.AddSingleton<ITwitcastingRecorderService, TwitcastingRecorderService>();
diff --git a/ScopedServices/PlatformService/YoutubeService.cs b/ScopedServices/PlatformService/YoutubeService.cs
@@ -26,7 +26,7 @@ public class YoutubeService(
     RssService rSsService,
     IStorageService storageService,
     // ReSharper disable once SuggestBaseTypeForParameterInConstructor
-    IYtarchiveService ytarchiveService,
+    IYtdlpService ytdlpService,
     IHttpClientFactory httpClientFactory,
     IOptions<DiscordOption> discordOptions,
     IServiceProvider serviceProvider) : PlatformService(channelRepository,
@@ -434,9 +434,10 @@ public override async Task UpdateVideoDataAsync(Video video, CancellationToken c
 
         if (video.Status == VideoStatus.WaitingToRecord)
         {
-            await ytarchiveService.CreateJobAsync(video: video,
-                                                  useCookiesFile: channel?.UseCookiesFile == true,
-                                                  cancellation: cancellation);
+            await ytdlpService.CreateJobAsync(video: video,
+                                              useCookiesFile: channel?.UseCookiesFile == true,
+                                              liveFromStart: true,
+                                              cancellation: cancellation);
 
             video.Status = VideoStatus.Recording;
             logger.LogInformation("{videoId} is now lived! Start recording.", video.id);
diff --git a/SingletonServices/Downloader/FC2LiveDLService.cs b/SingletonServices/Downloader/FC2LiveDLService.cs
@@ -11,6 +11,7 @@ public class Fc2LiveDLService(IJobService jobService) : IFc2LiveDLService
     public Task CreateJobAsync(Video video,
                                bool useCookiesFile = false,
                                string? url = null,
+                               bool liveFromStart = false,
                                CancellationToken cancellation = default)
     {
         url ??= $"https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}";
diff --git a/SingletonServices/Downloader/StreamlinkService.cs b/SingletonServices/Downloader/StreamlinkService.cs
@@ -11,6 +11,7 @@ public class StreamlinkService(IJobService jobService) : IStreamlinkService
     public Task CreateJobAsync(Video video,
                                bool useCookiesFile = false,
                                string? url = null,
+                               bool liveFromStart = false,
                                CancellationToken cancellation = default)
     {
         url ??= $"twitch.tv/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}";
diff --git a/SingletonServices/Downloader/TwitcastingRecorderService.cs b/SingletonServices/Downloader/TwitcastingRecorderService.cs
@@ -11,6 +11,7 @@ public class TwitcastingRecorderService(IJobService jobService) : ITwitcastingRe
     public Task CreateJobAsync(Video video,
                                bool useCookiesFile = false,
                                string? url = null,
+                               bool liveFromStart = false,
                                CancellationToken cancellation = default)
     {
         string channelId = url?.Split('/', StringSplitOptions.RemoveEmptyEntries).Last()
diff --git a/SingletonServices/Downloader/YtarchiveService.cs b/SingletonServices/Downloader/YtarchiveService.cs
diff --git a/SingletonServices/Downloader/YtdlpService.cs b/SingletonServices/Downloader/YtdlpService.cs
@@ -11,6 +11,7 @@ public class YtdlpService(IJobService jobService) : IYtdlpService
     public Task CreateJobAsync(Video video,
                                bool useCookiesFile = false,
                                string? url = null,
+                               bool liveFromStart = false,
                                CancellationToken cancellation = default)
     {
         string instanceName = NameHelper.GetInstanceName(Name, video.id);
@@ -37,6 +38,8 @@ public Task CreateJobAsync(Video video,
             url
         ];
 
+        if (liveFromStart) args = ["--live-from-start", .. args];
+
         // Workaround for twitcasting ERROR:
         // Initialization fragment found after media fragments, unable to download
         // https://github.com/yt-dlp/yt-dlp/issues/5497
@@ -68,9 +71,10 @@ public Task CreateJobAsync(Video video,
             command = ["dumb-init", "--", "sh", "-c"];
 
             // cp under mountPath to make sure the permission is writable
+            string liveFromStartArg = liveFromStart ? "--live-from-start " : string.Empty;
             args =
             [
-                $"cp -r /cookies {mountPath}/cookies && yt-dlp --ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part --cookies {mountPath}/cookies/{video.ChannelId}.txt -o '{fileName}' '{url}'"
+                $"cp -r /cookies {mountPath}/cookies && yt-dlp {liveFromStartArg}--ignore-config --retries 30 --concurrent-fragments 16 --merge-output-format mp4 -S '+proto:http,+codec:h264' --embed-thumbnail --embed-metadata --no-part --cookies {mountPath}/cookies/{video.ChannelId}.txt -o '{fileName}' '{url}'"
             ];
 
             // Workaround for twitcasting ERROR:
diff --git a/SingletonServices/RecordService.cs b/SingletonServices/RecordService.cs
@@ -18,12 +18,10 @@ public class RecordService
     private readonly ILogger<RecordWorker> _logger;
     private readonly IStreamlinkService _streamlinkService;
     private readonly ITwitcastingRecorderService _twitcastingRecorderService;
-    private readonly IYtarchiveService _ytarchiveService;
     private readonly IYtdlpService _ytdlpService;
 
     public RecordService(ILogger<RecordWorker> logger,
                          IJobService jobService,
-                         IYtarchiveService ytarchiveService,
                          IYtdlpService ytdlpService,
                          ITwitcastingRecorderService twitcastingRecorderService,
                          IStreamlinkService streamlinkService,
@@ -33,7 +31,6 @@ public RecordService(ILogger<RecordWorker> logger,
     {
         _logger = logger;
         _jobService = jobService;
-        _ytarchiveService = ytarchiveService;
         _ytdlpService = ytdlpService;
         _twitcastingRecorderService = twitcastingRecorderService;
         _streamlinkService = streamlinkService;
@@ -126,9 +123,10 @@ public async Task CreateStartRecordJobAsync(VideoService videoService, ChannelSe
                 switch (video.Source)
                 {
                     case "Youtube":
-                        await _ytarchiveService.CreateJobAsync(
+                        await _ytdlpService.CreateJobAsync(
                             video: video,
                             useCookiesFile: channel?.UseCookiesFile == true,
+                            liveFromStart: true,
                             cancellation: stoppingToken);
 
                         break;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static string GetFileName(Video video, string platform)`
`25`	`25`	`{`
`26`	`26`	`return platform switch`
`27`	`27`	`{`
`28`		`- "Youtube" or IYtarchiveService.Name or IYtdlpService.Name => $"{video.id}.mp4",`
	`28`	`+ "Youtube" or IYtdlpService.Name => $"{video.id}.mp4",`
`29`	`29`	`"Twitch" or IStreamlinkService.Name => $"{video.id}.mp4",`
`30`	`30`	`"Twitcasting" or ITwitcastingRecorderService.Name => $"{video.ChannelId}_{DateTime.UtcNow:yyyyMMddHHmmss}.mp4",`
`31`	`31`	`"FC2" or IFc2LiveDLService.Name => $"{video.ChannelId}_{DateTime.UtcNow:yyyyMMddHHmmss}.mp4",`
`@@ -45,7 +45,7 @@ public static string PlatformType(string channelId, string platform)`
`45`	`45`	`{`
`46`	`46`	`return platform switch`
`47`	`47`	`{`
`48`		`- "Youtube" or IYtarchiveService.Name or IYtdlpService.Name`
	`48`	`+ "Youtube" or IYtdlpService.Name`
`49`	`49`	`=> channelId, // Youtube channelId already starts with "UC"`
`50`	`50`	`"Twitch" or IStreamlinkService.Name`
`51`	`51`	`=> channelId.StartsWith("TW") ? channelId[2..] : channelId,`
`@@ -61,7 +61,7 @@ public static string DatabaseType(string channelId, string platform)`
`61`	`61`	`{`
`62`	`62`	`return platform switch`
`63`	`63`	`{`
`64`		`- "Youtube" or IYtarchiveService.Name or IYtdlpService.Name`
	`64`	`+ "Youtube" or IYtdlpService.Name`
`65`	`65`	`=> channelId, // Youtube channelId always starts with "UC"`
`66`	`66`	`"Twitch" or IStreamlinkService.Name`
`67`	`67`	`=> channelId.StartsWith("TW") ? channelId : "TW" + channelId,`
`@@ -80,7 +80,7 @@ public static string PlatformType(string videoId, string platform)`
`80`	`80`	`{`
`81`	`81`	`return platform switch`
`82`	`82`	`{`
`83`		`- "Youtube" or IYtarchiveService.Name or IYtdlpService.Name`
	`83`	`+ "Youtube" or IYtdlpService.Name`
`84`	`84`	`=> videoId.StartsWith('Y') ? videoId[1..] : videoId,`
`85`	`85`	`"Twitch" or IStreamlinkService.Name`
`86`	`86`	`=> videoId.StartsWith("TW") ? videoId[2..] : videoId,`
`@@ -96,7 +96,7 @@ public static string DatabaseType(string videoId, string platform)`
`96`	`96`	`{`
`97`	`97`	`return platform switch`
`98`	`98`	`{`
`99`		`- "Youtube" or IYtarchiveService.Name or IYtdlpService.Name`
	`99`	`+ "Youtube" or IYtdlpService.Name`
`100`	`100`	`=> "Y" + videoId,`
`101`	`101`	`"Twitch" or IStreamlinkService.Name`
`102`	`102`	`=> "TW" + videoId,`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public interface IDownloaderService`
`7`	`7`	`Task CreateJobAsync(Video video,`
`8`	`8`	`bool useCookiesFile = false,`
`9`	`9`	`string? url = null,`
	`10`	`+ bool liveFromStart = false,`
`10`	`11`	`CancellationToken cancellation = default);`
`11`	`12`	`}`
`12`	`13`
`@@ -25,11 +26,6 @@ public interface ITwitcastingRecorderService : IDownloaderService`
`25`	`26`	`public const string Name = "twitcastingrecorder";`
`26`	`27`	`}`
`27`	`28`
`28`		`-public interface IYtarchiveService : IDownloaderService`
`29`		`-{`
`30`		`- public const string Name = "ytarchive";`
`31`		`-}`
`32`		`-`
`33`	`29`	`public interface IYtdlpService : IDownloaderService`
`34`	`30`	`{`
`35`	`31`	`public const string Name = "ytdlp";`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class Fc2LiveDLService(IJobService jobService) : IFc2LiveDLService`
`11`	`11`	`public Task CreateJobAsync(Video video,`
`12`	`12`	`bool useCookiesFile = false,`
`13`	`13`	`string? url = null,`
	`14`	`+ bool liveFromStart = false,`
`14`	`15`	`CancellationToken cancellation = default)`
`15`	`16`	`{`
`16`	`17`	`url ??= $"https://live.fc2.com/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}";`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class StreamlinkService(IJobService jobService) : IStreamlinkService`
`11`	`11`	`public Task CreateJobAsync(Video video,`
`12`	`12`	`bool useCookiesFile = false,`
`13`	`13`	`string? url = null,`
	`14`	`+ bool liveFromStart = false,`
`14`	`15`	`CancellationToken cancellation = default)`
`15`	`16`	`{`
`16`	`17`	`url ??= $"twitch.tv/{NameHelper.ChangeId.ChannelId.PlatformType(video.ChannelId, Name)}";`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class TwitcastingRecorderService(IJobService jobService) : ITwitcastingRe`
`11`	`11`	`public Task CreateJobAsync(Video video,`
`12`	`12`	`bool useCookiesFile = false,`
`13`	`13`	`string? url = null,`
	`14`	`+ bool liveFromStart = false,`
`14`	`15`	`CancellationToken cancellation = default)`
`15`	`16`	`{`
`16`	`17`	`string channelId = url?.Split('/', StringSplitOptions.RemoveEmptyEntries).Last()`