@
Build backend images / build content-svc (push) Failing after 19s
Build backend images / build file-svc (push) Failing after 1m53s
Build backend images / build gateway (push) Failing after 16s
Build backend images / build identity-svc (push) Failing after 7m1s
Build backend images / build notification-svc (push) Failing after 7m24s
Build backend images / build render-svc (push) Failing after 3m12s
Build backend images / build studio-svc (push) Failing after 43s
Build backend images / build content-svc (push) Failing after 19s
Build backend images / build file-svc (push) Failing after 1m53s
Build backend images / build gateway (push) Failing after 16s
Build backend images / build identity-svc (push) Failing after 7m1s
Build backend images / build notification-svc (push) Failing after 7m24s
Build backend images / build render-svc (push) Failing after 3m12s
Build backend images / build studio-svc (push) Failing after 43s
feat: AE template scanner + scene editor + AEP bundle pipeline
Scene editor (admin): per-project Scenes / Shared Colors / Color Presets
manager (ProjectScenes) reachable from each project.
AEP bundle pipeline: upload .aep or .zip → stored once per template at
templates/{project_id}/(bundle.zip|template.aep); render claim probes and
returns is_bundle+md5; node-agent extracts the bundle, locates the .aep
(zip-slip guarded), and caches by md5 so repeated renders extract once.
AE template scanner ("read scenes/colours/configs from the AEP"):
- content-svc importer: POST /v1/projects/{id}/scan/{preview,apply} —
review-diff-then-merge into scenes/elements/colours (manual edits kept).
- render-svc Go quick-scan: stdlib RIFX parser extracts comp names+durations
(no AE) → POST /v1/template-scans/{id}/quick.
- render-svc AE scan jobs + node-agent runner: queue → node runs scan.jsx
(reverse of legacy JSXGenerator conventions: frfinal/frshare/frl_/frd_) →
posts ScanResult back. Migration 26_render_scan_jobs.
- admin UI: "اسکن از افترافکت" with quick/full engines + diff-review modal.
Verified: importer preview/apply, Go quick-scan end-to-end (synthetic .aep →
scene imported), bundle extract unit tests, RIFX parser unit tests.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@
This commit is contained in:
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/flatrender/render-svc/internal/db"
|
||||
@@ -254,18 +255,37 @@ func (h *InternalHandler) Claim(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// Generate presigned AEP download URL. AEP files are stored at
|
||||
// templates/{original_project_id}/template.aep in the templates bucket.
|
||||
// Errors are non-fatal — node agent falls back to mock render when URL is empty.
|
||||
// Resolve the canonical template object. Each template is stored once, per
|
||||
// project id, at templates/{original_project_id}/<name> in the templates bucket
|
||||
// and reused by every render of that template. A .zip is a full AE project
|
||||
// bundle (.aep + footage/fonts) the node must extract before rendering.
|
||||
// Errors are non-fatal — the node agent falls back to mock render when URL is empty.
|
||||
aepURL := ""
|
||||
isBundle := false
|
||||
bundleMD5 := ""
|
||||
if h.minio != nil {
|
||||
objectKey := fmt.Sprintf("templates/%s/template.aep", job.OriginalProjectID)
|
||||
purl, perr := h.minio.PresignedGetObject(
|
||||
context.Background(), h.templatesBucket, objectKey,
|
||||
2*time.Hour, nil,
|
||||
)
|
||||
if perr == nil {
|
||||
candidates := []struct {
|
||||
name string
|
||||
bundle bool
|
||||
}{
|
||||
{"bundle.zip", true},
|
||||
{"template.aep", false},
|
||||
{"template.aepx", false},
|
||||
}
|
||||
for _, cand := range candidates {
|
||||
objectKey := fmt.Sprintf("templates/%s/%s", job.OriginalProjectID, cand.name)
|
||||
info, serr := h.minio.StatObject(context.Background(), h.templatesBucket, objectKey, minio.StatObjectOptions{})
|
||||
if serr != nil {
|
||||
continue // not this format
|
||||
}
|
||||
purl, perr := h.minio.PresignedGetObject(context.Background(), h.templatesBucket, objectKey, 2*time.Hour, nil)
|
||||
if perr != nil {
|
||||
continue
|
||||
}
|
||||
aepURL = purl.String()
|
||||
isBundle = cand.bundle
|
||||
bundleMD5 = strings.Trim(info.ETag, "\"")
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
@@ -278,6 +298,8 @@ func (h *InternalHandler) Claim(c *gin.Context) {
|
||||
HasMusic: job.HasMusic,
|
||||
HasVoiceover: job.HasVoiceover,
|
||||
AEPDownloadURL: aepURL,
|
||||
IsBundle: isBundle,
|
||||
BundleMD5: bundleMD5,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user