From be809a94cd5d1becc5701dbc97373a355f5156b2 Mon Sep 17 00:00:00 2001 From: timerix Date: Tue, 6 Dec 2022 03:14:27 +0600 Subject: [PATCH] helpers --- DTLib | 2 +- VkAudioDownloader.CLI/Program.cs | 2 +- VkAudioDownloader/{AudioHelper.cs => ExtensionMethods.cs} | 2 +- VkAudioDownloader/{ => Helpers}/AudioAesDecryptor.cs | 2 +- VkAudioDownloader/{ => Helpers}/FFMPegHelper.cs | 2 +- VkAudioDownloader/{ => Helpers}/HttpHelper.cs | 2 +- VkAudioDownloader/VkClient.cs | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) rename VkAudioDownloader/{AudioHelper.cs => ExtensionMethods.cs} (86%) rename VkAudioDownloader/{ => Helpers}/AudioAesDecryptor.cs (95%) rename VkAudioDownloader/{ => Helpers}/FFMPegHelper.cs (96%) rename VkAudioDownloader/{ => Helpers}/HttpHelper.cs (94%) diff --git a/DTLib b/DTLib index 3ebb5be..e7769a3 160000 --- a/DTLib +++ b/DTLib @@ -1 +1 @@ -Subproject commit 3ebb5be5819fa46d36705a5752aecd885c406a8b +Subproject commit e7769a3e0ff8788b5a476c7a9c797f2d6097ad89 diff --git a/VkAudioDownloader.CLI/Program.cs b/VkAudioDownloader.CLI/Program.cs index 31f952f..621ff79 100644 --- a/VkAudioDownloader.CLI/Program.cs +++ b/VkAudioDownloader.CLI/Program.cs @@ -22,7 +22,7 @@ _logger.LogDebug("DEBUG LOG ENABLED"); try { #if DEBUG - AudioAesDecryptor.TestAes(); + VkAudioDownloader.Helpers.AudioAesDecryptor.TestAes(); #endif _logger.LogInfo("initializing api..."); diff --git a/VkAudioDownloader/AudioHelper.cs b/VkAudioDownloader/ExtensionMethods.cs similarity index 86% rename from VkAudioDownloader/AudioHelper.cs rename to VkAudioDownloader/ExtensionMethods.cs index e8afe2a..6b20e79 100644 --- a/VkAudioDownloader/AudioHelper.cs +++ b/VkAudioDownloader/ExtensionMethods.cs @@ -3,7 +3,7 @@ using VkNet.Model.Attachments; namespace VkAudioDownloader; -public static class AudioHelper +public static class ExtensionMethods { [MethodImpl(MethodImplOptions.AggressiveInlining)] public static string AudioToString(this Audio a) diff --git a/VkAudioDownloader/AudioAesDecryptor.cs b/VkAudioDownloader/Helpers/AudioAesDecryptor.cs similarity index 95% rename from VkAudioDownloader/AudioAesDecryptor.cs rename to VkAudioDownloader/Helpers/AudioAesDecryptor.cs index c3f3ef6..c7695b4 100644 --- a/VkAudioDownloader/AudioAesDecryptor.cs +++ b/VkAudioDownloader/Helpers/AudioAesDecryptor.cs @@ -1,7 +1,7 @@ using System.Security.Cryptography; using Stream = System.IO.Stream; -namespace VkAudioDownloader; +namespace VkAudioDownloader.Helpers; public class AudioAesDecryptor : IDisposable { diff --git a/VkAudioDownloader/FFMPegHelper.cs b/VkAudioDownloader/Helpers/FFMPegHelper.cs similarity index 96% rename from VkAudioDownloader/FFMPegHelper.cs rename to VkAudioDownloader/Helpers/FFMPegHelper.cs index 9a8ac05..e3fd2f2 100644 --- a/VkAudioDownloader/FFMPegHelper.cs +++ b/VkAudioDownloader/Helpers/FFMPegHelper.cs @@ -1,6 +1,6 @@ using CliWrap; -namespace VkAudioDownloader; +namespace VkAudioDownloader.Helpers; public class FFMPegHelper { diff --git a/VkAudioDownloader/HttpHelper.cs b/VkAudioDownloader/Helpers/HttpHelper.cs similarity index 94% rename from VkAudioDownloader/HttpHelper.cs rename to VkAudioDownloader/Helpers/HttpHelper.cs index be246aa..ff5d15c 100644 --- a/VkAudioDownloader/HttpHelper.cs +++ b/VkAudioDownloader/Helpers/HttpHelper.cs @@ -3,7 +3,7 @@ using VkAudioDownloader.VkM3U8; using Stream = System.IO.Stream; -namespace VkAudioDownloader; +namespace VkAudioDownloader.Helpers; public class HttpHelper : HttpClient { diff --git a/VkAudioDownloader/VkClient.cs b/VkAudioDownloader/VkClient.cs index 8b306f5..6877c3f 100644 --- a/VkAudioDownloader/VkClient.cs +++ b/VkAudioDownloader/VkClient.cs @@ -7,6 +7,7 @@ global using DTLib.Logging.New; 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;