Merge pull request #85 from Syriiin/add-logging

Add simple logging for beatmap downloads
Syriiin · Oct 23, 2024 · 0dd27d2 · 0dd27d2
2 parents 68e2fd8 + 758ccfb
commit 0dd27d2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Difficalcy/DifficalcyStartup.cs b/Difficalcy/DifficalcyStartup.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.OpenApi.Models;
 using StackExchange.Redis;
 
@@ -31,6 +32,14 @@ public void ConfigureServices(IServiceCollection services)
                 c.SwaggerDoc("v1", new OpenApiInfo { Title = OpenApiTitle, Version = OpenApiVersion });
             });
 
+            services.AddLogging(options =>
+            {
+                options.AddSimpleConsole(console =>
+                {
+                    console.TimestampFormat = "[HH:mm:ss] ";
+                });
+            });
+
             var redisConfig = Configuration["REDIS_CONFIGURATION"];
             ICache cache;
             if (redisConfig == null)

diff --git a/Difficalcy/Services/WebBeatmapProvider.cs b/Difficalcy/Services/WebBeatmapProvider.cs
@@ -2,10 +2,11 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 
 namespace Difficalcy.Services
 {
-    public class WebBeatmapProvider(IConfiguration configuration) : IBeatmapProvider
+    public class WebBeatmapProvider(IConfiguration configuration, ILogger<WebBeatmapProvider> logger) : IBeatmapProvider
     {
         private readonly string _beatmapDirectory = configuration["BEATMAP_DIRECTORY"];
         private readonly string _downloadMissingBeatmaps = configuration["DOWNLOAD_MISSING_BEATMAPS"];
@@ -17,16 +18,25 @@ public async Task EnsureBeatmap(string beatmapId)
             if (!File.Exists(beatmapPath))
             {
                 if (_downloadMissingBeatmaps != "true")
+                {
+                    logger.LogWarning("Beatmap {BeatmapId} not found and downloading is disabled", beatmapId);
                     throw new BeatmapNotFoundException(beatmapId);
+                }
+
+                logger.LogInformation("Downloading beatmap {BeatmapId}", beatmapId);
 
                 using var response = await _httpClient.GetAsync($"https://osu.ppy.sh/osu/{beatmapId}");
                 if (!response.IsSuccessStatusCode || response.Content.Headers.ContentLength == 0)
+                {
+                    logger.LogWarning("Failed to download beatmap {BeatmapId}", beatmapId);
                     throw new BeatmapNotFoundException(beatmapId);
+                }
 
                 using var fs = new FileStream(beatmapPath, FileMode.CreateNew);
                 await response.Content.CopyToAsync(fs);
                 if (fs.Length == 0)
                 {
+                    logger.LogWarning("Downloaded beatmap {BeatmapId} was empty, deleting", beatmapId);
                     fs.Close();
                     File.Delete(beatmapPath);
                     throw new BeatmapNotFoundException(beatmapId);