updated dependencies

.gitignore

@@ -1,6 +1,23 @@
-bin/
+# Build results
-obj/
+[Bb]in/
-/packages/
+.bin/
-riderModule.iml
+[Dd]ebug/
-/_ReSharper.Caches/
+[Rr]elease/
+[Rr]eleases/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+nuget/
+
+# IDE files
+.vs/
+.vscode/
+.vshistory/
 .idea/
+.editorconfig
+*.user
+*.DotSettings
+
+#backups
+.old*/

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "DTLib"]
-	path = DTLib
-	url = https://github.com/Timerix22/DTLib.git
-[submodule "vknet"]
-	path = vknet
-	url = https://github.com/Timerix22/vknet
-[submodule "VkNet.AudioBypass"]
-	path = VkNet.AudioBypass
-	url = https://github.com/Timerix22/VkNet.AudioBypass

DTLib

@@ -1 +0,0 @@
-Subproject commit 3ebb5be5819fa46d36705a5752aecd885c406a8b

VkAudioDownloader.CLI/Program.cs

@@ -1,14 +1,20 @@
 using System;
 using System.Linq;
 using DTLib.Dtsod;
-using System.IO;
+using DTLib.Console;
+using DTLib.Extensions;
+using DTLib.Filesystem;
+using DTLib.Logging;
 using VkAudioDownloader;
-using DTLib.Logging.New;
+
-using VkAudioDownloader.VkM3U8;
+Console.InputEncoding = StringConverter.UTF8;
+Console.OutputEncoding = StringConverter.UTF8;
+
+LaunchArgumentParser argParser = new LaunchArgumentParser();
 
 if(!File.Exists("config.dtsod"))
 {
-    File.Copy("config.dtsod.default", "config.dtsod");
+    File.Copy("config.dtsod.default", "config.dtsod", true);
     throw new Exception("No config detected, default created. Edit it!");
 }
 
