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 macOS

沈浩038322c8f35c
diff --git a/internal/service/subtitle_service.go b/internal/service/subtitle_service.go
index 3aeb3f10..71169d96 100644
--- a/internal/service/subtitle_service.go
+++ b/internal/service/subtitle_service.go
@@ -191,16 +191,19 @@ func (s Service) GetTaskStatus(req dto.GetVideoSubtitleTaskReq) (*dto.GetVideoSu
// 新版流程:链接->本地音频文件->扣费->视频信息获取(若有)->本地字幕文件->cos上的字幕信息
func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleTaskStepParam) error {
- var err error
+ var (
+ err error
+ output []byte
+ )
link := stepParam.Link
audioPath := fmt.Sprintf("%s/%s", stepParam.TaskBasePath, types.SubtitleTaskAudioFileName)
if strings.Contains(link, "local:") {
// 本地文件
videoPath := strings.ReplaceAll(link, "local:", "")
cmd := exec.Command(storage.FfmpegPath, "-i", videoPath, "-vn", "-ar", "44100", "-ac", "2", "-ab", "192k", "-f", "mp3", audioPath)
- err = cmd.Run()
+ output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.Step1LinkToAudio ffmpeg err", zap.Any("step param", stepParam), zap.Error(err))
+ log.GetLogger().Error("generateAudioSubtitles.Step1LinkToAudio ffmpeg err", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
return err
}
} else if strings.Contains(link, "youtube.com") {
@@ -215,10 +218,13 @@ func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleT
cmdArgs := []string{"-f", "bestaudio", "--extract-audio", "--audio-format", "mp3", "--audio-quality", "192K", "-o", audioPath, stepParam.Link}
cmdArgs = append(cmdArgs, "--cookies", "./cookies.txt")
+ if storage.FfmpegPath != "ffmpeg" {
+ cmdArgs = append(cmdArgs, "--ffmpeg-location", storage.FfmpegPath)
+ }
cmd := exec.Command(storage.YtdlpPath, cmdArgs...)
- err = cmd.Run()
+ output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.Step2DownloadAudio yt-dlp err", zap.Any("step param", stepParam), zap.Error(err))
+ log.GetLogger().Error("generateAudioSubtitles.Step2DownloadAudio yt-dlp err", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
return err
}
} else if strings.Contains(link, "bilibili.com") {
@@ -228,14 +234,17 @@ func (s Service) linkToAudioFile(ctx context.Context, stepParam *types.SubtitleT
}
stepParam.Link = "https://www.bilibili.com/video/" + videoId
cmdArgs := []string{"-f", "bestaudio[ext=m4a]", "-x", "--audio-format", "mp3", "-o", audioPath, stepParam.Link}
+ if storage.FfmpegPath != "ffmpeg" {
+ cmdArgs = append(cmdArgs, "--ffmpeg-location", storage.FfmpegPath)
+ }
//proxy := conf.GetString("subtitle.proxy")
//if proxy != "" {
// cmdArgs = append(cmdArgs, "--proxy", proxy)
//}
cmd := exec.Command(storage.YtdlpPath, cmdArgs...)
- err = cmd.Run()
+ output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("generateAudioSubtitles.Step2DownloadAudio yt-dlp err", zap.Any("step param", stepParam), zap.Error(err))
+ log.GetLogger().Error("generateAudioSubtitles.Step2DownloadAudio yt-dlp err", zap.Any("step param", stepParam), zap.String("output", string(output)), zap.Error(err))
return err
}
} else {
@@ -267,18 +276,24 @@ func (s Service) getVideoInfo(ctx context.Context, stepParam *types.SubtitleTask
//}
titleCmdArgs = append(titleCmdArgs, "--cookies", "./cookies.txt")
descriptionCmdArgs = append(descriptionCmdArgs, "--cookies", "./cookies.txt")
+ if storage.FfmpegPath != "ffmpeg" {
+ titleCmdArgs = append(titleCmdArgs, "--ffmpeg-location", storage.FfmpegPath)
+ descriptionCmdArgs = append(descriptionCmdArgs, "--ffmpeg-location", storage.FfmpegPath)
+ }
cmd := exec.Command(storage.YtdlpPath, titleCmdArgs...)
var output []byte
- output, err = cmd.Output()
+ output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("getVideoInfo yt-dlp error", zap.Any("stepParam", stepParam), zap.Error(err))
+ log.GetLogger().Error("getVideoInfo yt-dlp error", zap.Any("stepParam", stepParam), zap.String("output", string(output)), zap.Error(err))
+ output = []byte{}
// 不需要整个流程退出
}
title = string(output)
cmd = exec.Command(storage.YtdlpPath, descriptionCmdArgs...)
- output, err = cmd.Output()
+ output, err = cmd.CombinedOutput()
if err != nil {
- log.GetLogger().Error("getVideoInfo yt-dlp error", zap.Any("stepParam", stepParam), zap.Error(err))
+ log.GetLogger().Error("getVideoInfo yt-dlp error", zap.Any("stepParam", stepParam), zap.String("output", string(output)), zap.Error(err))
+ output = []byte{}
}
description = string(output)
log.GetLogger().Debug("getVideoInfo title and description", zap.String("title", title), zap.String("description", description))
diff --git a/main b/main
new file mode 100644
index 00000000..4b8bb350
Binary files /dev/null and b/main differ
diff --git a/pkg/util/base.go b/pkg/util/base.go
index 925748ae..a7397e8d 100644
--- a/pkg/util/base.go
+++ b/pkg/util/base.go
@@ -5,6 +5,7 @@ import (
"fmt"
"go.uber.org/zap"
"io"
+ "krillin-ai/config"
"krillin-ai/internal/storage"
"krillin-ai/log"
"math"
@@ -76,20 +77,33 @@ func IsNumber(s string) bool {
return err == nil
}
-// DownloadFile 下载文件并保存到指定路径
-func DownloadFile(url, filepath string) error {
- out, err := os.Create(filepath)
+// DownloadFile 下载文件并保存到指定路径,支持代理
+func DownloadFile(urlStr, filepath, proxyAddr string) error {
+ proxyURL, err := url.Parse(proxyAddr)
if err != nil {
return err
}
- defer out.Close()
- resp, err := http.Get(url)
+ client := &http.Client{}
+
+ if proxyURL != nil {
+ client.Transport = &http.Transport{
+ Proxy: http.ProxyURL(proxyURL),
+ }
+ }
+
+ resp, err := client.Get(urlStr)
if err != nil {
return err
}
defer resp.Body.Close()
+ out, err := os.Create(filepath)
+ if err != nil {
+ return err
+ }
+ defer out.Close()
+
_, err = io.Copy(out, resp.Body)
return err
}
@@ -169,7 +183,7 @@ func CheckAndDownloadFfmpeg() error {
// 下载
ffmpegDownloadPath := "./bin/ffmpeg.zip"
- err = DownloadFile(ffmpegURL, ffmpegDownloadPath)
+ err = DownloadFile(ffmpegURL, ffmpegDownloadPath, config.Conf.App.Proxy)
if err != nil {
log.GetLogger().Error("下载ffmpeg失败", zap.Error(err))
return err
@@ -229,7 +243,7 @@ func CheckAndDownloadFfprobe() error {
// 下载
ffprobeDownloadPath := "./bin/ffprobe.zip"
- err = DownloadFile(ffprobeURL, ffprobeDownloadPath)
+ err = DownloadFile(ffprobeURL, ffprobeDownloadPath, config.Conf.App.Proxy)
if err != nil {
log.GetLogger().Error("下载ffprobe失败", zap.Error(err))
return err
@@ -285,32 +299,26 @@ func CheckAndDownloadYtDlp() error {
return fmt.Errorf("unsupported OS: %s", runtime.GOOS)
}
- ytDlpPathLocal := "./bin/yt-dlp"
- if runtime.GOOS != "windows" {
- err = os.Chmod(ytDlpPathLocal, 0755)
- if err != nil {
- log.GetLogger().Error("设置文件权限失败", zap.Error(err))
- return err
- }
- } else {
- ytDlpPathLocal += ".exe"
+ ytDlpDownloadPath := "./bin/yt-dlp"
+ if runtime.GOOS == "windows" {
+ ytDlpDownloadPath += ".exe"
}
- err = DownloadFile(ytDlpURL, ytDlpPathLocal)
+ err = DownloadFile(ytDlpURL, ytDlpDownloadPath, config.Conf.App.Proxy)
if err != nil {
log.GetLogger().Error("下载yt-dlp失败", zap.Error(err))
return err
}
if runtime.GOOS != "windows" {
- err = os.Chmod(ytDlpPathLocal, 0755)
+ err = os.Chmod(ytDlpDownloadPath, 0755)
if err != nil {
log.GetLogger().Error("设置文件权限失败", zap.Error(err))
return err
}
}
- storage.YtdlpPath = ytDlpPathLocal
- log.GetLogger().Info("yt-dlp安装完成", zap.String("路径", ytDlpPathLocal))
+ storage.YtdlpPath = ytDlpDownloadPath
+ log.GetLogger().Info("yt-dlp安装完成", zap.String("路径", ytDlpDownloadPath))
return nil
}