added Microsoft.Extensions.Logging.ILogger and removed self implement…

…ed ILogger file

src/Downloader.Test/Downloader.Test.csproj

@@ -29,6 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">

src/Downloader.Test/Helper/FileLogger.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -12,7 +13,7 @@ namespace Downloader.Extensions.Logging;
 public class FileLogger : ILogger, IDisposable
 {
     private volatile bool _disposed;
-    private SemaphoreSlim _semaphore;
+    private readonly SemaphoreSlim _semaphore;
     protected readonly ConcurrentQueue<string> LogQueue;
     protected string LogPath;
     protected StreamWriter LogStream;
@@ -41,51 +42,51 @@ public FileLogger(string logPath)
 
     public void LogDebug(string message)
     {
-        Log(nameof(LogDebug), message);
+        Log(LogLevel.Information, message);
     }
 
     public void LogInfo(string message)
     {
-        Log(nameof(LogInfo), message);
+        Log(LogLevel.Information, message);
     }
 
     public void LogWarning(string message)
     {
-        Log(nameof(LogWarning), message);
+        Log(LogLevel.Warning, message);
     }
 
     public void LogError(string message)
     {
-        Log(nameof(LogError), message);
+        Log(LogLevel.Error, message);
     }
 
     public void LogError(Exception exception, string message)
     {
-        Log(nameof(LogError), message, exception);
+        Log(LogLevel.Error, message, exception);
     }
 
     public void LogCritical(string message)
     {
-        Log(nameof(LogCritical), message);
+        Log(LogLevel.Critical, message);
     }
 
     public void LogCritical(Exception exception, string message)
     {
-        Log(nameof(LogCritical), message, exception);
+        Log(LogLevel.Critical, message, exception);
     }
 
-    protected void Log(string logType, string message, Exception exception = null)
+    protected void Log(LogLevel logLevel, string message, Exception exception = null)
     {
         if (!_disposed)
         {
-            LogQueue.Enqueue(Formatter(logType, message, exception));
+            LogQueue.Enqueue(Formatter(logLevel, message, exception));
             _semaphore.Release();
         }
     }
 
-    public virtual string Formatter(string logType, string message, Exception exception)
+    public virtual string Formatter(LogLevel logLevel, string message, Exception exception)
     {
-        var log = $"{DateTime.Now:s} | {logType} | {message}";
+        var log = $"{DateTime.Now:s} | {logLevel} | {message}";
         if (exception is not null)
         {
             log += " | " + exception.Message + ": " + exception.StackTrace;
@@ -138,4 +139,27 @@ private static Stream CreateFile(string filename)
 
         return new FileStream(filename, FileMode.OpenOrCreate, FileAccess.Write, FileShare.ReadWrite | FileShare.Delete);
     }
+
+    public IDisposable BeginScope<TState>(TState state) where TState : notnull
+    {
+        throw new NotImplementedException();
+    }
+
+    public bool IsEnabled(LogLevel logLevel)
+    {
+        return true;
+    }
+
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+    {
+        if (!IsEnabled(logLevel))
+        {
+            return;
+        }
+
+        var logMessage = formatter(state, exception);
+        var logEntry = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ss.fffZ} [{logLevel}] {logMessage}{Environment.NewLine}";
+
+        Log(logLevel, logEntry, exception);
+    }
 }

src/Downloader/AbstractDownloadService.cs

@@ -1,5 +1,5 @@
 using Downloader.Extensions.Helpers;
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

src/Downloader/ChunkDownloader.cs

@@ -1,5 +1,5 @@
 using Downloader.Extensions.Helpers;
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.ComponentModel;
 using System.IO;

src/Downloader/ConcurrentPacketBuffer.cs

@@ -1,4 +1,4 @@
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections;
 using System.Collections.Concurrent;

src/Downloader/ConcurrentStream.cs

@@ -1,4 +1,4 @@
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.IO;
 using System.Threading;

src/Downloader/DownloadPackage.cs

@@ -1,4 +1,4 @@
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Linq;
 using System.Threading.Tasks;

src/Downloader/DownloadService.cs

@@ -62,7 +62,6 @@ private async Task SendDownloadCompletionSignal(DownloadStatus state, Exception
         Package.IsSaveComplete = state == DownloadStatus.Completed;
         Status = state;
         await (Package?.Storage?.FlushAsync() ?? Task.FromResult(0)).ConfigureAwait(false);
-        await (_logger?.FlushAsync() ?? Task.FromResult(0)).ConfigureAwait(false);
         OnDownloadFileCompleted(new AsyncCompletedEventArgs(error, isCancelled, Package));
     }
 

src/Downloader/Downloader.csproj

@@ -71,6 +71,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 

src/Downloader/IDownloadService.cs

@@ -1,4 +1,4 @@
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.ComponentModel;
 using System.IO;

src/Downloader/TaskStateManagement.cs

@@ -1,4 +1,4 @@
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Runtime.CompilerServices;

src/Samples/Downloader.Sample/Program.Config.cs

@@ -15,7 +15,7 @@ private static DownloadConfiguration GetDownloadConfiguration()
             ChunkCount = 8,             // file parts to download, default value is 1
             MaximumBytesPerSecond = 1024 * 1024 * 10,  // download speed limited to 10MB/s, default values is zero or unlimited
             MaxTryAgainOnFailover = 5,  // the maximum number of times to fail
-            MaximumMemoryBufferBytes = 1024 * 1024 * 200, // release memory buffer after each 200MB
+            MaximumMemoryBufferBytes = 1024 * 1024 * 500, // release memory buffer after each 500MB
             ParallelDownload = true,    // download parts of file as parallel or not. Default value is false
             ParallelCount = 8,          // number of parallel downloads. The default value is the same as the chunk count
             Timeout = 3000,             // timeout (millisecond) per stream block reader, default value is 1000

src/Samples/Downloader.Sample/Program.cs

@@ -1,4 +1,4 @@
-using Downloader.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using ShellProgressBar;
 using System;