fix(scan): Fix-mode scanner + dialog suppression + cancel/timer + importer revive
Build backend images / build content-svc (push) Failing after 1m25s
Build backend images / build file-svc (push) Failing after 1m10s
Build backend images / build gateway (push) Failing after 56s
Build backend images / build identity-svc (push) Failing after 53s
Build backend images / build notification-svc (push) Failing after 57s
Build backend images / build render-svc (push) Failing after 48s
Build backend images / build studio-svc (push) Failing after 1m5s
Build backend images / build content-svc (push) Failing after 1m25s
Build backend images / build file-svc (push) Failing after 1m10s
Build backend images / build gateway (push) Failing after 56s
Build backend images / build identity-svc (push) Failing after 53s
Build backend images / build notification-svc (push) Failing after 57s
Build backend images / build render-svc (push) Failing after 48s
Build backend images / build studio-svc (push) Failing after 1m5s
- scan.jsx: app.beginSuppressDialogs() + clean quit (no AE hang on font/footage dialogs); FIX-mode branch parses frl_c(x)t/m(y) layer names → scenes by c(x); flexible/mockup keep comp-based walk; FR_SCAN_MODE selects. - render-svc: scan job carries project mode; cancel endpoint + node watchdog that kills AE on cancel; parseObjectURL handles minio:// (bucket in host); scan with no template fails cleanly; status guards so late results can't un-cancel. - content importer: revive soft-deleted scenes instead of duplicate-inserting (fixes scenes_project_id_key unique violation); orphan diff ignores deleted. - admin: scan dialog gets project-type picker + elapsed timer + Cancel button. - node-agent: AE-2026 wiring (host port 5010, host-reachable presign endpoint), FR_SCAN_MODE plumbing. docs/aep-template-convention.md: per-type naming + bundles. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -128,13 +128,30 @@ func (h *TemplateBundleHandler) Set(c *gin.Context) {
|
||||
})
|
||||
}
|
||||
|
||||
// parseObjectURL extracts the bucket and object key from a path-style storage URL
|
||||
// such as http://host:9000/<bucket>/<key...>. Query/fragment are ignored.
|
||||
// parseObjectURL extracts the bucket and object key from a storage URL. Handles
|
||||
// two forms:
|
||||
// - minio://<bucket>/<key...> (file-svc FileAddress — bucket is the HOST)
|
||||
// - http(s)://host[:port]/<bucket>/<key> (public path-style — bucket is the 1st path seg)
|
||||
// Query/fragment are ignored.
|
||||
func parseObjectURL(raw string) (bucket, key string, err error) {
|
||||
u, perr := url.Parse(strings.TrimSpace(raw))
|
||||
if perr != nil {
|
||||
return "", "", fmt.Errorf("parse url: %w", perr)
|
||||
}
|
||||
|
||||
// minio://<bucket>/<key> — the bucket lives in the host component.
|
||||
if u.Scheme == "minio" {
|
||||
k := strings.TrimPrefix(u.Path, "/")
|
||||
if u.Host == "" || k == "" {
|
||||
return "", "", fmt.Errorf("cannot derive bucket/key from %q", raw)
|
||||
}
|
||||
if dec, derr := url.PathUnescape(k); derr == nil {
|
||||
k = dec
|
||||
}
|
||||
return u.Host, k, nil
|
||||
}
|
||||
|
||||
// http(s)://host[:port]/<bucket>/<key...>
|
||||
p := strings.TrimPrefix(u.Path, "/")
|
||||
if p == "" {
|
||||
return "", "", fmt.Errorf("url has no path: %q", raw)
|
||||
|
||||
Reference in New Issue
Block a user