Fixes & Improvements: logs, dedupe, private methods

L-U-M-E-N · Mar 1, 2025 · 7f48807 · 7f48807
1 parent ee28e8b
commit 7f48807
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/Lumen.Modules.Youtube.Module/Lumen.Modules.Youtube.Module.csproj b/Lumen.Modules.Youtube.Module/Lumen.Modules.Youtube.Module.csproj
@@ -7,10 +7,11 @@
 		<AssemblyVersion>1.0.0</AssemblyVersion>
 		<FileVersion>1.0.0</FileVersion>
 		<Version>1.0.0</Version>
+		<UserSecretsId>12b396a4-a415-424f-99fe-819d74368c2b</UserSecretsId>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Lumen.Modules.Sdk" Version="0.4.0" />
+		<PackageReference Include="Lumen.Modules.Sdk" Version="0.5.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
 	</ItemGroup>
 

diff --git a/Lumen.Modules.Youtube.Module/YoutubeModule.cs b/Lumen.Modules.Youtube.Module/YoutubeModule.cs
@@ -6,7 +6,7 @@
 using Microsoft.EntityFrameworkCore;
 
 namespace Lumen.Modules.Youtube.Module {
-    public class YoutubeModule(LumenModuleRunsOnFlag runsOn, IEnumerable<ConfigEntry> configEntries, ILogger<LumenModuleBase> logger, IServiceProvider provider) : LumenModuleBase(runsOn, configEntries, logger) {
+    public class YoutubeModule(IEnumerable<ConfigEntry> configEntries, ILogger<LumenModuleBase> logger, IServiceProvider provider) : LumenModuleBase(configEntries, logger, provider) {
         public const string PLAYLIST_ID = nameof(PLAYLIST_ID);
         public const string API_KEY = nameof(API_KEY);
 
@@ -16,18 +16,25 @@ public override Task InitAsync(LumenModuleRunsOnFlag currentEnv) {
         }
 
         public override async Task RunAsync(LumenModuleRunsOnFlag currentEnv) {
-            var (amount, duration) = await YoutubeAPIHelper.ComputeWatchlistStatus(GetAPIKey(), GetPlaylistId());
-
-            var timespan = TimeSpan.FromSeconds(duration);
-            Console.WriteLine($"{DateTime.Now} - Stats: {amount} videos, {(int)timespan.TotalHours}:{timespan:mm\\:ss}");
-
-            switch (currentEnv) {
-                case LumenModuleRunsOnFlag.API:
-                    await RunAPIAsync(amount, duration);
-                    break;
-                case LumenModuleRunsOnFlag.UI:
-                    await RunUIAsync(amount, duration);
-                    break;
+            try {
+                logger.LogTrace($"[{nameof(YoutubeModule)}] Running tasks ...");
+                var (amount, duration) = await YoutubeAPIHelper.ComputeWatchlistStatus(GetAPIKey(), GetPlaylistId());
+
+                var timespan = TimeSpan.FromSeconds(duration);
+                logger.LogTrace($"[{nameof(YoutubeModule)}] {DateTime.Now} - Stats: {amount} videos, {(int)timespan.TotalHours}:{timespan:mm\\:ss}");
+
+                switch (currentEnv) {
+                    case LumenModuleRunsOnFlag.API:
+                        await RunAPIAsync(amount, duration);
+                        break;
+                    case LumenModuleRunsOnFlag.UI:
+                        await RunUIAsync(amount, duration);
+                        break;
+                }
+
+                logger.LogTrace($"[{nameof(YoutubeModule)}] Running tasks ... Done!");
+            } catch (Exception ex) {
+                logger.LogError(ex, $"[{nameof(YoutubeModule)}] Error when running tasks.");
             }
         }
 
@@ -49,26 +56,30 @@ private string GetAPIKey() {
             return configEntry.ConfigValue;
         }
 
-        public async Task RunUIAsync(int amount, int duration) {
+        private async Task RunUIAsync(int amount, int duration) {
             // TODO
         }
 
-        public async Task RunAPIAsync(int amount, int duration) {
+        private async Task RunAPIAsync(int amount, int duration) {
             using var scope = provider.CreateScope();
             var context = provider.GetRequiredService<YoutubeContext>();
 
-            context.YoutubeWatchlist.Add(new YoutubeWatchlistPointInTime {
-                Time = DateTime.UtcNow,
-                AmountVideos = amount,
-                SecondsDuration = duration
-            });
-            await context.SaveChangesAsync();
+            var lastEntry = context.YoutubeWatchlist.OrderBy(x => x.Time).LastOrDefault();
+            if (lastEntry is null || lastEntry.AmountVideos != amount || lastEntry.SecondsDuration != duration) {
+                logger.LogTrace($"[{nameof(YoutubeModule)}] Saving current watchlist status.");
+                context.YoutubeWatchlist.Add(new YoutubeWatchlistPointInTime {
+                    Time = DateTime.UtcNow,
+                    AmountVideos = amount,
+                    SecondsDuration = duration
+                });
+                await context.SaveChangesAsync();
+            }
         }
 
         public override bool ShouldRunNow(LumenModuleRunsOnFlag currentEnv) {
             return currentEnv switch {
                 LumenModuleRunsOnFlag.UI => DateTime.UtcNow.Second == 0 && DateTime.UtcNow.Minute == 27,
-                LumenModuleRunsOnFlag.API => true, // DateTime.UtcNow.Second == 0 && DateTime.UtcNow.Minute % 5 == 0,
+                LumenModuleRunsOnFlag.API => DateTime.UtcNow.Second == 0 && DateTime.UtcNow.Minute % 5 == 0,
                 _ => false,
             };
         }