ow
This commit is contained in:
parent
5f222a23b3
commit
a71094cbf5
@ -30,6 +30,8 @@ namespace CloudBuilder.Topshelf.Task.TTS
|
||||
|
||||
public void Run(Dictionary<string, string> bodyDict)
|
||||
{
|
||||
ConsoleOutput.HideStdError();
|
||||
|
||||
IRepository<AiSentenceViewEntity> repository = service.GetRepository<IRepository<AiSentenceViewEntity>>();
|
||||
|
||||
string bookId = string.Empty;
|
||||
@ -64,13 +66,12 @@ namespace CloudBuilder.Topshelf.Task.TTS
|
||||
.GroupBy(ent => new { ent.BookId, ent.ChapterId })
|
||||
.ToList();
|
||||
|
||||
int totalLines = chapterGroups.Count();
|
||||
int totalLines = ents.Count();
|
||||
int processedLines = 0; // 已处理行数计数器
|
||||
UpdateProgress(processedLines, totalLines);
|
||||
|
||||
foreach (var chapter in chapterGroups)
|
||||
{
|
||||
processedLines++;
|
||||
|
||||
string bookId = chapter.Key.BookId;
|
||||
int chapterId = chapter.Key.ChapterId;
|
||||
List<string> tempMp3List = new List<string>(); // 本章所有碎片音频
|
||||
@ -78,6 +79,8 @@ namespace CloudBuilder.Topshelf.Task.TTS
|
||||
// 2. 生成本章所有句子音频
|
||||
foreach (AiSentenceViewEntity ent in chapter)
|
||||
{
|
||||
processedLines++;
|
||||
|
||||
string voice = ChineseTtsVoice.Sherpa2.ToString();
|
||||
if (ent.DialogueIndc == YesNoPolicy.YES)
|
||||
{
|
||||
@ -102,6 +105,8 @@ namespace CloudBuilder.Topshelf.Task.TTS
|
||||
SaveAudioToFileHelper.AudioToFile(EnumHelper.ToEnum<ChineseTtsVoice>(voice), ent.Content, filePath);
|
||||
|
||||
tempMp3List.Add(filePath); // 加入合并列表
|
||||
|
||||
UpdateProgress(processedLines, totalLines);
|
||||
}
|
||||
|
||||
Thread.Sleep(100);
|
||||
@ -118,8 +123,6 @@ namespace CloudBuilder.Topshelf.Task.TTS
|
||||
try { File.Delete(chunk); } catch { }
|
||||
}
|
||||
|
||||
Console.WriteLine($"章节合并完成:{outputFileName}");
|
||||
|
||||
UpdateProgress(processedLines, totalLines);
|
||||
}
|
||||
}
|
||||
@ -166,22 +169,11 @@ namespace CloudBuilder.Topshelf.Task.TTS
|
||||
}
|
||||
}
|
||||
|
||||
Console.WriteLine($"✅ 合并成功:{outputFilePath},大小:{new FileInfo(outputFilePath).Length} 字节");
|
||||
//Console.WriteLine($"✅ 合并成功:{outputFilePath},大小:{new FileInfo(outputFilePath).Length} 字节");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"❌ 合并失败:{ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
// 辅助方法:WAV 转 MP3
|
||||
private void WaveFileToMp3(byte[] wavData, string mp3Path)
|
||||
{
|
||||
using (var ms = new MemoryStream(wavData))
|
||||
using (var waveReader = new WaveFileReader(ms))
|
||||
using (var mp3Writer = new LameMP3FileWriter(mp3Path, waveReader.WaveFormat, 128))
|
||||
{
|
||||
waveReader.CopyTo(mp3Writer);
|
||||
//Console.WriteLine($"❌ 合并失败:{ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
68
Utility/ConsoleHelper.cs
Normal file
68
Utility/ConsoleHelper.cs
Normal file
@ -0,0 +1,68 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CloudBuilder.Topshelf.Utility
|
||||
{
|
||||
// 先把这个类放到你的代码文件里
|
||||
public static class ConsoleHelper
|
||||
{
|
||||
[DllImport("kernel32.dll")]
|
||||
static extern IntPtr GetStdHandle(int nStdHandle);
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
static extern int SetStdHandle(int nStdHandle, IntPtr hHandle);
|
||||
|
||||
const int STD_OUTPUT_HANDLE = -11;
|
||||
const int STD_ERROR_HANDLE = -12;
|
||||
|
||||
/// <summary>
|
||||
/// 屏蔽所有底层C++输出(彻底隐藏 SherpaOnnx 日志)
|
||||
/// </summary>
|
||||
public static void DisableConsoleOutput()
|
||||
{
|
||||
var nullHandle = IntPtr.Zero;
|
||||
SetStdHandle(STD_OUTPUT_HANDLE, nullHandle);
|
||||
SetStdHandle(STD_ERROR_HANDLE, nullHandle);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 恢复输出(如果你需要)
|
||||
/// </summary>
|
||||
public static void EnableConsoleOutput()
|
||||
{
|
||||
var outHandle = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||
var errHandle = GetStdHandle(STD_ERROR_HANDLE);
|
||||
SetStdHandle(STD_OUTPUT_HANDLE, outHandle);
|
||||
SetStdHandle(STD_ERROR_HANDLE, errHandle);
|
||||
}
|
||||
}
|
||||
|
||||
public static class ConsoleOutput
|
||||
{
|
||||
private const int STD_ERROR_HANDLE = -12;
|
||||
private static IntPtr _originalErrorHandle;
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
private static extern IntPtr GetStdHandle(int nStdHandle);
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
private static extern bool SetStdHandle(int nStdHandle, IntPtr hHandle);
|
||||
|
||||
/// <summary>
|
||||
/// 只关闭 标准错误输出(stderr)
|
||||
/// 作用:屏蔽 sherpa-onnx 所有垃圾日志
|
||||
/// 保留:你的进度条、控制台输出(stdout)
|
||||
/// </summary>
|
||||
public static void HideStdError()
|
||||
{
|
||||
_originalErrorHandle = GetStdHandle(STD_ERROR_HANDLE);
|
||||
SetStdHandle(STD_ERROR_HANDLE, IntPtr.Zero);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
56
Utility/SherpaLogFilter.cs
Normal file
56
Utility/SherpaLogFilter.cs
Normal file
@ -0,0 +1,56 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CloudBuilder.Topshelf.Utility
|
||||
{
|
||||
public static class SherpaLogFilter
|
||||
{
|
||||
/// <summary>
|
||||
/// 只屏蔽 sherpa-onnx 输出的日志,不影响你的进度条
|
||||
/// </summary>
|
||||
public static void HideSherpaOnnxLogs()
|
||||
{
|
||||
// 过滤 stdout
|
||||
var originalOut = Console.Out;
|
||||
Console.SetOut(new FilterWriter(originalOut));
|
||||
|
||||
// 过滤 stderr
|
||||
var originalError = Console.Error;
|
||||
Console.SetError(new FilterWriter(originalError));
|
||||
}
|
||||
|
||||
private class FilterWriter : TextWriter
|
||||
{
|
||||
private readonly TextWriter _inner;
|
||||
public FilterWriter(TextWriter inner) => _inner = inner;
|
||||
public override Encoding Encoding => Encoding.UTF8;
|
||||
|
||||
public override void WriteLine(string value)
|
||||
{
|
||||
// 屏蔽包含这些关键词的日志
|
||||
if (!ShouldFilter(value))
|
||||
_inner.WriteLine(value);
|
||||
}
|
||||
|
||||
public override void Write(string value)
|
||||
{
|
||||
// 关键:不屏蔽 Write(...) → 你的进度条就是用 Write 输出的,会保留!
|
||||
if (!ShouldFilter(value))
|
||||
_inner.Write(value);
|
||||
}
|
||||
|
||||
private bool ShouldFilter(string s)
|
||||
{
|
||||
if (s == null) return false;
|
||||
return
|
||||
s.Contains("sherpa-onnx") ||
|
||||
s.Contains("character-lexicon.cc") ||
|
||||
s.Contains("Ignore OOV") ||
|
||||
s.Contains("ConvertTextToTokenIds");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user