Skip to content

Commit e3a1548

Browse files
devgopherdevgopher
committed
- tests fix
1 parent 77cbe45 commit e3a1548

File tree

6 files changed

+28
-35
lines changed

6 files changed

+28
-35
lines changed

‎Botticelli.Audio.Tests/UniversalLowQualityConvertorTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
using NUnit.Framework;
1+
using Microsoft.Extensions.Logging.Abstractions;
2+
using NUnit.Framework;
23

34
namespace Botticelli.Audio.Tests;
45

56
[TestFixture]
67
public class UniversalLowQualityConvertorTests
78
{
89
private readonly IConvertor _convertor;
9-
private readonly IAnalyzer _analyzer;
1010

1111
public UniversalLowQualityConvertorTests()
1212
{
13-
_analyzer = new InputAnalyzer();
14-
_convertor = new UniversalLowQualityConvertor(_analyzer);
13+
IAnalyzer analyzer = new InputAnalyzer();
14+
_convertor = new UniversalLowQualityConvertor(analyzer, new NullLogger<UniversalLowQualityConvertor>());
1515
}
1616

1717
[Test]
@@ -53,7 +53,7 @@ public void ConvertMp3ToOggTest()
5353
var outcome = GetOutcome(new AudioInfo
5454
{
5555
AudioFormat = AudioFormat.Ogg,
56-
Bitrate = AudioBitrate.VkAudioMessage
56+
Bitrate = AudioBitrate.LowMusic
5757
});
5858

5959
AssertOutcome(outcome);

‎Botticelli.Audio/Botticelli.Audio.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="FFMpegCore" Version="5.1.0" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
1112
<PackageReference Include="NAudio" Version="2.2.1" />
1213
<PackageReference Include="NAudio.Lame" Version="2.1.0" />
1314
<PackageReference Include="NAudio.Vorbis" Version="1.5.0" />

‎Botticelli.Audio/IConvertor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ public interface IConvertor
99
/// Converts an input stream
1010
/// </summary>
1111
/// <param name="input"></param>
12-
/// <param name="targetParams"></param>
12+
/// <param name="tgtParams"></param>
1313
/// <returns></returns>
14-
public byte[] Convert(Stream input, AudioInfo targetParams);
14+
public byte[] Convert(Stream input, AudioInfo tgtParams);
1515
/// <summary>
1616
/// Converts an input byte array
1717
/// </summary>
1818
/// <param name="input"></param>
19-
/// <param name="targetParams"></param>
19+
/// <param name="tgtParams"></param>
2020
/// <returns></returns>
21-
public byte[] Convert(byte[] input, AudioInfo targetParams);
21+
public byte[] Convert(byte[] input, AudioInfo tgtParams);
2222
}

