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.

Improve cookie handling

wulien689063dd2af0
diff --git a/.gitignore b/.gitignore
index 49acf3be..0b733c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
.idea
+.claude/
+.github/
+docs/plans/
tasks/
cookies.txt
.vscode/
@@ -10,6 +13,10 @@ app.log
build/
dist/
+# Superpowers Skills Framework (local junction to ~/.superpowers)
+.superpowers
+
# MACOS
.DS_Store
._*
+KrillinAI.exe
diff --git a/internal/service/get_video_info.go b/internal/service/get_video_info.go
index 0171a742..02b73b3b 100644
--- a/internal/service/get_video_info.go
+++ b/internal/service/get_video_info.go
@@ -22,8 +22,8 @@ func (s Service) getVideoInfo(ctx context.Context, stepParam *types.SubtitleTask
// 获取标题
titleCmdArgs := []string{"--skip-download", "--encoding", "utf-8", "--get-title", stepParam.Link}
descriptionCmdArgs := []string{"--skip-download", "--encoding", "utf-8", "--get-description", stepParam.Link}
- titleCmdArgs = append(titleCmdArgs, "--cookies", "./cookies.txt")
- descriptionCmdArgs = append(descriptionCmdArgs, "--cookies", "./cookies.txt")
+ titleCmdArgs = appendCookiesArgs(titleCmdArgs, youtubeCookiesPath)
+ descriptionCmdArgs = appendCookiesArgs(descriptionCmdArgs, youtubeCookiesPath)
if config.Conf.App.Proxy != "" {
titleCmdArgs = append(titleCmdArgs, "--proxy", config.Conf.App.Proxy)
descriptionCmdArgs = append(descriptionCmdArgs, "--proxy", config.Conf.App.Proxy)
diff --git a/internal/service/link2file.go b/internal/service/link2file.go
index 6ac2d19d..b547edd0 100644
--- a/internal/service/link2file.go
+++ b/internal/service/link2file.go
@@ -46,7 +46,7 @@ func (s Service) linkToFile(ctx context.Context, stepParam *types.SubtitleTaskSt
if config.Conf.App.Proxy != "" {
cmdArgs = append(cmdArgs, "--proxy", config.Conf.App.Proxy)
}
- cmdArgs = append(cmdArgs, "--cookies", "./cookies.txt")
+ cmdArgs = appendCookiesArgs(cmdArgs, youtubeCookiesPath)
if storage.FfmpegPath != "ffmpeg" {
cmdArgs = append(cmdArgs, "--ffmpeg-location", storage.FfmpegPath)
}
diff --git a/internal/service/youtube_cookies.go b/internal/service/youtube_cookies.go
new file mode 100644
index 00000000..d5942120
--- /dev/null
+++ b/internal/service/youtube_cookies.go
@@ -0,0 +1,60 @@
+package service
+
+import (
+ "bufio"
+ "os"
+ "strings"
+
+ "krillin-ai/log"
+
+ "go.uber.org/zap"
+)
+
+const youtubeCookiesPath = "./cookies.txt"
+
+func appendCookiesArgs(args []string, cookiesPath string) []string {
+ if !isNetscapeCookiesFile(cookiesPath) {
+ return args
+ }
+
+ if logger := log.GetLogger(); logger != nil {
+ logger.Info("Using cookies for yt-dlp authentication", zap.String("cookiesPath", cookiesPath))
+ }
+ return append(args, "--cookies", cookiesPath)
+}
+
+func isNetscapeCookiesFile(cookiesPath string) bool {
+ file, err := os.Open(cookiesPath)
+ if err != nil {
+ if !os.IsNotExist(err) {
+ if logger := log.GetLogger(); logger != nil {
+ logger.Warn("Failed to open cookies file, skipping cookies", zap.String("cookiesPath", cookiesPath), zap.Error(err))
+ }
+ }
+ return false
+ }
+ defer file.Close()
+
+ scanner := bufio.NewScanner(file)
+ for scanner.Scan() {
+ line := strings.TrimSpace(scanner.Text())
+ if line == "" {
+ continue
+ }
+ line = strings.TrimPrefix(line, "\ufeff")
+ if strings.HasPrefix(line, "# Netscape HTTP Cookie File") {
+ return true
+ }
+ if logger := log.GetLogger(); logger != nil {
+ logger.Warn("Cookies file is not Netscape format, skipping cookies", zap.String("cookiesPath", cookiesPath))
+ }
+ return false
+ }
+
+ if err := scanner.Err(); err != nil {
+ if logger := log.GetLogger(); logger != nil {
+ logger.Warn("Failed to read cookies file, skipping cookies", zap.String("cookiesPath", cookiesPath), zap.Error(err))
+ }
+ }
+ return false
+}
diff --git a/internal/service/youtube_cookies_test.go b/internal/service/youtube_cookies_test.go
new file mode 100644
index 00000000..176b02cf
--- /dev/null
+++ b/internal/service/youtube_cookies_test.go
@@ -0,0 +1,61 @@
+package service
+
+import (
+ "os"
+ "path/filepath"
+ "reflect"
+ "testing"
+)
+
+func TestAppendCookiesArgsSkipsMissingCookieFile(t *testing.T) {
+ path := filepath.Join(t.TempDir(), "cookies.txt")
+ args := appendCookiesArgs([]string{"--skip-download"}, path)
+
+ want := []string{"--skip-download"}
+ if !reflect.DeepEqual(args, want) {
+ t.Fatalf("appendCookiesArgs() = %v, want %v", args, want)
+ }
+}
+
+func TestAppendCookiesArgsSkipsEmptyCookieFile(t *testing.T) {
+ path := filepath.Join(t.TempDir(), "cookies.txt")
+ if err := os.WriteFile(path, nil, 0644); err != nil {
+ t.Fatalf("write empty cookie file: %v", err)
+ }
+
+ args := appendCookiesArgs([]string{"--skip-download"}, path)
+
+ want := []string{"--skip-download"}
+ if !reflect.DeepEqual(args, want) {
+ t.Fatalf("appendCookiesArgs() = %v, want %v", args, want)
+ }
+}
+
+func TestAppendCookiesArgsSkipsNonNetscapeCookieFile(t *testing.T) {
+ path := filepath.Join(t.TempDir(), "cookies.txt")
+ if err := os.WriteFile(path, []byte("SID=abc123; Path=/; Domain=.youtube.com\n"), 0644); err != nil {
+ t.Fatalf("write non-netscape cookie file: %v", err)
+ }
+
+ args := appendCookiesArgs([]string{"--skip-download"}, path)
+
+ want := []string{"--skip-download"}
+ if !reflect.DeepEqual(args, want) {
+ t.Fatalf("appendCookiesArgs() = %v, want %v", args, want)
+ }
+}
+
+func TestAppendCookiesArgsUsesNetscapeCookieFile(t *testing.T) {
+ path := filepath.Join(t.TempDir(), "cookies.txt")
+ content := "# Netscape HTTP Cookie File\n.youtube.com\tTRUE\t/\tFALSE\t0\tVISITOR_INFO1_LIVE\tabc123\n"
+ if err := os.WriteFile(path, []byte(content), 0644); err != nil {
+ t.Fatalf("write netscape cookie file: %v", err)
+ }
+
+ args := appendCookiesArgs([]string{"--skip-download"}, path)
+
+ want := []string{"--skip-download", "--cookies", path}
+ if !reflect.DeepEqual(args, want) {
+ t.Fatalf("appendCookiesArgs() = %v, want %v", args, want)
+ }
+}
diff --git a/internal/service/youtube_subtitle.go b/internal/service/youtube_subtitle.go
index 582bcf50..6e15ad81 100644
--- a/internal/service/youtube_subtitle.go
+++ b/internal/service/youtube_subtitle.go
@@ -146,8 +146,8 @@ func (s *YouTubeSubtitleService) downloadYouTubeSubtitle(ctx context.Context, re
cmdArgs = append(cmdArgs, "--proxy", config.Conf.App.Proxy)
}
- // 添加cookies
- // cmdArgs = append(cmdArgs, "--cookies", "./cookies.txt")
+ // 添加cookies(如果存在且格式有效)
+ cmdArgs = appendCookiesArgs(cmdArgs, youtubeCookiesPath)
// 添加ffmpeg路径
if storage.FfmpegPath != "ffmpeg" {
@@ -2338,8 +2338,8 @@ func (s *YouTubeSubtitleService) findVttWordsForSrtBlock(
match := true
for j, expectedWord := range expectedWords {
actualWord := strings.TrimSpace(sentence.Words[i+j].Text)
- expectedClean := strings.Trim(expectedWord, ".,!?;:")
- actualClean := strings.Trim(actualWord, ".,!?;:")
+ expectedClean := strings.Trim(expectedWord, `".,!?;:'"`)
+ actualClean := strings.Trim(actualWord, `".,!?;:'"`)
if !strings.EqualFold(expectedClean, actualClean) {
match = false