Merge pull request #47 from krillinai/feat-aitool

feat: add proxy in ytdlp

Author: maranello-o

internal/service/get_video_info.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"go.uber.org/zap"
+	"krillin-ai/config"
 	"krillin-ai/internal/storage"
 	"krillin-ai/internal/types"
 	"krillin-ai/log"
@@ -23,6 +24,10 @@ func (s Service) getVideoInfo(ctx context.Context, stepParam *types.SubtitleTask
 		descriptionCmdArgs := []string{"--skip-download", "--encoding", "utf-8", "--get-description", stepParam.Link}
 		titleCmdArgs = append(titleCmdArgs, "--cookies", "./cookies.txt")
 		descriptionCmdArgs = append(descriptionCmdArgs, "--cookies", "./cookies.txt")
+		if config.Conf.App.Proxy != "" {
+			titleCmdArgs = append(titleCmdArgs, "--proxy", config.Conf.App.Proxy)
+			descriptionCmdArgs = append(descriptionCmdArgs, "--proxy", config.Conf.App.Proxy)
+		}
 		if storage.FfmpegPath != "ffmpeg" {
 			titleCmdArgs = append(titleCmdArgs, "--ffmpeg-location", storage.FfmpegPath)
 			descriptionCmdArgs = append(descriptionCmdArgs, "--ffmpeg-location", storage.FfmpegPath)

internal/service/link2file.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"go.uber.org/zap"
+	"krillin-ai/config"
 	"krillin-ai/internal/storage"
 	"krillin-ai/internal/types"
 	"krillin-ai/log"
@@ -41,7 +42,9 @@ func (s Service) linkToFile(ctx context.Context, stepParam *types.SubtitleTaskSt
 		}
 		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}
-
+		if config.Conf.App.Proxy != "" {
+			cmdArgs = append(cmdArgs, "--proxy", config.Conf.App.Proxy)
+		}
 		cmdArgs = append(cmdArgs, "--cookies", "./cookies.txt")
 		if storage.FfmpegPath != "ffmpeg" {
 			cmdArgs = append(cmdArgs, "--ffmpeg-location", storage.FfmpegPath)
@@ -59,6 +62,9 @@ func (s Service) linkToFile(ctx context.Context, stepParam *types.SubtitleTaskSt
 		}
 		stepParam.Link = "https://www.bilibili.com/video/" + videoId
 		cmdArgs := []string{"-f", "bestaudio[ext=m4a]", "-x", "--audio-format", "mp3", "-o", audioPath, stepParam.Link}
+		if config.Conf.App.Proxy != "" {
+			cmdArgs = append(cmdArgs, "--proxy", config.Conf.App.Proxy)
+		}
 		if storage.FfmpegPath != "ffmpeg" {
 			cmdArgs = append(cmdArgs, "--ffmpeg-location", storage.FfmpegPath)
 		}
@@ -77,7 +83,11 @@ func (s Service) linkToFile(ctx context.Context, stepParam *types.SubtitleTaskSt
 
 	if !strings.HasPrefix(link, "local:") && stepParam.EmbedSubtitleVideoType != "none" {
 		// 需要下载原视频
-		cmd := exec.Command(storage.YtdlpPath, "-f", "bestvideo[height<=1080][ext=mp4]+bestaudio[ext=m4a]/bestvideo[height<=720][ext=mp4]+bestaudio[ext=m4a]/bestvideo[height<=480][ext=mp4]+bestaudio[ext=m4a]", "-o", videoPath, stepParam.Link)
+		cmdArgs := []string{"-f", "bestvideo[height<=1080][ext=mp4]+bestaudio[ext=m4a]/bestvideo[height<=720][ext=mp4]+bestaudio[ext=m4a]/bestvideo[height<=480][ext=mp4]+bestaudio[ext=m4a]", "-o", videoPath, stepParam.Link}
+		if config.Conf.App.Proxy != "" {
+			cmdArgs = append(cmdArgs, "--proxy", config.Conf.App.Proxy)
+		}
+		cmd := exec.Command(storage.YtdlpPath, cmdArgs...)
 		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))

static/index.html

@@ -331,6 +331,7 @@ <h1>世界帧精彩</h1>
 					<option value="ja">日文</option>
 					<option value="tr">土耳其语</option>
 					<option value="de">德语</option>
+					<option value="ko">韩语</option>
 				</select>
 			</div>