tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Rou
2026-09-05 13:06:19 +08:00
parent 35e92604e6 ca7ad1f9b2
commit f0bb81b615
26 changed files with 773 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
backend/internal/repository/project_workbench_read.go
View File

@@ -7,19 +7,20 @@ import (
)
type ProjectOverviewMetrics struct {
UnitCount int64 `gorm:"column:unit_count"`
CompletedUnitCount int64 `gorm:"column:completed_unit_count"`
TotalWordCount int64 `gorm:"column:total_word_count"`
UnitsWithoutText int64 `gorm:"column:units_without_text"`
UnitsWithoutShots int64 `gorm:"column:units_without_shots"`
CanvasCount int64 `gorm:"column:canvas_count"`
AssetCount int64 `gorm:"column:asset_count"`
ShotCount int64 `gorm:"column:shot_count"`
PendingCandidateCount int64 `gorm:"column:pending_candidate_count"`
ReadyStoryboardCount int64 `gorm:"column:ready_storyboard_count"`
ReadyPrevizCount int64 `gorm:"column:ready_previz_count"`
ReadyVideoCount int64 `gorm:"column:ready_video_count"`
StaleArtifactCount int64 `gorm:"column:stale_artifact_count"`
UnitCount int64 `gorm:"column:unit_count"`
CompletedUnitCount int64 `gorm:"column:completed_unit_count"`
TotalWordCount int64 `gorm:"column:total_word_count"`
UnitsWithoutText int64 `gorm:"column:units_without_text"`
UnitsWithoutShots int64 `gorm:"column:units_without_shots"`
CanvasCount int64 `gorm:"column:canvas_count"`
AssetCount int64 `gorm:"column:asset_count"`
ShotCount int64 `gorm:"column:shot_count"`
PendingCandidateCount int64 `gorm:"column:pending_candidate_count"`
ReadyStoryboardCount int64 `gorm:"column:ready_storyboard_count"`
ReadyPrevizCount int64 `gorm:"column:ready_previz_count"`
ReadyVideoCount int64 `gorm:"column:ready_video_count"`
TimelineRenderSucceededCount int64 `gorm:"column:timeline_render_succeeded_count"`
StaleArtifactCount int64 `gorm:"column:stale_artifact_count"`
}
type ProjectOverviewUnitRow struct {
@@ -62,8 +63,9 @@ func (r *Repository) ProjectOverviewMetrics(projectID string) (ProjectOverviewMe
(SELECT COUNT(DISTINCT shot_id) FROM shot_artifacts WHERE project_id = ? AND type = 'storyboard' AND selected = ? AND status = 'ready') AS ready_storyboard_count,
(SELECT COUNT(DISTINCT shot_id) FROM shot_artifacts WHERE project_id = ? AND type = 'action_board' AND selected = ? AND status = 'ready') AS ready_previz_count,
(SELECT COUNT(DISTINCT shot_id) FROM shot_artifacts WHERE project_id = ? AND type = 'video' AND selected = ? AND status = 'ready') AS ready_video_count,
(SELECT COUNT(*) FROM tasks WHERE project_id = ? AND type = ? AND status = ?) AS timeline_render_succeeded_count,
(SELECT COUNT(*) FROM shot_artifacts WHERE project_id = ? AND status = 'stale') AS stale_artifact_count
`, projectID, projectID, model.ProjectUnitStatusCompleted, projectID, projectID, projectID, model.ProjectUnitStatusDraft, projectID, projectID, projectID, projectID, projectID, true, projectID, true, projectID, true, projectID).Scan(&metrics).Error
`, projectID, projectID, model.ProjectUnitStatusCompleted, projectID, projectID, projectID, model.ProjectUnitStatusDraft, projectID, projectID, projectID, projectID, projectID, true, projectID, true, projectID, true, projectID, model.TaskTypeTimelineRender, model.TaskStatusSucceeded, projectID).Scan(&metrics).Error
return metrics, err
}

18
backend/internal/service/project_asset.go
View File

