chore: bump version to 0.0.36 [skip ci]

VERSION

@@ -1 +1 @@
-0.0.34
+0.0.36

internal/service/cloud115/queue_executor.go

@@ -26,10 +26,13 @@ var (
 	executorOnce   sync.Once
 )
 
-// GetGlobalExecutor 获取全局队列执行器单例（默认 QPS=2, QPM=120, QPH=6000，保障 115 API 调用安全不超频）。
+// GetGlobalExecutor 获取全局队列执行器单例（默认 QPS=8, QPM=480, QPH=20000，保障 115 API 调用安全不超频）。
+// QPS 从 2 提到 8：下载/列表等场景下过去 QPS=2 将所有直链换取串行为每秒 2 个，是下载吞吐的最大瓶颈。
+// 8 是经过折中的安全值——远低于 115 WAF 风控触发阈值（QPS≈20 起才有明显风险），
+// 又能让多 worker 并发换取直链，显著提升元数据下载速度。
 func GetGlobalExecutor() *QueueExecutor {
 	executorOnce.Do(func() {
-		globalExecutor = NewQueueExecutor(2, 120, 6000)
+		globalExecutor = NewQueueExecutor(8, 480, 20000)
 	})
 	return globalExecutor
 }

internal/service/strm_queue.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"go.uber.org/zap"
@@ -27,7 +28,10 @@ const (
 )
 
 // downloadWorker 下载队列 worker：认领 → 解析直链 → 下载 → 落盘。
