diff --git a/VkAudioDownloader.CLI/Program.cs b/VkAudioDownloader.CLI/Program.cs index ea6d44f..31f952f 100644 --- a/VkAudioDownloader.CLI/Program.cs +++ b/VkAudioDownloader.CLI/Program.cs @@ -4,7 +4,6 @@ using DTLib.Dtsod; using System.IO; using VkAudioDownloader; using DTLib.Logging.New; -using VkAudioDownloader.VkM3U8; if(!File.Exists("config.dtsod")) { @@ -18,6 +17,7 @@ var logger = new CompositeLogger(new DefaultLogFormat(true), new ConsoleLogger(), new FileLogger("logs", "VkAudioDownloaer")); var _logger = new LoggerContext(logger, "main"); +_logger.LogDebug("DEBUG LOG ENABLED"); try { @@ -25,8 +25,8 @@ try AudioAesDecryptor.TestAes(); #endif + _logger.LogInfo("initializing api..."); var client = new VkClient(config, logger); - _logger.LogDebug("initializing api..."); await client.ConnectAsync(); // getting audio from vk diff --git a/VkAudioDownloader/VkM3U8/AudioAesDecryptor.cs b/VkAudioDownloader/AudioAesDecryptor.cs similarity index 95% rename from VkAudioDownloader/VkM3U8/AudioAesDecryptor.cs rename to VkAudioDownloader/AudioAesDecryptor.cs index 29a46ce..c3f3ef6 100644 --- a/VkAudioDownloader/VkM3U8/AudioAesDecryptor.cs +++ b/VkAudioDownloader/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; public class AudioAesDecryptor : IDisposable { diff --git a/VkAudioDownloader/AudioHelper.cs b/VkAudioDownloader/AudioHelper.cs index 2b89020..e8afe2a 100644 --- a/VkAudioDownloader/AudioHelper.cs +++ b/VkAudioDownloader/AudioHelper.cs @@ -1,4 +1,3 @@ -using System; using System.Runtime.CompilerServices; using VkNet.Model.Attachments; diff --git a/VkAudioDownloader/FFMPegHelper.cs b/VkAudioDownloader/FFMPegHelper.cs index e8b5420..9a8ac05 100644 --- a/VkAudioDownloader/FFMPegHelper.cs +++ b/VkAudioDownloader/FFMPegHelper.cs @@ -1,8 +1,4 @@ -using System; using CliWrap; -using DTLib.Filesystem; -using DTLib.Extensions; -using DTLib.Logging.New; namespace VkAudioDownloader; diff --git a/VkAudioDownloader/VkM3U8/HttpHelper.cs b/VkAudioDownloader/HttpHelper.cs similarity index 91% rename from VkAudioDownloader/VkM3U8/HttpHelper.cs rename to VkAudioDownloader/HttpHelper.cs index c058228..be246aa 100644 --- a/VkAudioDownloader/VkM3U8/HttpHelper.cs +++ b/VkAudioDownloader/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; public class HttpHelper : HttpClient { diff --git a/VkAudioDownloader/VkClient.cs b/VkAudioDownloader/VkClient.cs index d2c8105..8b306f5 100644 --- a/VkAudioDownloader/VkClient.cs +++ b/VkAudioDownloader/VkClient.cs @@ -1,4 +1,10 @@ -using System; +global using System; +global using System.Threading.Tasks; +global using System.Collections.Generic; +global using DTLib.Filesystem; +global using DTLib.Extensions; +global using DTLib.Logging.New; +using DTLib.Logging.DependencyInjection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using VkNet; @@ -8,15 +14,10 @@ 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; @@ -114,4 +115,4 @@ public class VkClient : IDisposable _http.Dispose(); _disposed = true; } -} \ No newline at end of file +} diff --git a/VkAudioDownloader/VkClientConfig.cs b/VkAudioDownloader/VkClientConfig.cs index 5e1a2b7..80bb5db 100644 --- a/VkAudioDownloader/VkClientConfig.cs +++ b/VkAudioDownloader/VkClientConfig.cs @@ -59,4 +59,4 @@ public class VkClientConfig { "ffmpeg_dir", FFMPegDir} }; -} \ No newline at end of file +} diff --git a/VkAudioDownloader/VkM3U8/M3U8Parser.cs b/VkAudioDownloader/VkM3U8/M3U8Parser.cs index 91827c8..5f92793 100644 --- a/VkAudioDownloader/VkM3U8/M3U8Parser.cs +++ b/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=")) { @@ -115,4 +110,4 @@ public class M3U8Parser _fragmentEncrypted = false; _fragmentEncryptionKeyUrl = null; } -} \ No newline at end of file +}