Merge branch 'dev'

Recorder-moe · Jun 29, 2024 · 09a08cd · 09a08cd
2 parents cfc6296 + b9e6e3a
commit 09a08cd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 185 deletions.
diff --git a/Helper/NameHelper.cs b/Helper/NameHelper.cs
@@ -81,7 +81,7 @@ public static string PlatformType(string videoId, string platform)
                 return platform switch
                 {
                     "Youtube" or IYtarchiveService.Name or IYtdlpService.Name
-                        => videoId.TrimStart('Y'),
+                        => videoId.StartsWith('Y') ? videoId[1..] : videoId,
                     "Twitch" or IStreamlinkService.Name
                         => videoId.StartsWith("TW") ? videoId[2..] : videoId,
                     "Twitcasting" or ITwitcastingRecorderService.Name
@@ -97,13 +97,13 @@ public static string DatabaseType(string videoId, string platform)
                 return platform switch
                 {
                     "Youtube" or IYtarchiveService.Name or IYtdlpService.Name
-                        => videoId.StartsWith('Y') ? videoId : "Y" + videoId,
+                        => "Y" + videoId,
                     "Twitch" or IStreamlinkService.Name
-                        => videoId.StartsWith("TW") ? videoId : "TW" + videoId,
+                        => "TW" + videoId,
                     "Twitcasting" or ITwitcastingRecorderService.Name
-                        => videoId.StartsWith("TC") ? videoId : "TC" + videoId,
+                        => "TC" + videoId,
                     "FC2" or IFc2LiveDLService.Name
-                        => videoId.StartsWith("FC") ? videoId : "FC" + videoId,
+                        => "FC" + videoId,
                     _ => throw new NotImplementedException()
                 };
             }

diff --git a/Program.cs b/Program.cs
@@ -10,11 +10,12 @@
 using LivestreamRecorderService.Workers;
 using Microsoft.Extensions.Options;
 using Serilog;
-using Serilog.Debugging;
 
 // ReSharper disable SwitchStatementHandlesSomeKnownEnumValuesWithDefault
 
 #if !RELEASE
+using Serilog.Debugging;
+
 SelfLog.Enable(Console.WriteLine);
 #endif
 
@@ -119,7 +120,6 @@
 
                 services.AddSingleton<IUploaderService, UploaderService>();
 
-                services.AddHostedService<MigrationWorker>();
                 services.AddHostedService<MonitorWorker>();
                 services.AddHostedService<RecordWorker>();
                 services.AddSingleton<RecordService>();

diff --git a/ScopedServices/PlatformService/TwitchService.cs b/ScopedServices/PlatformService/TwitchService.cs
@@ -192,7 +192,7 @@ public override async Task UpdateVideoDataAsync(Video video, CancellationToken c
 
     public override async Task UpdateChannelDataAsync(Channel channel, CancellationToken stoppingToken)
     {
-        string? channelId = channel.id;
+        string channelId = channel.id;
         GetUsersResponse? usersResponse =
             await twitchApi.Helix.Users.GetUsersAsync(logins: [NameHelper.ChangeId.ChannelId.PlatformType(channelId, PlatformName)]);
 

diff --git a/Workers/MigrationWorker.cs b/Workers/MigrationWorker.cs
diff --git a/Workers/MonitorWorker.cs b/Workers/MonitorWorker.cs
@@ -32,14 +32,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             {
                 // KubernetesService needed to be initialized first
                 IJobService ___ = scope.ServiceProvider.GetRequiredService<IJobService>();
-                YoutubeService youtubeSerivce = scope.ServiceProvider.GetRequiredService<YoutubeService>();
+                YoutubeService youtubeService = scope.ServiceProvider.GetRequiredService<YoutubeService>();
                 TwitcastingService twitcastingService = scope.ServiceProvider.GetRequiredService<TwitcastingService>();
                 Fc2Service fc2Service = scope.ServiceProvider.GetRequiredService<Fc2Service>();
                 VideoService videoService = scope.ServiceProvider.GetRequiredService<VideoService>();
 
                 #endregion
 
-                await MonitorPlatformAsync(youtubeSerivce, videoService, stoppingToken);
+                await MonitorPlatformAsync(youtubeService, videoService, stoppingToken);
                 await MonitorPlatformAsync(twitcastingService, videoService, stoppingToken);
                 await MonitorPlatformAsync(fc2Service, videoService, stoppingToken);
 
@@ -59,7 +59,7 @@ private async Task MonitorPlatformAsync(IPlatformService platformService, VideoS
     {
         if (!platformService.StepInterval(Interval)) return;
 
-        List<Channel>? channels = await platformService.GetMonitoringChannels();
+        List<Channel> channels = await platformService.GetMonitoringChannels();
         logger.LogTrace("Get {channelCount} channels for {platform}", channels.Count, platformService.PlatformName);
         await updateVideosDataFromSource();
         await updateScheduledVideosStatus();