From d650dc19e37e1e5f49a09b203baa1d6ca146470c Mon Sep 17 00:00:00 2001
From: timerix <timerix11@gmail.com>
Date: Wed, 4 Jan 2023 05:42:44 +0600
Subject: [PATCH] deps updated

---
 VkAudioDownloader.CLI/Program.cs           | 10 +++++++---
 VkAudioDownloader/Helpers/FFMPegHelper.cs  |  4 ++--
 VkAudioDownloader/VkAudioDownloader.csproj |  6 +++---
 VkAudioDownloader/VkClient.cs              | 12 ++++++------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/VkAudioDownloader.CLI/Program.cs b/VkAudioDownloader.CLI/Program.cs
index 621ff79..f4fc643 100644
--- a/VkAudioDownloader.CLI/Program.cs
+++ b/VkAudioDownloader.CLI/Program.cs
@@ -2,9 +2,13 @@
 using System.Linq;
 using DTLib.Dtsod;
 using System.IO;
+using DTLib.Extensions;
 using VkAudioDownloader;
 using DTLib.Logging.New;
 
+Console.InputEncoding = StringConverter.UTF8;
+Console.OutputEncoding = StringConverter.UTF8;
+
 if(!File.Exists("config.dtsod"))
 {
     File.Copy("config.dtsod.default", "config.dtsod");
@@ -16,7 +20,7 @@ var config = VkClientConfig.FromDtsod(new DtsodV23(File.ReadAllText("config.dtso
 var logger = new CompositeLogger(new DefaultLogFormat(true), 
     new ConsoleLogger(), 
             new FileLogger("logs", "VkAudioDownloaer"));
-var _logger = new LoggerContext(logger, "main");
+var _logger = new ContextLogger(logger, "Main");
 _logger.LogDebug("DEBUG LOG ENABLED");
 
 try
@@ -29,7 +33,7 @@ try
     var client = new VkClient(config, logger);
     await client.ConnectAsync();
     
-// getting audio from vk
+    // getting audio from vk
     var audios = client.FindAudio("сталинский костюм").ToArray();
 
     for (var i = 0; i < audios.Length; i++)
@@ -48,5 +52,5 @@ try
 }
 catch (Exception ex)
 {
-    _logger.LogException(ex);
+    _logger.LogError(ex);
 }
diff --git a/VkAudioDownloader/Helpers/FFMPegHelper.cs b/VkAudioDownloader/Helpers/FFMPegHelper.cs
index e3fd2f2..224bf9e 100644
--- a/VkAudioDownloader/Helpers/FFMPegHelper.cs
+++ b/VkAudioDownloader/Helpers/FFMPegHelper.cs
@@ -4,11 +4,11 @@ namespace VkAudioDownloader.Helpers;
 
 public class FFMPegHelper
 {
-    private LoggerContext _logger;
+    private ContextLogger _logger;
     private readonly string ffmpeg;    
     public FFMPegHelper(ILogger logger, string ffmpegDir)
     {
-        _logger = new LoggerContext(logger, nameof(FFMPegHelper));
+        _logger = new ContextLogger(logger, nameof(FFMPegHelper));
         ffmpeg=Path.Concat(ffmpegDir,"ffmpeg");
     }
     
diff --git a/VkAudioDownloader/VkAudioDownloader.csproj b/VkAudioDownloader/VkAudioDownloader.csproj
index 54e0e75..29b2be2 100644
--- a/VkAudioDownloader/VkAudioDownloader.csproj
+++ b/VkAudioDownloader/VkAudioDownloader.csproj
@@ -20,10 +20,10 @@
 
     <!--external dependencies-->
     <ItemGroup>
-        <PackageReference Include="CliWrap" Version="3.5.0" />
+        <PackageReference Include="CliWrap" Version="3.6.0" />
         <PackageReference Include="VkNet.AudioBypassService" Version="1.7.4" />
         <PackageReference Include="VkNet" Version="1.72.0" />
-        <PackageReference Include="DTLib.Dtsod" Version="1.0.1" />
-        <PackageReference Include="DTLib.Logging" Version="1.0.0" />
+        <PackageReference Include="DTLib.Dtsod" Version="1.0.2" />
+        <PackageReference Include="DTLib.Logging" Version="1.0.5" />
     </ItemGroup>
 </Project>
diff --git a/VkAudioDownloader/VkClient.cs b/VkAudioDownloader/VkClient.cs
index 5c35815..ad43f3d 100644
--- a/VkAudioDownloader/VkClient.cs
+++ b/VkAudioDownloader/VkClient.cs
@@ -23,14 +23,14 @@ public class VkClient : IDisposable
 {
     public VkApi Api;
     public VkClientConfig Config;
-    private  DTLib.Logging.New.ILogger _logger;
+    private  DTLib.Logging.New.ContextLogger _logger;
     private HttpHelper _http;
     private FFMPegHelper _ffmpeg;
     
     public VkClient(VkClientConfig conf,  DTLib.Logging.New.ILogger logger)
     {
         Config = conf;
-        _logger = logger;
+        _logger = new ContextLogger(logger, nameof(VkClient));
         _http = new HttpHelper();
         _ffmpeg = new FFMPegHelper(logger,conf.FFMPegDir);
         var services = new ServiceCollection()
@@ -48,12 +48,12 @@ public class VkClient : IDisposable
         };
         if (Config.Token is not null)
         {
-            _logger.Log(nameof(VkClient),LogSeverity.Info,"authorizing by token");
+            _logger.LogInfo("authorizing by token");
             authParams.AccessToken = Config.Token;
         }
         else
         {
-            _logger.Log(nameof(VkClient),LogSeverity.Info,"authorizing by login and password");
+            _logger.LogInfo("authorizing by login and password");
             authParams.Login = Config.Login;
             authParams.Password = Config.Password;
         }
@@ -67,7 +67,7 @@ public class VkClient : IDisposable
             }
             catch (Exception aex)
             {
-                _logger.LogException(nameof(VkClient),aex);
+                _logger.LogError(aex);
             }
         }
     }
@@ -91,7 +91,7 @@ public class VkClient : IDisposable
         string outFile = Path.Concat(localDir, DTLib.Filesystem.Path.CorrectString($"{audio.Artist}-{audio.Title}.opus"));
         string fragmentDir = $"{outFile}_{DateTime.Now.Ticks}";
         if(File.Exists(outFile))
-            _logger.LogWarn(nameof(VkClient), $"file {outFile} already exists");
+            _logger.LogWarn( $"file {outFile} already exists");
         
         string m3u8 = await _http.GetStringAsync(audio.Url);
         var parser = new M3U8Parser();