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: support subtitle embed when use video link

沈浩be4e4ce765c7
diff --git a/internal/service/link2audio.go b/internal/service/link2audio.go
index 822096fa..f9b6d822 100644
--- a/internal/service/link2audio.go
+++ b/internal/service/link2audio.go
@@ -13,29 +13,31 @@ import (
"strings"
)
-func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleTaskStepParam) error {
+func (s Service) linkToFile(ctx context.Context, stepParam *types.SubtitleTaskStepParam) error {
var (
err error
output []byte
)
link := stepParam.Link
audioPath := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskAudioFileName)
+ videoPath := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskVideoFileName)
+ storage.SubtitleTasks[stepParam.TaskId].ProcessPct = 3
if strings.Contains(link, "local:") {
// 本地文件
- videoPath := strings.ReplaceAll(link, "local:", "")
+ videoPath = strings.ReplaceAll(link, "local:", "")
stepParam.InputVideoPath = videoPath
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.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)
+ log.GetLogger().Error("generateAudioSubtitles.linkToFile ffmpeg error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("generateAudioSubtitles.linkToFile 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 error", zap.Any("step param", stepParam), zap.Error(err))
- return fmt.Errorf("linkToAudioFile.GetYouTubeID error: %w", err)
+ log.GetLogger().Error("linkToFile.GetYouTubeID error", zap.Any("step param", stepParam), zap.Error(err))
+ return fmt.Errorf("linkToFile.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 +49,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("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)
+ log.GetLogger().Error("linkToFile download audio yt-dlp error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("linkToFile download audio yt-dlp error: %w", err)
}
} else if strings.Contains(link, "bilibili.com") {
videoId := util.GetBilibiliVideoId(link)
if videoId == "" {
- return errors.New("linkToAudioFile error: invalid link")
+ return errors.New("linkToFile 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,15 +65,28 @@ 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("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)
+ log.GetLogger().Error("linkToFile download audio yt-dlp error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("linkToFile download audio yt-dlp error: %w", err)
}
} else {
- log.GetLogger().Info("linkToAudioFile.unsupported link type", zap.Any("step param", stepParam))
- return errors.New("linkToAudioFile error: unsupported link, only support youtube, bilibili and local file")
+ log.GetLogger().Info("linkToFile.unsupported link type", zap.Any("step param", stepParam))
+ return errors.New("linkToFile error: unsupported link, only support youtube, bilibili and local file")
}
+ storage.SubtitleTasks[stepParam.TaskId].ProcessPct = 6
stepParam.AudioFilePath = audioPath
+
+ if !strings.HasPrefix(link, "local:") && stepParam.EmbedSubtitleVideoType != "none" {
+ // 需要下载原视频
+ cmd := exec.Command(storage.YtdlpPath, "-f", "bestvideo[ext=mp4]+bestaudio[ext=m4a]", "-o", videoPath, stepParam.Link)
+ output, err = cmd.CombinedOutput()
+ if err != nil {
+ log.GetLogger().Error("linkToFile download video yt-dlp error", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
+ return fmt.Errorf("linkToFile download video yt-dlp error: %w", err)
+ }
+ stepParam.InputVideoPath = videoPath
+ }
+
// 更新字幕任务信息
- storage.SubtitleTasks[stepParam.TaskId].ProcessPct = 6
+ storage.SubtitleTasks[stepParam.TaskId].ProcessPct = 10
return nil
}
diff --git a/internal/service/subtitle_service.go b/internal/service/subtitle_service.go
index 712ac637..faa96c51 100644
--- a/internal/service/subtitle_service.go
+++ b/internal/service/subtitle_service.go
@@ -133,9 +133,9 @@ func (s Service) StartSubtitleTask(req dto.StartVideoSubtitleTaskReq) (*dto.Star
}()
// 新版流程:链接->本地音频文件->视频信息获取(若有)->本地字幕文件->语言合成->视频合成->字幕文件链接生成
log.GetLogger().Info("video subtitle start task", zap.String("taskId", taskId))
- err = s.linkToAudioFile(ctx, &stepParam)
+ err = s.linkToFile(ctx, &stepParam)
if err != nil {
- log.GetLogger().Error("StartVideoSubtitleTask linkToAudioFile err", zap.Any("req", req), zap.Error(err))
+ log.GetLogger().Error("StartVideoSubtitleTask linkToFile err", zap.Any("req", req), zap.Error(err))
storage.SubtitleTasks[stepParam.TaskId].Status = types.SubtitleTaskStatusFailed
storage.SubtitleTasks[stepParam.TaskId].FailReason = err.Error()
return
diff --git a/internal/types/subtitle_task.go b/internal/types/subtitle_task.go
index fba3b5ff..09394f9d 100644
--- a/internal/types/subtitle_task.go
+++ b/internal/types/subtitle_task.go
@@ -110,6 +110,7 @@ const (
const (
SubtitleTaskAudioFileName = "origin_audio.mp3"
+ SubtitleTaskVideoFileName = "origin_video.mp4"
SubtitleTaskSplitAudioFileNamePrefix = "split_audio"
SubtitleTaskSplitAudioFileNamePattern = SubtitleTaskSplitAudioFileNamePrefix + "_%03d.mp3"
SubtitleTaskSplitAudioTxtFileNamePattern = "split_audio_txt_%d.txt"
diff --git a/main.exe b/main.exe
deleted file mode 100644
index 00e860f3..00000000
Binary files a/main.exe and /dev/null differ
diff --git a/static/index.html b/static/index.html
index bf0abb80..17e30717 100644
--- a/static/index.html
+++ b/static/index.html
@@ -258,26 +258,26 @@
display: inline-block;
margin: 5px;
padding: 10px 24px;
- background: #f8f9fa; /* 浅灰色背景 */
- color: #495057; /* 深灰色文字 */
- border: 1px solid #ced4da; /* 浅灰色边框 */
+ background: #f8f9fa;
+ color: #495057;
+ border: 1px solid #ced4da;
border-radius: 6px;
cursor: pointer;
outline: 0;
transition: background 0.3s ease, border-color 0.3s ease, color 0.3s ease;
- text-decoration: none; /* 去除链接下划线 */
+ text-decoration: none;
text-align: center;
font-size: 14px;
}
.download-button:hover {
- background: #e9ecef; /* 稍微深一点的灰色背景 */
- border-color: #adb5bd; /* 稍微深一点的边框颜色 */
- color: #343a40; /* 更深的文字颜色 */
+ background: #e9ecef;
+ border-color: #adb5bd;
+ color: #343a40;
}
.download-button:focus,
.download-button:focus-visible {
outline: 0;
- border-color: #007bff; /* 焦点状态时边框变为蓝色 */
+ border-color: #007bff;
box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.25); /* 添加焦点状态的光晕效果 */
}
@@ -446,7 +446,7 @@
</div>
<!-- 合成字幕嵌入视频 -->
- <div class="formGroup hidden" id="embed-subtitle-container">
+ <div class="formGroup" id="embed-subtitle-container">
<label>合成字幕嵌入视频:</label>
<input type="checkbox" id="embed-subtitle-toggle">
<select id="embed-subtitle">
@@ -504,7 +504,6 @@
const addRowButton = document.getElementById("add-row");
const embedSubtitleVideoTypeToggle = document.getElementById("embed-subtitle-toggle");
const embedSubtitleVideoType = document.getElementById("embed-subtitle");
- const embedSubtitleContainer = document.getElementById("embed-subtitle-container");
const embedSubtitle = document.getElementById("embed-subtitle");
const subtitleTextInputs = document.getElementById("subtitle-text-inputs");
const verticalMajorTitle = document.getElementById("subtitle-text-1");
@@ -659,14 +658,12 @@
if (radio.value === 'url') {
urlInputContainer.classList.remove('hidden');
fileInputContainer.classList.add('hidden');
- embedSubtitleContainer.classList.add('hidden');
fileInput.required = false;
urlInput.required = true;
executeButton.disabled = false; // 启用“执行”按钮
} else {
urlInputContainer.classList.add('hidden');
fileInputContainer.classList.remove('hidden');
- embedSubtitleContainer.classList.remove('hidden');
urlInput.required = false;
fileInput.required = true;
executeButton.disabled = true; // 禁用“执行”按钮,等待上传完成