‎Botticelli.Audio/UniversalLowQualityConvertor.cs‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Botticelli.Audio.Exceptions;
22
using FFMpegCore;
33
using FFMpegCore.Pipes;
4+
using Microsoft.Extensions.Logging;
45
using NAudio.Lame;
56
using NAudio.Vorbis;
67
using NAudio.Wave;
@@ -10,43 +11,48 @@ namespace Botticelli.Audio;
1011
public class UniversalLowQualityConvertor : IConvertor
1112
{
1213
private readonly IAnalyzer _analyzer;
14+
private readonly ILogger<UniversalLowQualityConvertor> _logger;
1315

14-
public UniversalLowQualityConvertor(IAnalyzer analyzer) => _analyzer = analyzer;
16+
public UniversalLowQualityConvertor(IAnalyzer analyzer, ILogger<UniversalLowQualityConvertor> logger)
17+
{
18+
_analyzer = analyzer;
19+
_logger = logger;
20+
}
1521

16-
public byte[] Convert(Stream input, AudioInfo targetParams)
22+
public byte[] Convert(Stream input, AudioInfo tgtParams)
1723
{
1824
try
1925
{
20-
if (targetParams.AudioFormat is AudioFormat.M4a or AudioFormat.Aac or AudioFormat.Opus or AudioFormat.Ogg)
21-
return ProcessByStreamEncoder(input, targetParams);
26+
if (tgtParams.AudioFormat is AudioFormat.M4a or AudioFormat.Aac or AudioFormat.Opus or AudioFormat.Ogg)
27+
return ProcessByStreamEncoder(input, tgtParams);
2228

2329
var srcParams = _analyzer.Analyze(input);
2430

2531
using var resultStream = new MemoryStream();
2632
using var srcStream = GetSourceWaveStream(input, srcParams);
27-
using var tgtStream = GetTargetWaveStream(srcStream, targetParams);
33+
using var tgtStream = GetTargetWaveStream(srcStream, tgtParams);
2834

2935
return tgtStream.ToArray();
3036
}
3137
catch (Exception ex)
3238
{
39+
_logger.LogError($"{nameof(Convert)} => ({tgtParams.AudioFormat}, {tgtParams.Bitrate}) error", ex);
3340
throw new AudioConvertorException($"Audio conversion error: {ex.Message}", ex);
3441
}
3542
}
3643

37-
public byte[] Convert(byte[] input, AudioInfo targetParams)
44+
public byte[] Convert(byte[] input, AudioInfo tgtParams)
3845
{
3946
using var ms = new MemoryStream(input);
4047

41-
return Convert(ms, targetParams);
48+
return Convert(ms, tgtParams);
4249
}
4350

44-
private static byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
51+
private byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
4552
{
4653
try
4754
{
4855
var codec = string.Empty;
49-
input.Seek(0, SeekOrigin.Begin);
5056

5157
switch (tgtParams.AudioFormat)
5258
{
@@ -80,6 +86,7 @@ private static byte[] ProcessByStreamEncoder(Stream input, AudioInfo tgtParams)
8086
}
8187
catch (IOException ex)
8288
{
89+
_logger.LogError($"{nameof(Convert)} => ({tgtParams.AudioFormat}, {tgtParams.Bitrate}) error", ex);
8390
return Array.Empty<byte>();
8491
}
8592
}
@@ -96,7 +103,6 @@ private WaveStream GetSourceWaveStream(Stream input, AudioInfo srcParams)
96103

97104
private MemoryStream GetTargetWaveStream(WaveStream input, AudioInfo srcParams)
98105
{
99-
input.Seek(0, SeekOrigin.Begin);
100106
var ms = new MemoryStream();
101107

102108
Stream writerStream = srcParams.AudioFormat switch

‎Botticelli.Framework.Vk.Tests/MessagePublisherTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ namespace Botticelli.Framework.Vk.Tests;
77
[TestFixture]
88
public class MessagePublisherTests
99
{
10+
private MessagePublisher _publisher;
11+
1012
[SetUp]
1113
public void Setup()
1214
{
1315
_publisher = new MessagePublisher(new TestHttpClientFactory(),
1416
Utils.CreateConsoleLogger<MessagePublisher>());
1517
}
1618

17-
private MessagePublisher _publisher;
18-
1919
[Test]
2020
public async Task SendAsyncTest()
2121
{

‎Botticelli.sln‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Server.Data", "B
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Talks", "Botticelli.Talks\Botticelli.Talks.csproj", "{9F4B5D3F-661C-433B-BC9F-CAC4048EF9EA}"
3737
EndProject
38-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Talks.Tests", "Botticelli.Talks.Tests\Botticelli.Talks.Tests.csproj", "{A837401C-06F3-4573-9066-B911D55A1C9D}"
39-
EndProject
4038
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.AI", "Botticelli.AI\Botticelli.AI.csproj", "{F2270850-361A-4654-A893-718332560B02}"
4139
EndProject
4240
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Pay", "Botticelli.Pay\Botticelli.Pay.csproj", "{C010219B-6ECA-429F-98BA-839F6BAC0D6B}"
@@ -57,8 +55,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Server.Data.Enti
5755
EndProject
5856
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Bus.ZeroMQ", "Botticelli.Bus.ZeroMQ\Botticelli.Bus.ZeroMQ.csproj", "{6A1AF29F-4F7B-4DCB-A98F-CF90BD3ACD7C}"
5957
EndProject
60-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Botticelli.Bus.ZeroMQTests", "Botticelli.Bus.ZeroMQTests\Botticelli.Bus.ZeroMQTests.csproj", "{68B9BE15-0F55-4258-B4EE-664233D03A3D}"
61-
EndProject
6258
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{B7B4B68F-7086-49F2-B401-C76B4EF0B320}"
6359
EndProject
6460
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Telegram", "Telegram", "{2AD59714-541D-4794-9216-6EAB25F271DA}"
@@ -205,10 +201,6 @@ Global
205201
{9F4B5D3F-661C-433B-BC9F-CAC4048EF9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
206202
{9F4B5D3F-661C-433B-BC9F-CAC4048EF9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
207203
{9F4B5D3F-661C-433B-BC9F-CAC4048EF9EA}.Release|Any CPU.Build.0 = Release|Any CPU
208-
{A837401C-06F3-4573-9066-B911D55A1C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
209-
{A837401C-06F3-4573-9066-B911D55A1C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
210-
{A837401C-06F3-4573-9066-B911D55A1C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
211-
{A837401C-06F3-4573-9066-B911D55A1C9D}.Release|Any CPU.Build.0 = Release|Any CPU
212204
{F2270850-361A-4654-A893-718332560B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213205
{F2270850-361A-4654-A893-718332560B02}.Debug|Any CPU.Build.0 = Debug|Any CPU
214206
{F2270850-361A-4654-A893-718332560B02}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -245,10 +237,6 @@ Global
245237
{6A1AF29F-4F7B-4DCB-A98F-CF90BD3ACD7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
246238
{6A1AF29F-4F7B-4DCB-A98F-CF90BD3ACD7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
247239
{6A1AF29F-4F7B-4DCB-A98F-CF90BD3ACD7C}.Release|Any CPU.Build.0 = Release|Any CPU
248-
{68B9BE15-0F55-4258-B4EE-664233D03A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
249-
{68B9BE15-0F55-4258-B4EE-664233D03A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
250-
{68B9BE15-0F55-4258-B4EE-664233D03A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
251-
{68B9BE15-0F55-4258-B4EE-664233D03A3D}.Release|Any CPU.Build.0 = Release|Any CPU
252240
{56D0C278-B29D-401E-ADA0-BBD8D5061DD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
253241
{56D0C278-B29D-401E-ADA0-BBD8D5061DD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
254242
{56D0C278-B29D-401E-ADA0-BBD8D5061DD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -304,7 +292,6 @@ Global
304292
{E9FB2EC3-6C4F-4886-AFED-A2518733CF2A} = {460FBEED-CF76-47AE-8252-77D091A59A80}
305293
{CDFC4EAD-60BD-419A-ADF5-451766D22F29} = {A05D5A20-E0D3-4844-8311-C98E8B67DA7F}
306294
{9F4B5D3F-661C-433B-BC9F-CAC4048EF9EA} = {8DA4E10C-3EF4-42CD-BB51-A6562A7A0633}
307-
{A837401C-06F3-4573-9066-B911D55A1C9D} = {346A18CA-EB1F-483B-8BC3-EDF250DA72E6}
308295
{F2270850-361A-4654-A893-718332560B02} = {8DA4E10C-3EF4-42CD-BB51-A6562A7A0633}
309296
{C010219B-6ECA-429F-98BA-839F6BAC0D6B} = {8DA4E10C-3EF4-42CD-BB51-A6562A7A0633}
310297
{54E9BED2-9760-4B78-966F-17500C29D323} = {67600124-6694-4A1D-AB60-86ABC999254A}
@@ -314,7 +301,6 @@ Global
314301
{BC2069C7-4808-4BF4-8D90-0160A588AD43} = {A05D5A20-E0D3-4844-8311-C98E8B67DA7F}
315302
{81FE9855-9884-49A9-A10D-61E7B709865E} = {A05D5A20-E0D3-4844-8311-C98E8B67DA7F}
316303
{6A1AF29F-4F7B-4DCB-A98F-CF90BD3ACD7C} = {8DA4E10C-3EF4-42CD-BB51-A6562A7A0633}
317-
{68B9BE15-0F55-4258-B4EE-664233D03A3D} = {B7B4B68F-7086-49F2-B401-C76B4EF0B320}
318304
{B7B4B68F-7086-49F2-B401-C76B4EF0B320} = {346A18CA-EB1F-483B-8BC3-EDF250DA72E6}
319305
{2AD59714-541D-4794-9216-6EAB25F271DA} = {35480478-646E-45F1-96A3-EE7AC498ACE3}
320306
{56D0C278-B29D-401E-ADA0-BBD8D5061DD0} = {2AD59714-541D-4794-9216-6EAB25F271DA}

0 commit comments

Comments
 (0)