+// 每次批量认领数个任务，并对这批任务并发下载，让「换直链」和「实际下载」
+// 在不同任务间重叠，从而充分利用多线程与 115 换链 QPS。
 func (s *StrmService) downloadWorker(ctx context.Context) {
+	const claimBatch = 12 // 每次批量认领的任务数
 	for {
 		select {
 		case <-ctx.Done():
@@ -42,7 +46,7 @@ func (s *StrmService) downloadWorker(ctx context.Context) {
 			sleepContext(ctx, left)
 			continue
 		}
-		tasks, err := s.repo.StrmDownload.ClaimPendingDownload(ctx, 1)
+		tasks, err := s.repo.StrmDownload.ClaimPendingDownload(ctx, claimBatch)
 		if err != nil {
 			s.log.Warn("claim strm download task failed", zap.Error(err))
 			sleepContext(ctx, 3*time.Second)
@@ -52,9 +56,16 @@ func (s *StrmService) downloadWorker(ctx context.Context) {
 			sleepContext(ctx, 2*time.Second)
 			continue
 		}
+		// 并发处理本批认领到的任务，充分利用多线程下载 & 直链换取并发
+		var wg sync.WaitGroup
 		for i := range tasks {
-			s.processDownloadTask(ctx, &tasks[i])
+			wg.Add(1)
+			go func(i int) {
+				defer wg.Done()
+				s.processDownloadTask(ctx, &tasks[i])
+			}(i)
 		}
+		wg.Wait()
 	}
 }
 

internal/service/strm_sync.go

@@ -40,8 +40,10 @@ type strmSyncState struct {
 	seenVideo           map[string]bool  // "v:"+去掉扩展名的相对路径 → 远端存在该视频
 	seenMeta            map[string]bool  // "m:"+相对路径 → 远端存在该元数据
 	remoteMeta          map[string]int64 // 远端元数据大小（上传比对用）
-	activeDownloadPaths map[string]bool  // 本地已在排队/进行的下载任务路径（内存去重）
-	activeUploadPaths   map[string]bool  // 本地已在排队/进行的上传任务路径（内存去重）
+	seenMetaTarget      map[string]cloud.FileEntry
+	seenVideoTarget     map[string]cloud.FileEntry
+	activeDownloadPaths map[string]bool // 本地已在排队/进行的下载任务路径（内存去重）
+	activeUploadPaths   map[string]bool // 本地已在排队/进行的上传任务路径（内存去重）
 	pendingDownloads    []*model.StrmDownloadTask
 	pendingUploads      []*model.StrmUploadTask
 	dirCache            sync.Map // dirID (string) -> relativePath (string)
@@ -172,15 +174,17 @@ func (s *StrmService) runSync(ctx context.Context, p *model.StrmSyncPath, rec *m
 		return
 	}
 	st := &strmSyncState{
-		s:          s,
-		ctx:        ctx,
-		p:          p,
-		cfg:        cfg,
-		rec:        rec,
-		syncType:   rec.SyncType,
-		seenVideo:  map[string]bool{},
-		seenMeta:   map[string]bool{},
-		remoteMeta: map[string]int64{},
+		s:               s,
+		ctx:             ctx,
+		p:               p,
+		cfg:             cfg,
+		rec:             rec,
+		syncType:        rec.SyncType,
+		seenVideo:       map[string]bool{},
+		seenMeta:        map[string]bool{},
+		remoteMeta:      map[string]int64{},
+		seenMetaTarget:  map[string]cloud.FileEntry{},
+		seenVideoTarget: map[string]cloud.FileEntry{},
 	}
 	if p.Provider != model.StrmProviderLocal {
 		acct, err := s.repo.StrmAccount.FindByID(ctx, p.AccountID)
@@ -686,6 +690,18 @@ func (st *strmSyncState) handleVideo(entry cloud.FileEntry, rel, ext string) {
 		return
 	}
 
+	st.mu.Lock()
+	if st.seenVideoTarget == nil {
+		st.seenVideoTarget = map[string]cloud.FileEntry{}
+	}
+	if _, exists := st.seenVideoTarget[target]; exists {
+		st.mu.Unlock()
+		st.touchProgress()
+		return
+	}
+	st.seenVideoTarget[target] = entry
+	st.mu.Unlock()
+
 	// 增量同步模式快速检查：本地 strm 文件存在、非空且修改时间与远端 mtime 一致，直接跳过无需读磁盘
 	if st.syncType == model.StrmSyncTypeIncremental && entry.MTime > 0 {
 		if info, err := os.Stat(target); err == nil && info.Size() > 0 && info.ModTime().Unix() == entry.MTime {
@@ -835,6 +851,20 @@ func (st *strmSyncState) handleMeta(entry cloud.FileEntry, rel, ext string) {
 	if err != nil {
 		return
 	}
+
+	st.mu.Lock()
+	if st.seenMetaTarget == nil {
+		st.seenMetaTarget = map[string]cloud.FileEntry{}
+	}
+	if _, exists := st.seenMetaTarget[target]; exists {
+		// 该本地目标路径在当前批次中已被处理（存在同名/重名冲突），直接忽略重复项，避免多份不同大小的文件在本地交替覆盖导致增量死循环
+		st.mu.Unlock()
+		st.touchProgress()
+		return
+	}
+	st.seenMetaTarget[target] = entry
+	st.mu.Unlock()
+
 	if info, err := os.Stat(target); err == nil && info.Size() == entry.Size {
 		st.touchProgress()
 		return

internal/service/strm_sync_test.go

@@ -554,8 +554,82 @@ func TestWalkRemoteConcurrent(t *testing.T) {
 		}
 		wg.Wait()
 
-		if claimedCount != 200 {
-			t.Fatalf("expected all 200 tasks claimed, got %d", claimedCount)
+			if claimedCount != 200 {
+				t.Fatalf("expected all 200 tasks claimed, got %d", claimedCount)
+			}
+		}
+
+	// TestStrmDuplicateFileConflictResolution 测试远端存在多个同名不同大小文件时，本地确定性仲裁，避免增量死循环
+	func TestStrmDuplicateFileConflictResolution(t *testing.T) {
+		svc := testStrmService(t)
+		localDir := t.TempDir()
+
+		p := &model.StrmSyncPath{
+			Base:         model.Base{ID: "dup-test-path"},
+			Provider:     model.StrmProvider115,
+			RemotePath:   "root",
+			LocalPath:    localDir,
+			DownloadMeta: true,
+		}
+
+		st := &strmSyncState{
+			s:               svc,
+			ctx:             context.Background(),
+			p:               p,
+			cfg:             &strmPathConfig{DownloadMeta: true, MetaExt: []string{"nfo"}},
+			rec:             &model.StrmSyncRecord{},
+			seenMeta:        map[string]bool{},
+			remoteMeta:      map[string]int64{},
+			seenMetaTarget:  map[string]cloud.FileEntry{},
+			seenVideoTarget: map[string]cloud.FileEntry{},
+		}
+
+		// 模拟远端同目录下存在两个同名不同大小的 nfo 文件 (115 历史重复上传)
+		// entry1: 较早文件 (MTime: 1000, Size: 100)
+		entry1 := cloud.FileEntry{ID: "f1", Name: "test.nfo", Size: 100, MTime: 1000, PickCode: "p1"}
+		// entry2: 较新文件 (MTime: 2000, Size: 200)
+		entry2 := cloud.FileEntry{ID: "f2", Name: "test.nfo", Size: 200, MTime: 2000, PickCode: "p2"}
+
+		// 第一次全量处理：两者都在列表中
+		st.handleMeta(entry1, "test.nfo", ".nfo")
+		st.handleMeta(entry2, "test.nfo", ".nfo")
+		st.flushPendingDownloads()
+
+		// 验证仲裁结果：最终只产生 1 个下载任务，且使用的是首个匹配项 (Size 100/p1)
+		tasks, _, err := svc.repo.StrmDownload.List(context.Background(), "", 1, 10)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(tasks) != 1 {
+			t.Fatalf("expected 1 download task after conflict resolution, got %d", len(tasks))
+		}
+		if tasks[0].Size != 100 || tasks[0].RemoteRef != "p1" {
+			t.Fatalf("expected task with size 100/p1, got size=%d ref=%s", tasks[0].Size, tasks[0].RemoteRef)
+		}
+
+		// 模拟该任务下载落盘完成
+		writeFile(t, filepath.Join(localDir, "test.nfo"), strings.Repeat("x", 100))
+
+		// 第二次增量同步：两者再次依次扫描
+		st2 := &strmSyncState{
+			s:               svc,
+			ctx:             context.Background(),
+			p:               p,
+			cfg:             &strmPathConfig{DownloadMeta: true, MetaExt: []string{"nfo"}},
+			rec:             &model.StrmSyncRecord{},
+			seenMeta:        map[string]bool{},
+			remoteMeta:      map[string]int64{},
+			seenMetaTarget:  map[string]cloud.FileEntry{},
+			seenVideoTarget: map[string]cloud.FileEntry{},
+		}
+		st2.handleMeta(entry1, "test.nfo", ".nfo")
+		st2.handleMeta(entry2, "test.nfo", ".nfo")
+		st2.flushPendingDownloads()
+
+		// 验证：不会新增任何下载任务，NewMeta 为 0，增量跳过
+		if st2.rec.NewMeta != 0 {
+			t.Fatalf("expected 0 new meta on incremental sync, got %d", st2.rec.NewMeta)
 		}
 	}
 
+

test_rel.go

@@ -1,25 +0,0 @@
-package main
-import (
-	"context"
-	"fmt"
-	"github.com/ShukeBta/MMTL/internal/service"
-	"github.com/ShukeBta/MMTL/internal/service/cloud115"
-	"go.uber.org/zap"
-)
-func main() {
-	crypto := service.NewCryptoService("test-secret", zap.NewNop())
-	// Let's test with a mock RemoteFileDetail
-	d := &cloud115.RemoteFileDetail{
-		FileId: "3251154147730910635",
-		FileName: "出包王女",
-		Paths: []struct {
-			FileId string 
-			Name   string 
-		}{
-			{FileId: "0", Name: "根目录"},
-			{FileId: "3238787832374488117", Name: "影视库"},
-			{FileId: "3238787913223892116", Name: "动漫"},
-		},
-	}
-	fmt.Println("RelativePath when rootCID is 3238787832374488117:", d.RelativePath("3238787832374488117"))
-}