Skip to content

Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.

feat: show more error msg in alert

沈浩f6e4b2ba2f4f
diff --git a/internal/service/audio2subtitle.go b/internal/service/audio2subtitle.go
index 58694f1c..14bcee7b 100644
--- a/internal/service/audio2subtitle.go
+++ b/internal/service/audio2subtitle.go
@@ -24,15 +24,15 @@ func (s Service) audioToSubtitle(ctx context.Context, stepParam *types.SubtitleT
var err error
err = s.splitAudio(ctx, stepParam)
if err != nil {
- return err
+ return fmt.Errorf("audioToSubtitle splitAudio error: %w", err)
}
err = s.audioToSrt(ctx, stepParam) // 这里进度更新到90%了
if err != nil {
- return err
+ return fmt.Errorf("audioToSubtitle audioToSrt error: %w", err)
}
err = s.splitSrt(ctx, stepParam)
if err != nil {
- return err
+ return fmt.Errorf("audioToSubtitle splitSrt error: %w", err)
}
// 更新字幕任务信息
storage.SubtitleTasks[stepParam.TaskId].ProcessPct = 95
@@ -57,19 +57,19 @@ func (s Service) splitAudio(ctx context.Context, stepParam *types.SubtitleTaskSt
)
err = cmd.Run()
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitAudio ffmpeg err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitAudio ffmpeg err", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitAudio ffmpeg err: %w", err)
}
// 获取分割后的文件列表
audioFiles, err := filepath.Glob(filepath.Join(stepParam.TaskBasePath, fmt.Sprintf("%s_*.mp3", types.SubtitleTaskSplitAudioFileNamePrefix)))
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitAudio filepath.Glob err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitAudio filepath.Glob err", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitAudio filepath.Glob err: %w", err)
}
if len(audioFiles) == 0 {
- log.GetLogger().Error("audioToSubtitle.splitAudio no audio files found", zap.Any("stepParam", stepParam))
- return errors.New("no audio files found")
+ log.GetLogger().Error("audioToSubtitle splitAudio no audio files found", zap.Any("stepParam", stepParam))
+ return errors.New("audioToSubtitle splitAudio no audio files found")
}
num := 1
@@ -130,8 +130,8 @@ func (s Service) audioToSrt(ctx context.Context, stepParam *types.SubtitleTaskSt
}
if err != nil {
cancel()
- log.GetLogger().Error("audioToSubtitle.audioToSrt.Transcription err", zap.Any("stepParam", stepParam), zap.String("audio file", audioFileItem.AudioFile), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle audioToSrt Transcription err", zap.Any("stepParam", stepParam), zap.String("audio file", audioFileItem.AudioFile), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle audioToSrt Transcription err: %w", err)
}
audioFile.TranscriptionData = transcriptionData
@@ -147,8 +147,8 @@ func (s Service) audioToSrt(ctx context.Context, stepParam *types.SubtitleTaskSt
err = s.splitTextAndTranslate(stepParam.TaskId, stepParam.TaskBasePath, stepParam.TargetLanguage, stepParam.EnableModalFilter, audioFile)
if err != nil {
cancel()
- log.GetLogger().Error("audioToSubtitle.audioToSrt.splitTextAndTranslate err", zap.Any("stepParam", stepParam), zap.String("audio file", audioFileItem.AudioFile), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle audioToSrt splitTextAndTranslate err", zap.Any("stepParam", stepParam), zap.String("audio file", audioFileItem.AudioFile), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle audioToSrt err: %w", err)
}
stepNumMu.Lock()
@@ -162,16 +162,16 @@ func (s Service) audioToSrt(ctx context.Context, stepParam *types.SubtitleTaskSt
err = s.generateTimestamps(stepParam.TaskId, stepParam.TaskBasePath, stepParam.OriginLanguage, stepParam.SubtitleResultType, audioFile, stepParam.MaxWordOneLine)
if err != nil {
cancel()
- log.GetLogger().Error("audioToSubtitle.audioToSrt.generateTimestamps err", zap.Any("stepParam", stepParam), zap.String("audio file", audioFileItem.AudioFile), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle audioToSrt generateTimestamps err", zap.Any("stepParam", stepParam), zap.String("audio file", audioFileItem.AudioFile), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle audioToSrt err: %w", err)
}
return nil
})
}
if err = eg.Wait(); err != nil {
- log.GetLogger().Error("audioToSubtitle.audioToSrt.eg.Wait err", zap.Any("taskId", stepParam.TaskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle audioToSrt eg.Wait err", zap.Any("taskId", stepParam.TaskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle audioToSrt eg.Wait err: %w", err)
}
// 合并文件
@@ -194,27 +194,27 @@ func (s Service) audioToSrt(ctx context.Context, stepParam *types.SubtitleTaskSt
originNoTsFile := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskSrtNoTimestampFileName)
err = util.MergeFile(originNoTsFile, originNoTsFiles...)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.audioToSrt.MergeFile originNoTs err",
+ log.GetLogger().Error("audioToSubtitle audioToSrt merge originNoTsFile err",
zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ return fmt.Errorf("audioToSubtitle audioToSrt merge originNoTsFile err: %w", err)
}
// 合并最终双语字幕
bilingualFile := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskBilingualSrtFileName)
err = util.MergeSrtFiles(bilingualFile, bilingualFiles...)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.audioToSrt.MergeFile ts err",
+ log.GetLogger().Error("audioToSubtitle audioToSrt merge BilingualFile err",
zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ return fmt.Errorf("audioToSubtitle audioToSrt merge BilingualFile err: %w", err)
}
//合并最终双语字幕 长中文+短英文
shortOriginMixedFile := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskShortOriginMixedSrtFileName)
err = util.MergeSrtFiles(shortOriginMixedFile, shortOriginMixedFiles...)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.audioToSrt.MergeFile ts err",
+ log.GetLogger().Error("audioToSubtitle audioToSrt merge shortOriginMixedFile err",
zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ return fmt.Errorf("audioToSrt merge shortOriginMixedFile err: %w", err)
}
stepParam.ShortOriginMixedSrtFilePath = shortOriginMixedFile
@@ -222,9 +222,9 @@ func (s Service) audioToSrt(ctx context.Context, stepParam *types.SubtitleTaskSt
shortOriginFile := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskShortOriginSrtFileName)
err = util.MergeSrtFiles(shortOriginFile, shortOriginFiles...)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.audioToSrt.MergeFile ts err",
+ log.GetLogger().Error("audioToSubtitle audioToSrt mergeShortOriginFile err",
zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ return fmt.Errorf("audioToSrt mergeShortOriginFile err: %w", err)
}
// 供后续分割单语使用
@@ -248,36 +248,37 @@ func (s Service) splitSrt(ctx context.Context, stepParam *types.SubtitleTaskStep
// 打开双语字幕文件
file, err := os.Open(stepParam.BilingualSrtFilePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitSrt os.Open err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitSrt open bilingual srt file error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitSrt open bilingual srt file error: %w", err)
}
defer file.Close()
// 打开输出字幕和文稿文件
originLanguageSrtFile, err := os.Create(originLanguageSrtFilePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitSrt os.Create originLanguageSrtFile err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitSrt create originLanguageSrtFile error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitSrt create originLanguageSrtFile error: %w", err)
}
defer originLanguageSrtFile.Close()
originLanguageTextFile, err := os.Create(originLanguageTextFilePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitSrt os.Create originLanguageTextFile err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitSrt create originLanguageTextFile error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitSrt create originLanguageTextFile error: %w", err)
}
defer originLanguageTextFile.Close()
targetLanguageSrtFile, err := os.Create(targetLanguageSrtFilePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitSrt os.Create targetLanguageSrtFile err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle.splitSrt create targetLanguageSrtFile error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle.splitSrt create targetLanguageSrtFile error: %w", err)
}
defer targetLanguageSrtFile.Close()
targetLanguageTextFile, err := os.Create(targetLanguageTextFilePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.splitSrt os.Create targetLanguageTextFile err", zap.Any("stepParam", stepParam), zap.Error(err))
+ log.GetLogger().Error("audioToSubtitle.splitSrt create targetLanguageTextFile error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle.splitSrt create targetLanguageTextFile error: %w", err)
}
defer targetLanguageTextFile.Close()
@@ -304,8 +305,8 @@ func (s Service) splitSrt(ctx context.Context, stepParam *types.SubtitleTaskStep
}
if err = scanner.Err(); err != nil {
- log.GetLogger().Error("audioToSubtitle.splitSrt scanner.Err err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitSrt scan bilingual srt file error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitSrt scan bilingual srt file error: %w", err)
}
// 添加原语言单语字幕
subtitleInfo := types.SubtitleFileInfo{
@@ -358,7 +359,7 @@ func getSentenceTimestamps(words []types.Word, sentence string, lastTs float64,
if language == types.LanguageNameEnglish || language == types.LanguageNameGerman || language == types.LanguageNameTurkish { // 处理方式不同
sentenceWordList = util.SplitSentence(sentence)
if len(sentenceWordList) == 0 {
- return srtSt, sentenceWords, 0, fmt.Errorf("sentence is empty")
+ return srtSt, sentenceWords, 0, fmt.Errorf("getSentenceTimestamps sentence is empty")
}
thisLastTs := lastTs
@@ -397,7 +398,7 @@ func getSentenceTimestamps(words []types.Word, sentence string, lastTs float64,
beginWordIndex, endWordIndex := findMaxIncreasingSubArray(sentenceWords)
if (endWordIndex - beginWordIndex) == 0 {
- return srtSt, sentenceWords, 0, fmt.Errorf("no valid sentence")
+ return srtSt, sentenceWords, 0, errors.New("getSentenceTimestamps no valid sentence")
}
// 找到最大连续子数组后,再去找整个句子开始和结束的时间戳
@@ -467,7 +468,7 @@ func getSentenceTimestamps(words []types.Word, sentence string, lastTs float64,
} else {
sentenceWordList = strings.Split(util.GetRecognizableString(sentence), "")
if len(sentenceWordList) == 0 {
- return srtSt, sentenceWords, 0, fmt.Errorf("sentence is empty")
+ return srtSt, sentenceWords, 0, errors.New("getSentenceTimestamps sentence is empty")
}
// 这里的sentence words不是字面上连续的,而是可能有重复,可读连续的用下面的readable
@@ -496,7 +497,7 @@ func getSentenceTimestamps(words []types.Word, sentence string, lastTs float64,
var beginWordIndex, endWordIndex int
beginWordIndex, endWordIndex, readableSentenceWords = jumpFindMaxIncreasingSubArray(sentenceWords)
if (endWordIndex - beginWordIndex) == 0 {
- return srtSt, readableSentenceWords, 0, fmt.Errorf("no valid sentence")
+ return srtSt, readableSentenceWords, 0, errors.New("getSentenceTimestamps no valid sentence")
}
beginWord := sentenceWords[beginWordIndex]
@@ -622,8 +623,8 @@ func (s Service) generateTimestamps(taskId, basePath string, originLanguage type
// 判断有没有文本
srtNoTsFile, err := os.Open(audioFile.SrtNoTsFile)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.generateTimestamps.OpenSrtNoTsFile err", zap.String("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle generateTimestamps open SrtNoTsFile error", zap.String("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle generateTimestamps open SrtNoTsFile error: %w", err)
}
scanner := bufio.NewScanner(srtNoTsFile)
if scanner.Scan() {
@@ -635,8 +636,8 @@ func (s Service) generateTimestamps(taskId, basePath string, originLanguage type
// 获取原始无时间戳字幕内容
srtBlocks, err := util.ParseSrtNoTsToSrtBlock(audioFile.SrtNoTsFile)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.generateTimestamps.ReadSrtBlocks err", zap.String("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle generateTimestamps read SrtBlocks error", zap.String("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle generateTimestamps read SrtBlocks error: %w", err)
}
if len(srtBlocks) == 0 {
return nil
@@ -742,8 +743,8 @@ func (s Service) generateTimestamps(taskId, basePath string, originLanguage type
finalBilingualSrtFileName := fmt.Sprintf("%s/%s", basePath, fmt.Sprintf(types.SubtitleTaskSplitBilingualSrtFileNamePattern, audioFile.Num))
finalBilingualSrtFile, err := os.Create(finalBilingualSrtFileName)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.generateTimestamps.os.Open err", zap.String("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle generateTimestamps create bilingual srt file error", zap.String("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle generateTimestamps create bilingual srt file error: %w", err)
}
defer finalBilingualSrtFile.Close()
@@ -765,8 +766,8 @@ func (s Service) generateTimestamps(taskId, basePath string, originLanguage type
srtShortOriginMixedFileName := fmt.Sprintf("%s/%s", basePath, fmt.Sprintf(types.SubtitleTaskSplitShortOriginMixedSrtFileNamePattern, audioFile.Num))
srtShortOriginMixedFile, err := os.Create(srtShortOriginMixedFileName)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.generateTimestamps.os.Open err", zap.String("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle generateTimestamps create srtShortOriginMixedFile err", zap.String("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle generateTimestamps create srtShortOriginMixedFile err: %w", err)
}
defer srtShortOriginMixedFile.Close()
@@ -774,8 +775,8 @@ func (s Service) generateTimestamps(taskId, basePath string, originLanguage type
srtShortOriginFileName := fmt.Sprintf("%s/%s", basePath, fmt.Sprintf(types.SubtitleTaskSplitShortOriginSrtFileNamePattern, audioFile.Num))
srtShortOriginFile, err := os.Create(srtShortOriginFileName)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.generateTimestamps.os.Open err", zap.String("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle generateTimestamps create srtShortOriginFile err", zap.String("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle generateTimestamps create srtShortOriginFile err: %w", err)
}
defer srtShortOriginMixedFile.Close()
@@ -827,16 +828,16 @@ func (s Service) splitTextAndTranslate(taskId, baseTaskPath string, targetLangua
}
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.splitTextAndTranslate.ChatCompletion err", zap.Any("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitTextAndTranslate ChatCompletion error", zap.Any("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitTextAndTranslate ChatCompletion error: %w", err)
}
//保存不带时间戳的原始字幕
originNoTsSrtFile := fmt.Sprintf("%s/%s", baseTaskPath, fmt.Sprintf(types.SubtitleTaskSplitSrtNoTimestampFileNamePattern, audioFile.Num))
err = os.WriteFile(originNoTsSrtFile, []byte(splitContent), 0644)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.splitTextAndTranslate.os.WriteFile err", zap.Any("taskId", taskId), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle splitTextAndTranslate write originNoTsSrtFile err", zap.Any("taskId", taskId), zap.Error(err))
+ return fmt.Errorf("audioToSubtitle splitTextAndTranslate write originNoTsSrtFile err: %w", err)
}
audioFile.SrtNoTsFile = originNoTsSrtFile
diff --git a/internal/service/link2audio.go b/internal/service/link2audio.go
index 2d32c954..822096fa 100644
--- a/internal/service/link2audio.go
+++ b/internal/service/link2audio.go
@@ -27,15 +27,15 @@ func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleT
cmd := exec.Command(storage.FfmpegPath, "-i", videoPath, "-vn", "-ar", "44100", "-ac", "2", "-ab", "192k", "-f", "mp3", audioPath)
output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.Step1LinkToAudio ffmpeg err", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
- return err
+ log.GetLogger().Error("generateAudioSubtitles.linkToAudioFile ffmpeg error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("generateAudioSubtitles.linkToAudioFile ffmpeg error: %w", err)
}
} else if strings.Contains(link, "youtube.com") {
var videoId string
videoId, err = util.GetYouTubeID(link)
if err != nil {
- log.GetLogger().Error("linkToAudioFile.GetYouTubeID err", zap.Any("step param", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("linkToAudioFile.GetYouTubeID error", zap.Any("step param", stepParam), zap.Error(err))
+ return fmt.Errorf("linkToAudioFile.GetYouTubeID error: %w", err)
}
stepParam.Link = "https://www.youtube.com/watch?v=" + videoId
cmdArgs := []string{"-f", "bestaudio", "--extract-audio", "--audio-format", "mp3", "--audio-quality", "192K", "-o", audioPath, stepParam.Link}
@@ -47,13 +47,13 @@ func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleT
cmd := exec.Command(storage.YtdlpPath, cmdArgs...)
output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.Step2DownloadAudio yt-dlp err", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
- return err
+ log.GetLogger().Error("linkToAudioFile download audio yt-dlp error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("linkToAudioFile download audio yt-dlp error: %w", err)
}
} else if strings.Contains(link, "bilibili.com") {
videoId := util.GetBilibiliVideoId(link)
if videoId == "" {
- return errors.New("invalid link")
+ return errors.New("linkToAudioFile error: invalid link")
}
stepParam.Link = "https://www.bilibili.com/video/" + videoId
cmdArgs := []string{"-f", "bestaudio[ext=m4a]", "-x", "--audio-format", "mp3", "-o", audioPath, stepParam.Link}
@@ -63,12 +63,12 @@ func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleT
cmd := exec.Command(storage.YtdlpPath, cmdArgs...)
output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.Step2DownloadAudio yt-dlp err", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
- return err
+ log.GetLogger().Error("linkToAudioFile download audio yt-dlp error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("linkToAudioFile download audio yt-dlp error: %w", err)
}
} else {
log.GetLogger().Info("linkToAudioFile.unsupported link type", zap.Any("step param", stepParam))
- return errors.New("invalid link")
+ return errors.New("linkToAudioFile error: unsupported link, only support youtube, bilibili and local file")
}
stepParam.AudioFilePath = audioPath
// 更新字幕任务信息
diff --git a/internal/service/srt2speech.go b/internal/service/srt2speech.go
index 7493a912..544d21df 100644
--- a/internal/service/srt2speech.go
+++ b/internal/service/srt2speech.go
@@ -24,8 +24,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
// Step 1: 解析字幕文件
subtitles, err := parseSRT(stepParam.TtsSourceFilePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.parseSRT err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech parseSRT error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech parseSRT error: %w", err)
}
var audioFiles []string
@@ -34,8 +34,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
// 创建文件记录音频的开始和结束时间
durationDetailFile, err := os.Create(filepath.Join(stepParam.TaskBasePath, types.TtsAudioDurationDetailsFileName))
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.srtFileToSpeech.os.Create err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech create durationDetailFile error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech create durationDetailFile error: %w", err)
}
defer durationDetailFile.Close()
@@ -46,8 +46,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
var code string
code, err = s.VoiceCloneClient.CosyVoiceClone("krillinai", stepParam.VoiceCloneAudioUrl)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.srtFileToSpeech.VoiceCloneClient.CosyVoiceClone err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech CosyVoiceClone error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech CosyVoiceClone error: %w", err)
}
voiceCode = code
}
@@ -56,20 +56,20 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
outputFile := filepath.Join(stepParam.TaskBasePath, fmt.Sprintf("subtitle_%d.wav", i+1))
err = s.TtsClient.Text2Speech(sub.Text, voiceCode, outputFile)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.srtFileToSpeech.Text2Speech err", zap.Any("taskId", stepParam.TaskId), zap.Any("num", i+1), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech Text2Speech error", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech Text2Speech error: %w", err)
}
// Step 3: 调整音频时长
startTime, err := time.Parse("15:04:05,000", sub.Start)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.adjustAudioDuration.time.Parse err", zap.Any("taskId", stepParam.TaskId), zap.Any("num", i+1), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech parse time error", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.String("time str", sub.Start), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech parse time error: %w", err)
}
endTime, err := time.Parse("15:04:05,000", sub.End)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.time.Parse err", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.Error(err))
- return err
+ log.GetLogger().Error("audioToSubtitle.time.Parse error", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.String("time str", sub.Start), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech audioToSubtitle.time.Parse error: %w", err)
}
if i == 0 {
// 如果第一条字幕不是从00:00开始,增加静音帧
@@ -78,8 +78,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
silenceFilePath := filepath.Join(stepParam.TaskBasePath, "silence_0.wav")
err := newGenerateSilence(silenceFilePath, float64(silenceDurationMs)/1000)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.newGenerateSilence.ChatCompletion err", zap.Any("taskId", stepParam.TaskId), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech newGenerateSilence error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech newGenerateSilence error: %w", err)
}
audioFiles = append(audioFiles, silenceFilePath)
@@ -95,8 +95,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
// 如果不是最后一条字幕,增加静音帧时长
nextStartTime, err := time.Parse("15:04:05,000", subtitles[i+1].Start)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.time.Parse err", zap.Any("stepParam", stepParam), zap.Any("num", i+2), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech parse time error", zap.Any("stepParam", stepParam), zap.Any("num", i+2), zap.String("time str", subtitles[i+1].Start), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech parse time error: %w", err)
}
if endTime.Before(nextStartTime) {
duration = nextStartTime.Sub(startTime).Seconds()
@@ -106,8 +106,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
adjustedFile := filepath.Join(stepParam.TaskBasePath, fmt.Sprintf("adjusted_%d.wav", i+1))
err = adjustAudioDuration(outputFile, adjustedFile, stepParam.TaskBasePath, duration)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.adjustAudioDuration err", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech adjustAudioDuration error", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech adjustAudioDuration error: %w", err)
}
audioFiles = append(audioFiles, adjustedFile)
@@ -115,8 +115,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
// 计算音频的实际时长
audioDuration, err := util.GetAudioDuration(adjustedFile)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.GetAudioDuration err", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech GetAudioDuration error", zap.Any("stepParam", stepParam), zap.Any("num", i+1), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech GetAudioDuration error: %w", err)
}
// 计算音频的结束时间
@@ -130,8 +130,8 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
finalOutput := filepath.Join(stepParam.TaskBasePath, types.TtsResultAudioFileName)
err = concatenateAudioFiles(audioFiles, finalOutput, stepParam.TaskBasePath)
if err != nil {
- log.GetLogger().Error("audioToSubtitle.concatenateAudioFiles err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("srtFileToSpeech concatenateAudioFiles error", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("srtFileToSpeech concatenateAudioFiles error: %w", err)
}
stepParam.TtsResultFilePath = finalOutput
// 更新字幕任务信息
@@ -143,7 +143,7 @@ func (s Service) srtFileToSpeech(ctx context.Context, stepParam *types.SubtitleT
func parseSRT(filePath string) ([]types.SrtSentenceWithStrTime, error) {
data, err := os.ReadFile(filePath)
if err != nil {
- return nil, fmt.Errorf("读取文件失败: %v", err)
+ return nil, fmt.Errorf("parseSRT read file error: %w", err)
}
var subtitles []types.SrtSentenceWithStrTime
@@ -168,7 +168,7 @@ func newGenerateSilence(outputAudio string, duration float64) error {
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
- return fmt.Errorf("failed to generate PCM silence: %w", err)
+ return fmt.Errorf("newGenerateSilence failed to generate PCM silence: %w", err)
}
return nil
@@ -195,32 +195,32 @@ func adjustAudioDuration(inputFile, outputFile, taskBasePath string, subtitleDur
}
silenceAudioDuration, _ := util.GetAudioDuration(silenceFile)
- log.GetLogger().Debug("adjustAudioDuration", zap.Any("silenceDuration", silenceAudioDuration))
+ log.GetLogger().Info("adjustAudioDuration", zap.Any("silenceDuration", silenceAudioDuration))
// 拼接音频和静音
concatFile := filepath.Join(taskBasePath, "concat.txt")
f, err := os.Create(concatFile)
if err != nil {
- return fmt.Errorf("error creating concat file: %v", err)
+ return fmt.Errorf("adjustAudioDuration create concat file error: %w", err)
}
defer os.Remove(concatFile)
_, err = f.WriteString(fmt.Sprintf("file '%s'\nfile '%s'\n", filepath.Base(inputFile), filepath.Base(silenceFile)))
if err != nil {
- return fmt.Errorf("error writing to concat file: %v", err)
+ return fmt.Errorf("adjustAudioDuration write to concat file error: %v", err)
}
f.Close()
cmd := exec.Command(storage.FfmpegPath, "-y", "-f", "concat", "-safe", "0", "-i", concatFile, "-c", "copy", outputFile)
- log.GetLogger().Info("AiCapabilityGrpcServer adjustAudioDuration", zap.Any("inputFile", inputFile), zap.Any("outputFile", outputFile), zap.String("run command", cmd.String()))
+ log.GetLogger().Info("adjustAudioDuration", zap.Any("inputFile", inputFile), zap.Any("outputFile", outputFile), zap.String("run command", cmd.String()))
cmd.Stderr = os.Stderr
err = cmd.Run()
if err != nil {
- return fmt.Errorf("error concatenating audio and silence: %v", err)
+ return fmt.Errorf("adjustAudioDuration concat audio and silence error: %v", err)
}
concatFileDuration, _ := util.GetAudioDuration(outputFile)
- log.GetLogger().Debug("adjustAudioDuration", zap.Any("concatFileDuration", concatFileDuration))
+ log.GetLogger().Info("adjustAudioDuration", zap.Any("concatFileDuration", concatFileDuration))
return nil
}
diff --git a/internal/service/srt_embed.go b/internal/service/srt_embed.go
index 1a5f9526..d53cbf18 100644
--- a/internal/service/srt_embed.go
+++ b/internal/service/srt_embed.go
@@ -34,8 +34,8 @@ func (s Service) embedSubtitles(ctx context.Context, stepParam *types.SubtitleTa
log.GetLogger().Info("合成字幕嵌入视频:横屏")
err = embedSubtitles(stepParam, true)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles embedSubtitles err", zap.Any("step param", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("embedSubtitles embedSubtitles error", zap.Any("step param", stepParam), zap.Error(err))
+ return fmt.Errorf("embedSubtitles embedSubtitles error: %w", err)
}
}
if stepParam.EmbedSubtitleVideoType == "vertical" || stepParam.EmbedSubtitleVideoType == "all" {
@@ -44,16 +44,16 @@ func (s Service) embedSubtitles(ctx context.Context, stepParam *types.SubtitleTa
transferredVerticalVideoPath := filepath.Join(stepParam.TaskBasePath, types.SubtitleTaskTransferredVerticalVideoFileName)
err = convertToVertical(stepParam.InputVideoPath, transferredVerticalVideoPath, stepParam.VerticalVideoMajorTitle, stepParam.VerticalVideoMinorTitle)
if err != nil {
- log.GetLogger().Error("生成竖屏视频失败", zap.Any("step param", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("embedSubtitles convertToVertical error", zap.Any("step param", stepParam), zap.Error(err))
+ return fmt.Errorf("embedSubtitles convertToVertical error: %w", err)
}
stepParam.InputVideoPath = transferredVerticalVideoPath
}
log.GetLogger().Info("合成字幕嵌入视频:竖屏")
err = embedSubtitles(stepParam, false)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles embedSubtitles err", zap.Any("step param", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("embedSubtitles embedSubtitles error", zap.Any("step param", stepParam), zap.Error(err))
+ return fmt.Errorf("embedSubtitles embedSubtitles error: %w", err)
}
}
log.GetLogger().Info("字幕嵌入视频成功")
@@ -121,11 +121,11 @@ func splitChineseText(text string, maxWordLine int) []string {
return lines
}
-func parseSRTTime(timeStr string) (time.Duration, error) {
+func parseSrtTime(timeStr string) (time.Duration, error) {
timeStr = strings.Replace(timeStr, ",", ".", 1)
parts := strings.Split(timeStr, ":")
if len(parts) != 3 {
- return 0, fmt.Errorf("invalid time format: %s", timeStr)
+ return 0, fmt.Errorf("parseSrtTime invalid time format: %s", timeStr)
}
hours, err := strconv.Atoi(parts[0])
@@ -168,13 +168,15 @@ func formatTimestamp(t time.Duration) string {
func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.SubtitleTaskStepParam) error {
file, err := os.Open(inputSRT)
if err != nil {
- return err
+ log.GetLogger().Error("srtToAss Open input srt error", zap.Error(err))
+ return fmt.Errorf("srtToAss Open input srt error: %w", err)
}
defer file.Close()
assFile, err := os.Create(outputASS)
if err != nil {
- return err
+ log.GetLogger().Error("srtToAss Create output ass error", zap.Error(err))
+ return fmt.Errorf("srtToAss Create output ass error: %w", err)
}
defer assFile.Close()
scanner := bufio.NewScanner(file)
@@ -198,13 +200,15 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.Su
startTimeStr := strings.TrimSpace(parts[0])
endTimeStr := strings.TrimSpace(parts[1])
- startTime, err := parseSRTTime(startTimeStr)
+ startTime, err := parseSrtTime(startTimeStr)
if err != nil {
- return err
+ log.GetLogger().Error("srtToAss parseSrtTime error", zap.Error(err))
+ return fmt.Errorf("srtToAss parseSrtTime error: %w", err)
}
- endTime, err := parseSRTTime(endTimeStr)
+ endTime, err := parseSrtTime(endTimeStr)
if err != nil {
- return err
+ log.GetLogger().Error("srtToAss parseSrtTime error", zap.Error(err))
+ return fmt.Errorf("srtToAss parseSrtTime error: %w", err)
}
var subtitleLines []string
@@ -254,11 +258,11 @@ func srtToAss(inputSRT, outputASS string, isHorizontal bool, stepParam *types.Su
startTimeStr := strings.TrimSpace(parts[0])
endTimeStr := strings.TrimSpace(parts[1])
- startTime, err := parseSRTTime(startTimeStr)
+ startTime, err := parseSrtTime(startTimeStr)
if err != nil {
return err
}
- endTime, err := parseSRTTime(endTimeStr)
+ endTime, err := parseSrtTime(endTimeStr)
if err != nil {
return err
}
@@ -308,14 +312,15 @@ func embedSubtitles(stepParam *types.SubtitleTaskStepParam, isHorizontal bool) e
assPath := filepath.Join(stepParam.TaskBasePath, "formatted_subtitles.ass")
if err := srtToAss(stepParam.BilingualSrtFilePath, assPath, isHorizontal, stepParam); err != nil {
- return err
+ log.GetLogger().Error("embedSubtitles srtToAss error", zap.Any("step param", stepParam), zap.Error(err))
+ return fmt.Errorf("embedSubtitles srtToAss error: %w", err)
}
cmd := exec.Command(storage.FfmpegPath, "-y", "-i", stepParam.InputVideoPath, "-vf", fmt.Sprintf("ass=%s", strings.ReplaceAll(assPath, "\\", "/")), "-c:a", "aac", "-b:a", "192k", filepath.Join(stepParam.TaskBasePath, fmt.Sprintf("/output/%s", outputFileName)))
output, err := cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("embedSubtitles ffmpeg err", zap.Any("video path", stepParam.InputVideoPath), zap.String("output", string(output)), zap.Error(err))
- return err
+ log.GetLogger().Error("embedSubtitles embed subtitle into video ffmpeg error", zap.String("video path", stepParam.InputVideoPath), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("embedSubtitles embed subtitle into video ffmpeg error: %w", err)
}
return nil
}
diff --git a/internal/service/subtitle_service.go b/internal/service/subtitle_service.go
index 35325f55..35e8c537 100644
--- a/internal/service/subtitle_service.go
+++ b/internal/service/subtitle_service.go
@@ -137,7 +137,7 @@ func (s Service) StartSubtitleTask(req dto.StartVideoSubtitleTaskReq) (*dto.Star
if err != nil {
log.GetLogger().Error("StartVideoSubtitleTask linkToAudioFile err", zap.Any("req", req), zap.Error(err))
storage.SubtitleTasks[stepParam.TaskId].Status = types.SubtitleTaskStatusFailed
- storage.SubtitleTasks[stepParam.TaskId].FailReason = "link to audio error"
+ storage.SubtitleTasks[stepParam.TaskId].FailReason = err.Error()
return
}
// 暂时不加视频信息
diff --git a/internal/service/upload_subtitle.go b/internal/service/upload_subtitle.go
index 0f939839..5994c6c5 100644
--- a/internal/service/upload_subtitle.go
+++ b/internal/service/upload_subtitle.go
@@ -2,6 +2,7 @@ package service
import (
"context"
+ "fmt"
"go.uber.org/zap"
"krillin-ai/internal/storage"
"krillin-ai/internal/types"
@@ -18,8 +19,8 @@ func (s Service) uploadSubtitles(ctx context.Context, stepParam *types.SubtitleT
replacedSrcFile := util.AddSuffixToFileName(resultPath, "_replaced")
err = util.ReplaceFileContent(resultPath, replacedSrcFile, stepParam.ReplaceWordsMap)
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.uploadSubtitles ReplaceFileContent err", zap.Any("stepParam", stepParam), zap.Error(err))
- return err
+ log.GetLogger().Error("uploadSubtitles ReplaceFileContent err", zap.Any("stepParam", stepParam), zap.Error(err))
+ return fmt.Errorf("uploadSubtitles ReplaceFileContent err: %w", err)
}
resultPath = replacedSrcFile
}
diff --git a/pkg/aliyun/voice_clone.go b/pkg/aliyun/voice_clone.go
index d97076e4..0806c895 100644
--- a/pkg/aliyun/voice_clone.go
+++ b/pkg/aliyun/voice_clone.go
@@ -102,13 +102,13 @@ func (c *VoiceCloneClient) CosyVoiceClone(voicePrefix, audioURL string) (string,
var res VoiceCloneResp
resp, err := c.restyClient.R().SetResult(&res).Post(fullURL)
if err != nil {
- log.GetLogger().Error("CosyVoiceClone请求失败", zap.Error(err))
- return "", err
+ log.GetLogger().Error("CosyVoiceClone post error", zap.Error(err))
+ return "", fmt.Errorf("CosyVoiceClone post error: %w: ", err)
}
log.GetLogger().Info("CosyVoiceClone请求完毕", zap.String("Response", resp.String()))
if res.Message != "SUCCESS" {
- log.GetLogger().Error("CosyVoiceClone请求响应错误", zap.String("Request Id", res.RequestId), zap.Int("Code", res.Code), zap.String("Message", res.Message))
- return "", fmt.Errorf("CosyVoiceClone请求响应错误: %s", res.Message)
+ log.GetLogger().Error("CosyVoiceClone res message is not success", zap.String("Request Id", res.RequestId), zap.Int("Code", res.Code), zap.String("Message", res.Message))
+ return "", fmt.Errorf("CosyVoiceClone res message is not success, message: %s", res.Message)
}
return res.VoiceName, nil
}
diff --git a/pkg/util/subtitle.go b/pkg/util/subtitle.go
index 621abe55..2c93131b 100644
--- a/pkg/util/subtitle.go
+++ b/pkg/util/subtitle.go
@@ -299,13 +299,13 @@ func GetAudioDuration(inputFile string) (float64, error) {
cmd := exec.Command(storage.FfprobePath, "-i", inputFile, "-show_entries", "format=duration", "-v", "quiet", "-of", "csv=p=0")
cmdOutput, err := cmd.Output()
if err != nil {
- return 0, fmt.Errorf("failed to get audio duration: %w", err)
+ return 0, fmt.Errorf("GetAudioDuration failed to get audio duration: %w", err)
}
// 解析时长
duration, err := strconv.ParseFloat(strings.TrimSpace(string(cmdOutput)), 64)
if err != nil {
- return 0, fmt.Errorf("failed to parse audio duration: %w", err)
+ return 0, fmt.Errorf("GetAudioDuration failed to parse audio duration: %w", err)
}
return duration, nil