同步上游 zip：合并任务后台化 + 合并整剧可直接播放；保留 ultrafast+4线程转码优化与 .gitignore 本地规则

2026-09-18 10:16:15 +08:00
parent 80485e9dba
commit b96363d787
21 changed files with 1173 additions and 172 deletions
@@ -167,8 +167,14 @@ func (app *UIApp) handlePlaybackPlan(writer http.ResponseWriter, request *http.R
 		return
 	}
 	if !app.mediaResources().snapshot().Enabled {
-		writeJSON(writer, http.StatusOK, playbackMediaPlan{Player: "legacy", Reason: "optimization_disabled"})
-		return
+		app.playbackMu.Lock()
+		session := app.playbacks[input.Session]
+		merged := session != nil && input.Episode <= len(session.downloadIDs) && strings.HasPrefix(session.downloadIDs[input.Episode-1], mergedPlaybackPrefix)
+		app.playbackMu.Unlock()
+		if !merged {
+			writeJSON(writer, http.StatusOK, playbackMediaPlan{Player: "legacy", Reason: "optimization_disabled"})
+			return
+		}
 	}
 	run, status, err := app.beginPlayback(context.WithoutCancel(request.Context()), input.Session, input.Episode, input.Start, input.Quality, input.Version, false)
 	if err != nil {