@@ -11,12 +11,20 @@ import (
"infinite-canvas/backend/internal/model"
)
// 资产来源：媒体导入合成/画布产物自动同步。画布产物用 canvas 以便素材面板分组。
const (
AssetSourceUploaded = "uploaded"
AssetSourceCanvas = "canvas"
)
type LinkProjectAssetRequest struct {
AssetID string `json:"assetId"`
Category string `json:"category"`
FolderID *string `json:"folderId"`
// Title 媒体导入场景下由前端携带原始文件名；已有资产时忽略。
Title string `json:"title"`
// Source 仅媒体导入合成时生效：uploaded（默认）或 canvas（画布产物自动同步）。
Source string `json:"source"`
}
type UpdateProjectAssetRequest struct {
@@ -105,6 +113,10 @@ func (s *Service) LinkProjectAsset(userID string, projectID string, req LinkProj
return ProjectAssetSummary{}, err
}
assetID := strings.TrimSpace(req.AssetID)
source := strings.TrimSpace(req.Source)
if source != AssetSourceCanvas {
source = AssetSourceUploaded
}
asset, err := s.repo.AssetForUser(userID, assetID)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return ProjectAssetSummary{}, err
@@ -112,7 +124,7 @@ func (s *Service) LinkProjectAsset(userID string, projectID string, req LinkProj
if asset == nil {
// 媒体导入只落 resources 表；首次链接时按资源元数据合成资产记录，
// 避免“资源存在但无资产记录”导致导入永远失败。
asset, err = s.assetFromUploadedResource(userID, assetID, req.Title)
asset, err = s.assetFromUploadedResource(userID, assetID, req.Title, source)
if err != nil {
return ProjectAssetSummary{}, err
}
@@ -173,7 +185,7 @@ func (s *Service) LinkProjectAsset(userID string, projectID string, req LinkProj
// assetFromUploadedResource 把媒体导入上传的 Resource 合成为资产记录（内存构造，不落库）。
// 资产创建与项目链接由 LinkProjectAsset 事务原子提交，避免失败留下孤立资产。
func (s *Service) assetFromUploadedResource(userID string, resourceID string, title string) (*model.Asset, error) {
func (s *Service) assetFromUploadedResource(userID string, resourceID string, title string, source string) (*model.Asset, error) {
resource, err := s.repo.ResourceForUser(userID, resourceID)
if err != nil {
return nil, err
@@ -192,7 +204,7 @@ func (s *Service) assetFromUploadedResource(userID string, resourceID string, ti
"durationMs": resource.DurationMs,
"status": resource.Status,
"mediaType": resource.Kind,
"source": "uploaded",
"source": source,
},
})
if err != nil {

16
backend/internal/service/project_asset_link_test.go
View File

@@ -1,6 +1,7 @@
package service
import (
"encoding/json"
"testing"
"infinite-canvas/backend/internal/model"
@@ -58,6 +59,7 @@ func TestLinkProjectAssetCreatesAssetFromUploadedResource(t *testing.T) {
AssetID: "resource-1",
Category: "",
Title: "开场.mp4",
Source: AssetSourceCanvas,
})
if err != nil {
t.Fatalf("LinkProjectAsset: %v", err)
@@ -76,6 +78,20 @@ func TestLinkProjectAssetCreatesAssetFromUploadedResource(t *testing.T) {
if asset.Category != model.AssetCategoryMaterial {
t.Errorf("asset.Category = %q, want material", asset.Category)
}
if summary.Source != AssetSourceCanvas {
t.Errorf("summary.Source = %q, want canvas", summary.Source)
}
var payload struct {
Data struct {
Source string `json:"source"`
} `json:"data"`
}
if err := json.Unmarshal([]byte(asset.PayloadJSON), &payload); err != nil {
t.Fatalf("payload unmarshal: %v", err)
}
if payload.Data.Source != AssetSourceCanvas {
t.Errorf("payload.source = %q, want canvas", payload.Data.Source)
}
}
// TestLinkProjectAssetMissingResourceKeepsFailingClosed 资源与资产都不存在时仍应报错，

3
backend/internal/service/project_workbench_read.go
View File

@@ -33,6 +33,7 @@ type ProjectOverviewMetrics struct {
ReadyStoryboardCount int64 `json:"readyStoryboardCount"`
ReadyPrevizCount int64 `json:"readyPrevizCount"`
ReadyVideoCount int64 `json:"readyVideoCount"`
RenderSucceededCount int64 `json:"renderSucceededCount"`
StaleArtifactCount int64 `json:"staleArtifactCount"`
}
@@ -152,7 +153,7 @@ func (s *Service) ProjectOverview(userID string, projectID string) (ProjectOverv
UnitsWithoutText: row.UnitsWithoutText, UnitsWithoutShots: row.UnitsWithoutShots, CanvasCount: row.CanvasCount,
AssetCount: row.AssetCount, ShotCount: row.ShotCount, PendingCandidateCount: row.PendingCandidateCount,
ReadyStoryboardCount: row.ReadyStoryboardCount, ReadyPrevizCount: row.ReadyPrevizCount, ReadyVideoCount: row.ReadyVideoCount,
StaleArtifactCount: row.StaleArtifactCount,
RenderSucceededCount: row.TimelineRenderSucceededCount, StaleArtifactCount: row.StaleArtifactCount,
}
return nil
})

27
backend/internal/service/project_workbench_read_test.go
View File

@@ -121,6 +121,33 @@ func TestProjectOverviewUsesAggregatesWithoutLoadingProjectCollections(t *testin
}
}
func TestProjectOverviewCountsSucceededTimelineRenders(t *testing.T) {
service, db := newProjectWorkbenchReadTestService(t)
project := seedWorkbenchProject(t, db)
for index := 0; index < 2; index++ {
task := model.Task{ID: fmt.Sprintf("render-%02d", index), UserID: "user-1", ProjectID: project.ID, Type: model.TaskTypeTimelineRender, Status: model.TaskStatusSucceeded}
if err := db.Create(&task).Error; err != nil {
t.Fatal(err)
}
}
distractors := []model.Task{
{ID: "render-failed", UserID: "user-1", ProjectID: project.ID, Type: model.TaskTypeTimelineRender, Status: model.TaskStatusFailed},
{ID: "transcribe-ok", UserID: "user-1", ProjectID: project.ID, Type: model.TaskTypeTimelineTranscription, Status: model.TaskStatusSucceeded},
}
for _, task := range distractors {
if err := db.Create(&task).Error; err != nil {
t.Fatal(err)
}
}
overview, err := service.ProjectOverview("user-1", project.ID)
if err != nil {
t.Fatal(err)
}
if overview.Metrics.RenderSucceededCount != 2 {
t.Fatalf("render succeeded count = %d, want 2", overview.Metrics.RenderSucceededCount)
}
}
func TestProjectUnitWorkspaceIsolatesShotsAndBoundAssetsByUnit(t *testing.T) {
service, db := newProjectWorkbenchReadTestService(t)
project := seedWorkbenchProject(t, db)

12
backend/internal/service/video_transcode.go
View File

@@ -180,7 +180,10 @@ func (s *Service) maybeStartPlaybackTranscode(resource *model.Resource) {
}
src := filepath.Join(s.dataDir, "resources", filepath.FromSlash(resource.ObjectKey))
switch probeVideoCodec(src) {
case videoCodecH265:
case videoCodecH265, videoCodecMPEG4:
// H.265 与 MPEG-4 Part 2（mp4v）Chromium/Firefox/Edge 均不能解码：
// H.265 需转 H.264；MPEG-4 Part 2 浏览器不支持，老式/损坏文件只能转码兜底
// （转码失败会落 failed，前端据此显示终止性错误，不再出现死循环）。
// 原子抢占（空/none → processing）：并发上传 + 回填、多实例同抢时
// 仅一个能成功置位，其余直接返回，避免重复转码。
claimed, err := s.repo.ClaimPlaybackTranscode(resource.ID)
@@ -189,9 +192,10 @@ func (s *Service) maybeStartPlaybackTranscode(resource *model.Resource) {
}
resource.PlaybackStatus = model.PlaybackStatusProcessing
go s.runPlaybackTranscode(resource.UserID, resource.ID, src)
case videoCodecH264, videoCodecAV1, videoCodecVP9, videoCodecMPEG4, "":
// H.264 浏览器可直接解码；AV1/VP9/MPEG4 暂不转码；探针读不出编码（非 mp4 /
// moov 在尾部 / 加密容器）也无法处理 —— 均标 none，避免重复探测与前端无限轮询。
case videoCodecH264, videoCodecAV1, videoCodecVP9, "":
// H.264 浏览器可直接解码；AV1/VP9 现代浏览器可直接解码，均不需转码；
// 探针读不出编码（非 mp4 / moov 在尾部 / 加密容器）也无法处理 —— 均标 none，
// 避免重复探测与前端无限轮询。
markPlaybackNone(s, resource)
}
}