@@ -16,37 +22,48 @@ var config = VkClientConfig.FromDtsod(new DtsodV23(File.ReadAllText("config.dtso
 
 var logger = new CompositeLogger(new DefaultLogFormat(true), 
     new ConsoleLogger(), 
-            new FileLogger("logs", "VkAudioDownloaer"));
+            new FileLogger("logs", "VkAudioDownloaer"),
-var _logger = new LoggerContext(logger, "main");
+            new FileLogger("logs", "VkAudioDownloaer_debug") { DebugLogEnabled = true});
+var mainLoggerContext = new ContextLogger("Main", logger);
+mainLoggerContext.LogDebug("DEBUG LOG ENABLED");
 
 try
 {
 #if DEBUG
-    AudioAesDecryptor.TestAes();
+    // checking correctness of my aes-128 decryptor on current platform
+    VkAudioDownloader.Helpers.AudioAesDecryptor.TestAes();
 #endif
 
+    mainLoggerContext.LogInfo("initializing api...");
     var client = new VkClient(config, logger);
-    _logger.LogDebug("initializing api...");
     await client.ConnectAsync();
     
-// getting audio from vk
+    argParser.Add(new LaunchArgument(new []{"s", "search"}, "search audio on vk.com", SearchAudio, "query"));
-    var audios = client.FindAudio("сталинский костюм").ToArray();
+    argParser.ParseAndHandle(args);
     
-    for (var i = 0; i < audios.Length; i++)
+    void SearchAudio(string query)
     {
-        var a = audios[i];
+        var audios = client.FindAudio(query).ToArray();
-        Console.WriteLine($"[{i}] {a.AudioToString()}");
+        for (var i = 0; i < audios.Length; i++)
-    }
+        {
+            var a = audios[i];
+            Console.WriteLine($"[{i}] {a.AudioToString()}");
+        }
+        Console.Write("choose audio: ");
+        int ain = Convert.ToInt32(Console.ReadLine());
+        var audio = audios[ain];
+        Console.WriteLine($"selected {audio.AudioToString()}");
+    
+        IOPath downloadedFile = client.DownloadAudioAsync(audio, "downloads").GetAwaiter().GetResult();
+        mainLoggerContext.LogInfo($"audio {audio.AudioToString()} downloaded to {downloadedFile}");
+    }
+}
+catch (LaunchArgumentParser.ExitAfterHelpException)
+{
     
-    Console.Write("choose audio: ");
-    int ain = Convert.ToInt32(Console.ReadLine());
-    var audio = audios[ain];
-    Console.WriteLine($"selected \"{audio.Title}\" -- {audio.Artist} [{TimeSpan.FromSeconds(audio.Duration)}]");
-    // downloading parts
-    string downloadedFile = await client.DownloadAudioAsync(audio, "downloads");
-    _logger.LogInfo($"audio {audio.AudioToString()} downloaded to {downloadedFile}");
 }
 catch (Exception ex)
 {
-    _logger.LogException(ex);
+    mainLoggerContext.LogError(ex);
 }
+Console.ResetColor();

VkAudioDownloader.CLI/VkAudioDownloader.CLI.csproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net6.0</TargetFramework>
@@ -9,7 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\VkAudioDownloader\VkAudioDownloader.csproj" />
+        <ProjectReference Include="..\VkAudioDownloader\VkAudioDownloader.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="config.dtsod.default">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
 </Project>

VkAudioDownloader.sln

@@ -4,26 +4,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkAudioDownloader", "VkAudi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkAudioDownloader.CLI", "VkAudioDownloader.CLI\VkAudioDownloader.CLI.csproj", "{5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib", "DTLib\DTLib\DTLib.csproj", "{5A02279F-F246-4101-BAA7-71EC5FAF2CAF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Dtsod", "DTLib\DTLib.Dtsod\DTLib.Dtsod.csproj", "{F6FA6507-8A20-43F8-9D88-4CB2F049780D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkNet", "vknet\VkNet\VkNet.csproj", "{123A7020-4C9B-4F7D-A27A-3002A7B21D4C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkNet.Generators", "vknet\VkNet.Generators\VkNet.Generators.csproj", "{BD698045-3408-40C1-AEEF-865219710EE2}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkNet.AudioBypassService", "VkNet.AudioBypass\VkNet.AudioBypassService\VkNet.AudioBypassService.csproj", "{5650A6DD-602D-49FF-A0B0-DB59BD63EACE}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sulution_items", "sulution_items", "{2CBCAE99-53A3-4ADE-A08B-5755EC471878}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		.gitmodules = .gitmodules
+		pack.sh = pack.sh
+		push_packages.sh = push_packages.sh
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DTLib.Logging", "DTLib\DTLib.Logging\DTLib.Logging.csproj", "{A087B535-371A-4A7E-883E-B5B290567E9A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ben.Demystifier", "DTLib\DTLib.Logging\Ben.Demystifier\src\Ben.Demystifier\Ben.Demystifier.csproj", "{42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,33 +25,5 @@ Global
 		{5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5ECC83C5-B53F-4CA7-ABDE-E2ACE8F48FED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A02279F-F246-4101-BAA7-71EC5FAF2CAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6FA6507-8A20-43F8-9D88-4CB2F049780D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{123A7020-4C9B-4F7D-A27A-3002A7B21D4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{123A7020-4C9B-4F7D-A27A-3002A7B21D4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{123A7020-4C9B-4F7D-A27A-3002A7B21D4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{123A7020-4C9B-4F7D-A27A-3002A7B21D4C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD698045-3408-40C1-AEEF-865219710EE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD698045-3408-40C1-AEEF-865219710EE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD698045-3408-40C1-AEEF-865219710EE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD698045-3408-40C1-AEEF-865219710EE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5650A6DD-602D-49FF-A0B0-DB59BD63EACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5650A6DD-602D-49FF-A0B0-DB59BD63EACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5650A6DD-602D-49FF-A0B0-DB59BD63EACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5650A6DD-602D-49FF-A0B0-DB59BD63EACE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A087B535-371A-4A7E-883E-B5B290567E9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A087B535-371A-4A7E-883E-B5B290567E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A087B535-371A-4A7E-883E-B5B290567E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A087B535-371A-4A7E-883E-B5B290567E9A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42AEDE44-8CE6-4561-B83E-AAE715B9C1DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

VkAudioDownloader.sln.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeEditing/SuppressUninitializedWarningFix/Enabled/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>

VkAudioDownloader.sln.DotSettings.user

@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
-  &lt;Assembly Path="C:\Users\User\.nuget\packages\vknet\1.72.0\lib\net6.0\VkNet.dll" /&gt;&#xD;
-&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

VkAudioDownloader/ExtensionMethods.cs

@@ -1,10 +1,9 @@
-using System;
 using System.Runtime.CompilerServices;
-using VkNet.Model.Attachments;
+using VkNet.Model;
 
 namespace VkAudioDownloader;
 
-public static class AudioHelper
+public static class ExtensionMethods
 {
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static string AudioToString(this Audio a)

VkAudioDownloader/Helpers/AudioAesDecryptor.cs

@@ -1,9 +1,7 @@
-using System;
 using System.Security.Cryptography;
-using DTLib.Filesystem;
 using Stream = System.IO.Stream;
 
-namespace VkAudioDownloader.VkM3U8;
+namespace VkAudioDownloader.Helpers;
 
 public class AudioAesDecryptor : IDisposable
 {

VkAudioDownloader/Helpers/FFMPegHelper.cs

@@ -1,28 +1,25 @@
-using System;
 using CliWrap;
-using DTLib.Filesystem;
+using DTLib.Logging;
-using DTLib.Extensions;
-using DTLib.Logging.New;
 
-namespace VkAudioDownloader;
+namespace VkAudioDownloader.Helpers;
 
 public class FFMPegHelper
 {
-    private LoggerContext _logger;
+    private ContextLogger _logger;
-    private readonly string ffmpeg;    
+    private readonly IOPath ffmpeg_exe;    
-    public FFMPegHelper(ILogger logger, string ffmpegDir)
+    public FFMPegHelper(ILogger logger, IOPath ffmpegDir)
     {
-        _logger = new LoggerContext(logger, nameof(FFMPegHelper));
+        _logger = new ContextLogger(nameof(FFMPegHelper), logger);
-        ffmpeg=Path.Concat(ffmpegDir,"ffmpeg");
+        ffmpeg_exe=Path.Concat(ffmpegDir,"ffmpeg");
     }
     
     /// <summary>creates fragments list for ffmppeg concat</summary>
     /// <param name="fragmentsDir">there file list.txt will be created</param>
     /// <param name="fragments">audio files in fragmentsDir (with or without dir in path)</param>
-    /// <returns></returns>
+    /// <returns>path to list.txt file</returns>
-    public string CreateFragmentList(string fragmentsDir, string[] fragments)
+    public IOPath CreateFragmentList(IOPath fragmentsDir, IOPath[] fragments)
     {
-        string listFile = Path.Concat(fragmentsDir, "list.txt");
+        IOPath listFile = Path.Concat(fragmentsDir, "list.txt");
         using var playlistFile = File.OpenWrite(listFile);
         for (var i = 0; i < fragments.Length; i++)
         {
@@ -37,7 +34,7 @@ public class FFMPegHelper
     /// <summary>converts ts files in directory to opus</summary>
     /// <param name="localDir">directory with ts fragment files</param>
     /// <returns>paths to created opus files</returns>
-    public Task<string[]> ToOpus(string localDir) => 
+    public Task<IOPath[]> ToOpus(IOPath localDir) => 
         ToOpus(Directory.GetFiles(localDir, "*.ts"));
 
     /// <summary>
@@ -45,28 +42,27 @@ public class FFMPegHelper
     /// </summary>
     /// <param name="fragments">ts fragment files</param>
     /// <returns>paths to created opus files</returns>
-    public async Task<string[]> ToOpus(string[] fragments)
+    public async Task<IOPath[]> ToOpus(IOPath[] fragments)
     {
-        string[] output = new string[fragments.Length];
+        IOPath[] output = new IOPath[fragments.Length];
         var tasks = new Task<CommandResult>[fragments.Length];
         
         for (var i = 0; i < fragments.Length; i++)
         {
-            string tsFile = fragments[i];
+            IOPath tsFile = fragments[i];
-            string opusFile = tsFile.Replace(".ts",".opus");
+            IOPath opusFile = tsFile.Replace(".ts",".opus");
             _logger.LogDebug($"{tsFile} -> {opusFile}");
-            var command = Cli.Wrap(ffmpeg).WithArguments(new[]
+            var command = Cli.Wrap(ffmpeg_exe.Str).WithArguments(new[]
                 {
-                    "-i", tsFile, // input
+                    "-i", tsFile.Str, // input
                     "-loglevel", "warning", "-hide_banner", "-nostats", // print only warnings and errors
                     "-map", "0:0", // select first audio track (sometimes there are blank buggy second thack) 
                     "-filter:a", "asetpts=PTS-STARTPTS", // fixes pts
                     "-c", "libopus", "-b:a", "96k", // encoding params
-                    opusFile // output
+                    opusFile.Str // output
                 })
                 // ffmpeg prints all log to stderr, because in stdout it ptints encoded file
-                .WithStandardErrorPipe(PipeTarget.ToDelegate(
+                .WithStandardErrorPipe(PipeTarget.ToDelegate(StdErrHandle));
-                    msg => _logger.LogWarn(msg)));
 
             tasks[i] = command.ExecuteAsync();
             output[i] = opusFile;
@@ -76,17 +72,24 @@ public class FFMPegHelper
         return output;
     }
 
-    public async Task Concat(string outfile, string fragmentListFile, string codec="libopus")
+    protected void StdErrHandle(string msg)
+    {
+        if(msg.EndsWith("start time for stream 1 is not set in estimate_timings_from_pts"))
+            _logger.LogDebug(msg);
+        else _logger.LogWarn(msg);
+    }
+    
+    public async Task Concat(IOPath outfile, IOPath fragmentListFile, string codec="libopus")
     {
         _logger.LogDebug($"{fragmentListFile} -> {outfile}");
-        var command = Cli.Wrap(ffmpeg).WithArguments(new[]
+        var command = Cli.Wrap(ffmpeg_exe.Str).WithArguments(new[]
             {
                 "-f", "concat", // mode
-                "-i", fragmentListFile, // input list
+                "-i", fragmentListFile.Str, // input list
                 "-loglevel", "warning", "-hide_banner", "-nostats", // print only warnings and errors
                 "-filter:a", "asetpts=PTS-STARTPTS", // fixes pts
                 "-c", codec, "-b:a", "96k", // encoding params
-                outfile, "-y" // output override
+                outfile.Str, "-y" // output override
             })
             // ffmpeg prints all log to stderr, because in stdout it ptints encoded file
             .WithStandardErrorPipe(PipeTarget.ToDelegate(

VkAudioDownloader/Helpers/HttpHelper.cs

@@ -1,10 +1,9 @@
-global using System.Threading.Tasks;
 using System.Net.Http;
-using DTLib.Filesystem;
+using VkAudioDownloader.VkM3U8;
 using Stream = System.IO.Stream;
 
 
-namespace VkAudioDownloader.VkM3U8;
+namespace VkAudioDownloader.Helpers;
 
 public class HttpHelper : HttpClient
 {
@@ -30,7 +29,7 @@ public class HttpHelper : HttpClient
     }
 
     public async Task DownloadAsync(HLSFragment fragment, string localDir) => 
-        await WriteStreamAsync(await GetStreamAsync(fragment), Path.Concat(localDir, fragment.Name));
+        await WriteStreamAsync(await GetStreamAsync(fragment), Path.Concat(localDir, fragment.Name).ToString()!);
 
     public async Task DownloadAsync(HLSPlaylist playlist, string localDir)
     {

VkAudioDownloader/VkAudioDownloader.csproj

@@ -1,24 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
+        <!--package info-->
+        <PackageId>VkAudioDownloader</PackageId>
+        <Version>0.1.0</Version>
+        <Authors>Timerix</Authors>
+        <Description>Loggers with dependency injection</Description>
+        <RepositoryType>GIT</RepositoryType>
+        <RepositoryUrl>https://github.com/Timerix22/VkAudioDownloader</RepositoryUrl>
+        <Configuration>Release</Configuration>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <!--compilation properties-->
         <TargetFramework>net6.0</TargetFramework>
+        <DebugType>embedded</DebugType>
+        <!--language features-->
         <LangVersion>10</LangVersion>
-        <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <ImplicitUsings>disable</ImplicitUsings>
     </PropertyGroup>
 
+    <!--external dependencies-->
     <ItemGroup>
-        <ProjectReference Include="..\DTLib\DTLib.Dtsod\DTLib.Dtsod.csproj" />
+        <PackageReference Include="CliWrap" Version="3.6.4" />
-        <ProjectReference Include="..\DTLib\DTLib.Logging\DTLib.Logging.csproj" />
+        <PackageReference Include="VkNet.AudioBypassService" Version="1.7.6" />
-        <ProjectReference Include="..\DTLib\DTLib\DTLib.csproj" />
+        <PackageReference Include="VkNet" Version="1.76.0" />
-        <ProjectReference Include="..\VkNet.AudioBypass\VkNet.AudioBypassService\VkNet.AudioBypassService.csproj" />
+        <PackageReference Include="DTLib.Dtsod" Version="1.3.0" />
-        <ProjectReference Include="..\vknet\VkNet.Generators\VkNet.Generators.csproj" />
+        <PackageReference Include="DTLib.Logging" Version="1.3.0" />
-        <ProjectReference Include="..\vknet\VkNet\VkNet.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="CliWrap" Version="3.5.0" />
-    </ItemGroup>
-
 </Project>

VkAudioDownloader/VkClient.cs

@@ -1,36 +1,36 @@
-using System;
+global using System;
+global using System.Threading.Tasks;
+global using System.Collections.Generic;
+global using DTLib.Filesystem;
+global using DTLib.Extensions;
+using DTLib.Logging;
+using DTLib.Logging.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using VkAudioDownloader.Helpers;
 using VkNet;
 using VkNet.Enums.Filters;
 using VkNet.Model;
-using VkNet.Model.RequestParams;
 using VkNet.Utils;
-using VkNet.Model.Attachments;
 using VkNet.AudioBypassService.Extensions;
-using DTLib.Logging.DependencyInjection;
-using DTLib.Logging.New;
-using DTLib.Filesystem;
 using VkAudioDownloader.VkM3U8;
 
 namespace VkAudioDownloader;
 
-
-
 public class VkClient : IDisposable
 {
     public VkApi Api;
     public VkClientConfig Config;
-    private  DTLib.Logging.New.ILogger _logger;
+    private ContextLogger _logger;
-    private HttpHelper _http;
+    public HttpHelper Http;
-    private FFMPegHelper _ffmpeg;
+    public FFMPegHelper Ffmpeg;
     
-    public VkClient(VkClientConfig conf,  DTLib.Logging.New.ILogger logger)
+    public VkClient(VkClientConfig conf,  DTLib.Logging.ILogger logger)
     {
         Config = conf;
-        _logger = logger;
+        _logger = new ContextLogger(nameof(VkClient), logger);
-        _http = new HttpHelper();
+        Http = new HttpHelper();
-        _ffmpeg = new FFMPegHelper(logger,conf.FFMPegDir);
+        Ffmpeg = new FFMPegHelper(logger, conf.FfmpegDir);
         var services = new ServiceCollection()
             .Add(new LoggerService<VkApi>(logger))
             .AddAudioBypass();
@@ -42,16 +42,16 @@ public class VkClient : IDisposable
         var authParams = new ApiAuthParams
         {
             ApplicationId = Config.AppId,
-            Settings = Settings.Audio
+            Settings = Settings.Audio,
         };
         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;
         }
@@ -65,7 +65,7 @@ public class VkClient : IDisposable
             }
             catch (Exception aex)
             {
-                _logger.LogException(nameof(VkClient),aex);
+                _logger.LogError(aex);
             }
         }
     }
@@ -77,31 +77,32 @@ public class VkClient : IDisposable
             Count = maxRezults,
         });
     
-    
+    ///<returns>file name</returns>
-    public Task<string> DownloadAudioAsync(Audio audio, string localDir) => 
+    public Task<IOPath> DownloadAudioAsync(Audio audio, string localDir) => 
         DownloadAudioAsync(audio, localDir,TimeSpan.FromHours(1));
 
-    public async Task<string> DownloadAudioAsync(Audio audio, string localDir, TimeSpan durationLimit)
+    ///<returns>file name</returns>
+    public async Task<IOPath> DownloadAudioAsync(Audio audio, string localDir, TimeSpan durationLimit)
     {
         if (!audio.Url.ToString().StartsWith("http"))
             throw new Exception($"incorrect audio url: {audio.Url}");
 
-        string outFile = Path.Concat(localDir, DTLib.Filesystem.Path.CorrectString($"{audio.Artist}-{audio.Title}.opus"));
+        IOPath outFile = Path.Concat(localDir, DTLib.Filesystem.Path.ReplaceRestrictedChars($"{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);
+        string m3u8 = await Http.GetStringAsync(audio.Url);
         var parser = new M3U8Parser();
         var hls = parser.Parse(audio.Url, m3u8);
         if (hls.Duration > durationLimit.TotalSeconds)
             throw new Exception($"duration limit <{durationLimit}> exceeded by track <{audio}> - <{hls.Duration}>");
         
-        await _http.DownloadAsync(hls, fragmentDir);
+        await Http.DownloadAsync(hls, fragmentDir);
-        string[] opusFragments = await _ffmpeg.ToOpus(fragmentDir);
+        var opusFragments = await Ffmpeg.ToOpus(fragmentDir);
-        string listFile = _ffmpeg.CreateFragmentList(fragmentDir, opusFragments);
+        IOPath listFile = Ffmpeg.CreateFragmentList(fragmentDir, opusFragments);
-        await _ffmpeg.Concat(outFile, listFile);
+        await Ffmpeg.Concat(outFile, listFile);
-        // Directory.Delete(fragmentDir);
+        Directory.Delete(fragmentDir);
         
         return outFile;
     }
@@ -111,7 +112,7 @@ public class VkClient : IDisposable
     {
         if (_disposed) return;
         Api.Dispose();
-        _http.Dispose();
+        Http.Dispose();
         _disposed = true;
     }
 }

VkAudioDownloader/VkClientConfig.cs

@@ -5,7 +5,7 @@ namespace VkAudioDownloader;
 public class VkClientConfig
 {
     /// directory where ffmpeg and ffprobe binaries are stored
-    public string FFMPegDir;
+    public string FfmpegDir;
     /// vk app id from https://vk.com/apps?act=manage
     public ulong AppId;
     /// account password
@@ -16,27 +16,37 @@ public class VkClientConfig
     public string? Token;
 
 
-    public VkClientConfig(string ffmPegDir, ulong appId, string? token)
+    public VkClientConfig(string ffmpegDir, ulong appId, string? token)
     {
-        FFMPegDir = ffmPegDir;
+        FfmpegDir = ffmpegDir;
         AppId = appId;
         Token = token;
     }
 
-    public VkClientConfig(string ffmPegDir, ulong appId, string? password, string? login)
+    public VkClientConfig(string ffmpegDir, ulong appId, string? password, string? login)
     {
-        FFMPegDir = ffmPegDir;
+        FfmpegDir = ffmpegDir;
         AppId = appId;
         Password = password;
         Login = login;
     }
     
-    private VkClientConfig(string ffmPegDir, ulong appId)
+    private VkClientConfig(string ffmpegDir, ulong appId)
     {
-        FFMPegDir = ffmPegDir;
+        FfmpegDir = ffmpegDir;
         AppId = appId;
     }
     
+    /// <summary>
+    /// {
+    ///     ffmpeg_dir: "";
+    ///     app_id: 0ul;
+    ///     token: "";
+    ///     #or
+    ///     login: "";
+    ///     password: "";
+    /// };
+    /// </summary>
     public static VkClientConfig FromDtsod(DtsodV23 dtsod)
     {
         var config = new VkClientConfig(dtsod["ffmpeg_dir"], dtsod["app_id"]);
@@ -56,7 +66,7 @@ public class VkClientConfig
             { "password", Password ?? null },
             { "login", Login ?? null },
             { "token", Token ?? null },
-            { "ffmpeg_dir", FFMPegDir}
+            { "ffmpeg_dir", FfmpegDir}
         };
 
 }

VkAudioDownloader/VkM3U8/M3U8Parser.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using DTLib.Extensions;
-
 namespace VkAudioDownloader.VkM3U8;
 
 public class M3U8Parser
@@ -78,7 +73,7 @@ public class M3U8Parser
         if(line.StartsWith("#EXTINF:"))
         {
             var duration = line.After(':').Before(',');
-            _fragmentDuration = float.Parse(duration, NumberStyles.Any, CultureInfo.InvariantCulture.NumberFormat);
+            _fragmentDuration = duration.ToFloat();
         }
         else if (line.StartsWith("#EXT-X-KEY:METHOD="))
         {

VkNet.AudioBypass

@@ -1 +0,0 @@
-Subproject commit e3e704c40bb568953415a2c74a397197fafb5988

pack.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+set -ex
+rm -rf nuget
+dotnet pack VkAudioDownloader/VkAudioDownloader.csproj -o ./nuget/
+ls nuget

push_packages.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+echo enter github api key:
+read -r GHK
+echo enter nuget api key:
+read -r NGK
+
+for PACK in $(find ./nuget -name '*.nupkg'); do
+    dotnet nuget push $PACK -k $GHK -s github --skip-duplicate
+    dotnet nuget push $PACK -k $NGK -s nuget.org --skip-duplicate
+done

vknet

@@ -1 +0,0 @@
-Subproject commit 5989ed812a93dec5d44f60bc50d119a5a46047a1