@aicopycoders/exodus 2026.11.1000-beta.2 → 2026.11.1100-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -234,8 +234,8 @@ then `picks` again.
|
|
|
234
234
|
`status` says "Parked: the storyboard is waiting for your yes."
|
|
235
235
|
`exodus video storyboard <runId>` prints each scene's line and picture, and who
|
|
236
236
|
speaks with which voice ("Reading the storyboard gate" has the detail). Show it
|
|
237
|
-
with the run page link, then ask: approve, redo a picture, change a voice,
|
|
238
|
-
stop.
|
|
237
|
+
with the run page link, then ask: approve, redo a picture, change a voice,
|
|
238
|
+
move someone (Micro-drama template only), or stop.
|
|
239
239
|
|
|
240
240
|
- Approve: `exodus video approve <runId>`. It buys the voices and the clips
|
|
241
241
|
(with the pilot stop, the pilot first), the expensive part. The CLI prints
|
|
@@ -248,6 +248,21 @@ stop.
|
|
|
248
248
|
say so and wait for their yes.
|
|
249
249
|
- Change a voice: `exodus video voices <runId> --set <who>=<voice>` ("Giving
|
|
250
250
|
the characters voices").
|
|
251
|
+
- Move someone (only the Micro-drama template has the blocking map, and it is
|
|
252
|
+
admin-only today; its storyboard prints `see each room and where everyone
|
|
253
|
+
stands`): `exodus video map <runId>` prints each room in metres seen from
|
|
254
|
+
above, each person's mark, their side of the wide shot, the setups that film
|
|
255
|
+
the room, and what a move there redraws and its price. Show it. Then
|
|
256
|
+
`exodus video move <runId> --move <who>=<x>,<y> [--place <place>] [--note
|
|
257
|
+
"<what to change>"]`, with `<who>` as the script names them. Before it, tell
|
|
258
|
+
the member how many pictures the move redraws and the price `map` printed;
|
|
259
|
+
when `map` says `price unknown`, say the price is unknown. Either way, run it
|
|
260
|
+
only after their yes. A move that keeps everyone on the same side of the
|
|
261
|
+
wide shot redraws nothing and costs nothing, and `move` says so. A move off
|
|
262
|
+
the room, onto another person or across the 180-degree line of a setup is
|
|
263
|
+
refused in one sentence: tell the member and ask again. After a move, wait
|
|
264
|
+
for the redrawn pictures (`exodus video storyboard <runId>` shows them)
|
|
265
|
+
before you approve; approve and another move are refused until they land.
|
|
251
266
|
- Stop: `exodus workflow cancel <runId>`.
|
|
252
267
|
|
|
253
268
|
**The song format** waits twice more. `exodus video song <runId>` prints the
|
|
@@ -491,6 +506,12 @@ exodus video picks <runId> --redo face:<who>|room:<place> --note "…"
|
|
|
491
506
|
four new paid pictures for one face or room;
|
|
492
507
|
only after the member's yes
|
|
493
508
|
exodus video storyboard <runId> read the scene cards
|
|
509
|
+
exodus video map <runId> [--place <place>] Micro-drama template (admin-only): each room in metres,
|
|
510
|
+
each person's mark and the setups that film it
|
|
511
|
+
exodus video move <runId> --move <who>=<x>,<y> [--place <place>] [--note "…"]
|
|
512
|
+
move people in one room; redraws that room's pictures,
|
|
513
|
+
one a camera setup; only after the member's yes;
|
|
514
|
+
approve only once they are redrawn
|
|
494
515
|
exodus video voices <runId> who speaks and with whose voice
|
|
495
516
|
exodus video voices <runId> --set <character>=<voiceId> give a character a voice
|
|
496
517
|
exodus video quote <runId> a quoting format: the exact prepared requests and prices
|
|
@@ -433,4 +433,12 @@ export function sentenceGapCuts(
|
|
|
433
433
|
words: Array<{ w: string; s: number; e: number }>,
|
|
434
434
|
lines: Array<{ text: string; asksPause: boolean; cuesBeat: boolean }>,
|
|
435
435
|
levels?: { windowSec: number; db: number[] } | null,
|
|
436
|
-
|
|
436
|
+
lineGap?: { max: number; keep: number } | null,
|
|
437
|
+
jump?: JumpCut | null,
|
|
438
|
+
): Array<{ s: number; e: number; after: string; gap: number; kept: number; sound: boolean; atLine?: number }>;
|
|
439
|
+
|
|
440
|
+
/** jumpCut: a pause over maxGap between two heard words keeps keepAfter after the earlier word and keepBefore before the later. */
|
|
441
|
+
export interface JumpCut { maxGap: number; keepAfter: number; keepBefore: number }
|
|
442
|
+
export const JUMP_CUT: JumpCut;
|
|
443
|
+
/** jumpCut on one pause: the span it takes out, or null when it keeps the pause whole. */
|
|
444
|
+
export function jumpCutSpan(endSec: number, startSec: number, jump?: JumpCut): { s: number; e: number } | null;
|
|
@@ -72,6 +72,14 @@ export const PUNCH_IN_SCALE = 1.15;
|
|
|
72
72
|
const even = (n) => 2 * Math.round(n / 2);
|
|
73
73
|
const PUNCH_IN =
|
|
74
74
|
`scale=${even(WIDTH * PUNCH_IN_SCALE)}:${even(HEIGHT * PUNCH_IN_SCALE)},crop=${WIDTH}:${HEIGHT},setsar=1`;
|
|
75
|
+
/**
|
|
76
|
+
* pacePass: the finished cut plays at `speed`, picture and sound, and every
|
|
77
|
+
* second piece of the spine is a centre crop scaled up by `zoom`, a small zoom
|
|
78
|
+
* step at each cut.
|
|
79
|
+
*/
|
|
80
|
+
export const PACE_PASS = { speed: 1.12, zoom: 1.07 };
|
|
81
|
+
const PACE_ZOOM =
|
|
82
|
+
`scale=${even(WIDTH * PACE_PASS.zoom)}:${even(HEIGHT * PACE_PASS.zoom)},crop=${WIDTH}:${HEIGHT},setsar=1`;
|
|
75
83
|
const floorFrame = (t) => Math.floor(t * FPS + 1e-6) / FPS;
|
|
76
84
|
const ceilFrame = (t) => Math.ceil(t * FPS - 1e-6) / FPS;
|
|
77
85
|
const stereo = "aresample=48000,aformat=channel_layouts=stereo";
|
|
@@ -97,6 +105,11 @@ export const NARRATION_JOIN_AIR_SEC = 0.25;
|
|
|
97
105
|
* it lands. A dialogue clip's own tail ran ~1.1 s of dead air (#3423).
|
|
98
106
|
*/
|
|
99
107
|
export const END_AIR_SEC = 0.5;
|
|
108
|
+
/**
|
|
109
|
+
* talkTrim: the most air a talking clip keeps after its last word, the ad's
|
|
110
|
+
* last line included. A join keeps JOIN_TAIL_SEC already, which is less.
|
|
111
|
+
*/
|
|
112
|
+
export const TALK_TRIM_SEC = 0.3;
|
|
100
113
|
/** A continuous low bed under the whole ad, so the joins between clips do not read as dead air. */
|
|
101
114
|
const ROOM_TONE =
|
|
102
115
|
"anoisesrc=color=brown:amplitude=0.0035:r=48000,highpass=f=60,lowpass=f=900,aformat=channel_layouts=stereo";
|
|
@@ -169,6 +182,22 @@ export const TRUE_PEAK_MAX_DB = -1;
|
|
|
169
182
|
* resample is pinned to stereo, as every one after loudnorm is (loudnessApplyArgs).
|
|
170
183
|
*/
|
|
171
184
|
export const PEAK_LIMITER = "aresample=192000,aformat=channel_layouts=stereo,alimiter=limit=0.8:level=false:attack=2:release=60";
|
|
185
|
+
/**
|
|
186
|
+
* jumpCut: inside a talking clip, a pause over maxGap between two heard words
|
|
187
|
+
* is cut down, keeping keepAfter after the earlier word and keepBefore before
|
|
188
|
+
* the later one. It rides
|
|
189
|
+
* the sentence-gap cut, so a pause the script writes in, one a direction asks
|
|
190
|
+
* for and a reaction's beat stay whole there too.
|
|
191
|
+
*/
|
|
192
|
+
export const JUMP_CUT = { maxGap: 0.8, keepAfter: 0.18, keepBefore: 0.12 };
|
|
193
|
+
|
|
194
|
+
/** jumpCut on one pause, from `endSec` to `startSec`: the span it takes out, or null when it keeps the pause whole. */
|
|
195
|
+
export function jumpCutSpan(endSec, startSec, jump = JUMP_CUT) {
|
|
196
|
+
if (!(startSec - endSec > jump.maxGap + 1e-6)) return null;
|
|
197
|
+
const s = endSec + jump.keepAfter;
|
|
198
|
+
const e = startSec - jump.keepBefore;
|
|
199
|
+
return e > s ? { s, e } : null;
|
|
200
|
+
}
|
|
172
201
|
|
|
173
202
|
/** Plan 14's on/off cut checks, each read only with cutChecks; paceCheck also carries its numbers. */
|
|
174
203
|
const PLAN_14_CHECKS = ["floorCheck", "flashCheck", "levelStepCheck", "voFitCheck", "dashGapCheck", "nameCheck"];
|
|
@@ -210,6 +239,10 @@ export function finishingOf(manifest) {
|
|
|
210
239
|
// Plan 14: the end card from the pack photo, and the record of whether the brand reached the ad (brandOf).
|
|
211
240
|
...(f.endCardLayers === true ? { endCardLayers: true } : {}),
|
|
212
241
|
...(f.brandCheck === true ? { brandCheck: true } : {}),
|
|
242
|
+
...(f.jumpCut === true ? { jumpCut: true } : {}),
|
|
243
|
+
...(f.talkTrim === true ? { talkTrim: true } : {}),
|
|
244
|
+
...(on.captions && f.captionsByLine === true && f.captionColours === true ? { captionColours: true } : {}),
|
|
245
|
+
...(f.pacePass === true ? { pacePass: true } : {}),
|
|
213
246
|
};
|
|
214
247
|
if (!Object.values(on).some(Boolean) && Object.keys(added).length === 0) return null;
|
|
215
248
|
const target = f.targetSeconds;
|
|
@@ -408,6 +441,17 @@ const SAME_WORD_SPELLINGS = new Map([
|
|
|
408
441
|
["too", "to"],
|
|
409
442
|
]);
|
|
410
443
|
|
|
444
|
+
/**
|
|
445
|
+
* A word as people say it, read as its written long form, as in scout
|
|
446
|
+
* scribe.ts SPOKEN_FORMS: "go get 'em" is "go get them", "gonna" is "going to".
|
|
447
|
+
*/
|
|
448
|
+
const SPOKEN_FORMS = new Map([
|
|
449
|
+
["em", ["them"]], ["gonna", ["going", "to"]], ["wanna", ["want", "to"]], ["gotta", ["got", "to"]],
|
|
450
|
+
["kinda", ["kind", "of"]], ["sorta", ["sort", "of"]], ["lemme", ["let", "me"]], ["gimme", ["give", "me"]],
|
|
451
|
+
["cause", ["because"]], ["cuz", ["because"]], ["til", ["until"]], ["till", ["until"]], ["ya", ["you"]],
|
|
452
|
+
["yeah", ["yes"]], ["yep", ["yes"]],
|
|
453
|
+
]);
|
|
454
|
+
|
|
411
455
|
/**
|
|
412
456
|
* #3433: the number reading of scout spokenNumbers.ts, so a script's "$29" and a
|
|
413
457
|
* scribe's "twenty nine dollars" line up here as they do in the server's cut.
|
|
@@ -532,7 +576,7 @@ function spokenForms(word) {
|
|
|
532
576
|
|
|
533
577
|
/** The spoken tokens of one written word; empty for pure punctuation. */
|
|
534
578
|
function spokenWords(word) {
|
|
535
|
-
return spokenForms(word).map((t) => SAME_WORD_SPELLINGS.get(t) ?? t);
|
|
579
|
+
return spokenForms(word).flatMap((t) => SPOKEN_FORMS.get(t) ?? [t]).map((t) => SAME_WORD_SPELLINGS.get(t) ?? t);
|
|
536
580
|
}
|
|
537
581
|
|
|
538
582
|
/** { tokens, sourceIndex }: tokens[i] came from written word sourceIndex[i]. */
|
|
@@ -747,8 +791,13 @@ export function asksPause(line) {
|
|
|
747
791
|
* lineGap ({ max, keep }, cutPace): where one line ends and the next begins,
|
|
748
792
|
* a silence over `max` is cut to `keep` instead, and that break's last span
|
|
749
793
|
* carries `atLine`, the index of the line after it, where the take is split.
|
|
794
|
+
*
|
|
795
|
+
* jump (JUMP_CUT, the jumpCut setting): any pause over jump.maxGap between two
|
|
796
|
+
* script words, inside a sentence too, keeps jump.keepAfter after the earlier
|
|
797
|
+
* word and jump.keepBefore before the later one instead (jumpCutSpan), on
|
|
798
|
+
* whole frames. The pauses kept above stay kept.
|
|
750
799
|
*/
|
|
751
|
-
export function sentenceGapCuts(words, lines, levels = null, lineGap = null) {
|
|
800
|
+
export function sentenceGapCuts(words, lines, levels = null, lineGap = null, jump = null) {
|
|
752
801
|
const written = [];
|
|
753
802
|
const pieces = [];
|
|
754
803
|
let between = "";
|
|
@@ -779,7 +828,9 @@ export function sentenceGapCuts(words, lines, levels = null, lineGap = null) {
|
|
|
779
828
|
const newLine = a.li !== b.li;
|
|
780
829
|
// A name heard split in two (#2300) ends on its last heard word.
|
|
781
830
|
const [earlier, later] = [words[spoken.findLast((w) => w < to)], words[to]];
|
|
782
|
-
|
|
831
|
+
const sentenceBreak = newLine || SENTENCE_END.test(b.before) || heardSentenceEnd(earlier.w);
|
|
832
|
+
// Inside a sentence only jumpCut acts, and only on a pause over its longest.
|
|
833
|
+
if (!sentenceBreak && !(jump && jumpCutSpan(earlier.e, later.s, jump))) continue;
|
|
783
834
|
if (WRITTEN_PAUSE.test(b.before) || lines[a.li].asksPause || lines[b.li].asksPause) continue;
|
|
784
835
|
if (newLine && lines[a.li].cuesBeat) continue;
|
|
785
836
|
const gap = later.s - earlier.e;
|
|
@@ -790,14 +841,17 @@ export function sentenceGapCuts(words, lines, levels = null, lineGap = null) {
|
|
|
790
841
|
const spans = sound ? [sound] : [];
|
|
791
842
|
const [gapMax, gapKeep] =
|
|
792
843
|
lineGap && newLine ? [lineGap.max, lineGap.keep] : [SENTENCE_GAP_MAX_SEC, SENTENCE_GAP_KEEP_SEC];
|
|
793
|
-
|
|
844
|
+
// jumpCut: a pause over its longest keeps its two edges, with a sound in it taken out whole.
|
|
845
|
+
const jumped = Boolean(jump) && gap - removed > jump.maxGap + 1e-6;
|
|
846
|
+
const paused = jumped || (sentenceBreak && gap - removed > gapMax + 1e-6);
|
|
794
847
|
if (paused) {
|
|
795
848
|
// Placed on the gap with the sound already out, then moved back past it.
|
|
796
849
|
// Frame edges only ever widen what is kept, so the silence left stays
|
|
797
850
|
// between the kept length and the longest allowed.
|
|
798
851
|
const back = (t) => (sound && t > sound.s ? t + removed : t);
|
|
799
|
-
const
|
|
800
|
-
const
|
|
852
|
+
const [keepAfter, keepBefore] = jumped ? [jump.keepAfter, jump.keepBefore] : [gapKeep / 2, gapKeep / 2];
|
|
853
|
+
const s = back(ceilFrame(earlier.e + keepAfter));
|
|
854
|
+
const e = back(floorFrame(later.s - removed - keepBefore));
|
|
801
855
|
if (e > s) spans.push({ s, e });
|
|
802
856
|
}
|
|
803
857
|
const merged = [];
|
|
@@ -893,7 +947,7 @@ function clipLevels(file, filter = null) {
|
|
|
893
947
|
/** Decoded final-mix levels; callers must not attribute an event to these whole-mix windows. */
|
|
894
948
|
export const measureCutAudio = (file) => clipLevels(file);
|
|
895
949
|
|
|
896
|
-
function tightenSentenceGaps(spine, reactionCues, scriptLines, readLevels, lineGap = null) {
|
|
950
|
+
function tightenSentenceGaps(spine, reactionCues, scriptLines, readLevels, lineGap = null, jump = null) {
|
|
897
951
|
for (const seg of spine) {
|
|
898
952
|
if (seg.source !== "clip" || seg.audio !== "clip" || !seg.words?.length || seg.fixedLength) continue;
|
|
899
953
|
const lines = seg.lineIds.map((id) => ({
|
|
@@ -901,7 +955,7 @@ function tightenSentenceGaps(spine, reactionCues, scriptLines, readLevels, lineG
|
|
|
901
955
|
asksPause: asksPause(scriptLines.get(id)),
|
|
902
956
|
cuesBeat: reactionCues.has(id),
|
|
903
957
|
}));
|
|
904
|
-
const heardCuts = sentenceGapCuts(seg.words, lines, readLevels(seg.file), lineGap);
|
|
958
|
+
const heardCuts = sentenceGapCuts(seg.words, lines, readLevels(seg.file), lineGap, jump);
|
|
905
959
|
// The measured map: on whole slots of the clip's own picture, so both lose the same frames.
|
|
906
960
|
const cuts = seg.map?.picture ? cutsOnSlots(heardCuts, seg.map.deltaSec) : heardCuts;
|
|
907
961
|
if (cuts.length === 0) continue;
|
|
@@ -1212,8 +1266,11 @@ export function brollWindow(seg, counts, cueLineId, texts, broll) {
|
|
|
1212
1266
|
* word, so the action it ends on (her setting the mat down, #3199) is seen, and
|
|
1213
1267
|
* one marked with actionLeadSec keeps that long before its first word, so the
|
|
1214
1268
|
* action it opens on (the dog stepping onto the mat, #3272) is seen.
|
|
1269
|
+
*
|
|
1270
|
+
* talkTrim: no talking clip keeps more than TALK_TRIM_SEC of air after its last
|
|
1271
|
+
* word, the ad's last one included; a scene's actionTailSec still holds.
|
|
1215
1272
|
*/
|
|
1216
|
-
function trimJoins(spine, reactionCues, scriptLines, gapMax = null) {
|
|
1273
|
+
function trimJoins(spine, reactionCues, scriptLines, gapMax = null, talkTrim = false) {
|
|
1217
1274
|
// cutPace: the beat before someone new answers shrinks so the join holds at most gapMax of air.
|
|
1218
1275
|
const newSpeakerLead = gapMax === null
|
|
1219
1276
|
? JOIN_LEAD_NEW_SPEAKER_SEC
|
|
@@ -1235,7 +1292,8 @@ function trimJoins(spine, reactionCues, scriptLines, gapMax = null) {
|
|
|
1235
1292
|
inSec = Math.max(inSec, Math.min(clear, floorFrame(firstWord)));
|
|
1236
1293
|
}
|
|
1237
1294
|
const endsAd = k === spine.length - 1 && !reactionCues.has(seg.lineIds.at(-1));
|
|
1238
|
-
const
|
|
1295
|
+
const airSec = endsAd ? END_AIR_SEC : JOIN_TAIL_SEC;
|
|
1296
|
+
const tailSec = Math.max(talkTrim ? Math.min(airSec, TALK_TRIM_SEC) : airSec, seg.actionTailSec ?? 0);
|
|
1239
1297
|
let outSec = ceilFrame(lastWord + tailSec);
|
|
1240
1298
|
if (after.length > 0) {
|
|
1241
1299
|
const clear = floorFrame(Math.min(...after.map((w) => w.s)) - EXTRA_CLEARANCE_SEC);
|
|
@@ -1380,6 +1438,17 @@ function markPunchIns(spine, sameShot) {
|
|
|
1380
1438
|
|
|
1381
1439
|
const sameSpeaker = (prev, seg) => Boolean(prev.lastSpeaker && seg.firstSpeaker === prev.lastSpeaker);
|
|
1382
1440
|
|
|
1441
|
+
/** pacePass: every second piece of the spine zooms, where no punch-in does already. Answers the cut's note. */
|
|
1442
|
+
export function paceZooms(spine) {
|
|
1443
|
+
let zoomed = 0;
|
|
1444
|
+
spine.forEach((seg, k) => {
|
|
1445
|
+
if (k % 2 === 0 || seg.punchIn) return;
|
|
1446
|
+
seg.paceZoom = true;
|
|
1447
|
+
zoomed += 1;
|
|
1448
|
+
});
|
|
1449
|
+
return `pacePass: the cut plays at ${PACE_PASS.speed}x and ${zoomed} piece${zoomed === 1 ? "" : "s"} zoom ${PACE_PASS.zoom}x`;
|
|
1450
|
+
}
|
|
1451
|
+
|
|
1383
1452
|
/** cutPace: two pieces of one take, back to back. */
|
|
1384
1453
|
const samePiece = (prev, seg) =>
|
|
1385
1454
|
Boolean(prev.piece && seg.piece && prev.file === seg.file && prev.piece.take === seg.piece.take);
|
|
@@ -2611,8 +2680,10 @@ export function buildTimeline({
|
|
|
2611
2680
|
}
|
|
2612
2681
|
const pace = finish?.cutPace === true;
|
|
2613
2682
|
const lineGap = pace ? { max: PACE_SPLIT_PAUSE_SEC, keep: PACE_GAP_MAX_SEC } : null;
|
|
2614
|
-
|
|
2615
|
-
|
|
2683
|
+
// jumpCut stays off a template launch's cut, whose selected clocks and windows hold their real time.
|
|
2684
|
+
const jump = finish?.jumpCut && manifest?.templateMotion?.enabled !== true ? JUMP_CUT : null;
|
|
2685
|
+
tightenSentenceGaps(spine, reactionCues, scriptLines, readLevels, lineGap, jump);
|
|
2686
|
+
trimJoins(spine, reactionCues, scriptLines, pace ? PACE_GAP_MAX_SEC : null, finish?.talkTrim === true);
|
|
2616
2687
|
if (pace) {
|
|
2617
2688
|
// The pieces of one take alternate between the plain frame and the
|
|
2618
2689
|
// punch-in, and a jump-cut run's alternation carries on across them.
|
|
@@ -3161,6 +3232,7 @@ export function buildFfmpegArgs(timeline, { resolve, music, out, finish = null,
|
|
|
3161
3232
|
}
|
|
3162
3233
|
if (seg.holdSec > 0.01) fit.push(`tpad=stop_mode=clone:stop_duration=${sec(seg.holdSec)}`);
|
|
3163
3234
|
if (seg.punchIn) fit.push(PUNCH_IN);
|
|
3235
|
+
if (seg.paceZoom) fit.push(PACE_ZOOM);
|
|
3164
3236
|
filters.push(`${norm(`${i}:v`)}${fit.length ? `,${fit.join(",")}` : ""}[v${i}]`);
|
|
3165
3237
|
// A segment split around a reaction beat starts partway into its sound too.
|
|
3166
3238
|
const skipIn = inSec > 0.001 ? `atrim=start=${sec(inSec)},asetpts=PTS-STARTPTS,` : "";
|
|
@@ -3730,6 +3802,29 @@ export const CAPTION_CLEAR_SEC = 0.02;
|
|
|
3730
3802
|
export const CAPTION_MIN_SEC = 0.35;
|
|
3731
3803
|
/** captionsByLine: the caption font is at most this share of the frame's height (69 px of 1920). */
|
|
3732
3804
|
export const CAPTION_MAX_SHARE = 0.036;
|
|
3805
|
+
/** captionColours: the speakers' caption colours in the order they first speak (ASS, &HBBGGRR&): white, yellow, cyan. */
|
|
3806
|
+
export const CAPTION_COLOURS = ["&HFFFFFF&", "&H00FFFF&", "&HFFFF00&"];
|
|
3807
|
+
/** captionColours: a coloured screen's black edge, at least this thick, so yellow or cyan still reads on a light picture. */
|
|
3808
|
+
export const CAPTION_COLOUR_MIN_OUTLINE = 4;
|
|
3809
|
+
|
|
3810
|
+
/**
|
|
3811
|
+
* captionColours: each line caption screen (lineCaptionScreens) in its
|
|
3812
|
+
* speaker's colour, so a viewer follows who talks when one of them is off
|
|
3813
|
+
* screen. The speaker is the screen's script line's speakerId, a narrator's
|
|
3814
|
+
* line (no speakerId) one speaker of its own; the colours go in the order the
|
|
3815
|
+
* speakers first speak and start again after the last. A screen whose line
|
|
3816
|
+
* the script does not hold stays as it is.
|
|
3817
|
+
*/
|
|
3818
|
+
export function colourScreens(screens, storyboard) {
|
|
3819
|
+
const speakerOf = new Map((storyboard?.script ?? []).map((line) => [line?.lineId, line?.speakerId ?? null]));
|
|
3820
|
+
const order = [];
|
|
3821
|
+
return screens.map((c) => {
|
|
3822
|
+
if (!speakerOf.has(c.line)) return c;
|
|
3823
|
+
const who = speakerOf.get(c.line);
|
|
3824
|
+
if (!order.includes(who)) order.push(who);
|
|
3825
|
+
return { ...c, colour: CAPTION_COLOURS[order.indexOf(who) % CAPTION_COLOURS.length] };
|
|
3826
|
+
});
|
|
3827
|
+
}
|
|
3733
3828
|
|
|
3734
3829
|
export function lineCaptionScreens(words, cap = null) {
|
|
3735
3830
|
const per = Math.max(1, Math.round(cap?.wordsPerLine?.median ?? 3));
|
|
@@ -3834,7 +3929,7 @@ export function editAss({ captions = [], cap = null, cards = [], hook = null, en
|
|
|
3834
3929
|
`Style: End,Helvetica,${Math.round(H * 0.045)},&H00FFFFFF,&H00FFFFFF,&H20101010,&H00000000,-1,0,0,0,100,100,2,0,3,40,0,5,0,0,0,1`,
|
|
3835
3930
|
...(endLayers ? endCardStyles(endLayers.colors, H) : []), "",
|
|
3836
3931
|
"[Events]", "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text",
|
|
3837
|
-
...captions.map((c) => `Dialogue: 1,${assTime(c.s)},${assTime(c.e)},Cap,,0,0,0,,{\\pos(${W / 2},${y})}${c.text}`),
|
|
3932
|
+
...captions.map((c) => `Dialogue: 1,${assTime(c.s)},${assTime(c.e)},Cap,,0,0,0,,{\\pos(${W / 2},${y})${c.colour ? `\\c${c.colour}${thick ? "" : `\\bord${CAPTION_COLOUR_MIN_OUTLINE}`}` : ""}}${c.text}`),
|
|
3838
3933
|
...cards.filter((c) => c.label).map((c) => `Dialogue: 2,${assTime(c.in)},${assTime(c.out)},Card,,0,0,0,,{${box(c.box)}\\fs${Math.round(H * 0.036)}\\fad(60,0)}${assText(c.label)}`),
|
|
3839
3934
|
...(hook?.text ? [`Dialogue: 3,${assTime(hook.in)},${assTime(hook.out)},Card,,0,0,0,,{${box(hook.box)}\\fs${Math.round(H * 0.026)}}${assText(hook.text)}`] : []),
|
|
3840
3935
|
...(endCard ? [`Dialogue: 4,${assTime(endCard.in)},${assTime(endCard.out)},End,,0,0,0,,{\\pos(${W / 2},${H / 2})\\fad(120,0)}${assText(endCard.text)}`] : []),
|
|
@@ -5526,10 +5621,18 @@ export function firstCut({ dir, out: outOpt, skip = new Set(), music: musicOn =
|
|
|
5526
5621
|
// The finishing settings' part of the render: the speed, the burned
|
|
5527
5622
|
// captions and cards, and where the mix goes before its loudness pass.
|
|
5528
5623
|
const notes = [];
|
|
5624
|
+
if (finish?.captionColours && stagedText) notes.push("captionColours: the text stage draws these captions, so they stay one colour");
|
|
5529
5625
|
const pictureSec = timeline.spine.reduce((sum, seg) => sum + seg.seconds, 0);
|
|
5530
5626
|
// A song and selected semantic action clocks are never globally accelerated.
|
|
5531
5627
|
const protectedMotion = [...timeline.spine, ...timeline.cutaways].some((s) => s.motionProtection);
|
|
5532
|
-
|
|
5628
|
+
// pacePass: its speed in place of cutPace's, on a cut no clock is held to (no song laid whole, no selected or mapped clock).
|
|
5629
|
+
const paced = finish?.pacePass === true && !timeline.wholeVoice && !protectedMotion && !timeline.mapped &&
|
|
5630
|
+
manifest.templateMotion?.enabled !== true;
|
|
5631
|
+
if (finish?.pacePass && !paced) notes.push("this cut keeps a real-time clock, so pacePass did not speed it up or zoom it");
|
|
5632
|
+
if (paced) notes.push(paceZooms(timeline.spine));
|
|
5633
|
+
const speed = paced
|
|
5634
|
+
? PACE_PASS.speed
|
|
5635
|
+
: finish?.cutPace && !timeline.wholeVoice && !protectedMotion ? speedFor(pictureSec, finish.targetSeconds) : 1;
|
|
5533
5636
|
if (finish?.cutPace && protectedMotion) notes.push("selected action/listening/ending obligations keep their real-time clock; cutPace does not accelerate the whole cut");
|
|
5534
5637
|
if (timeline.sourceMap) {
|
|
5535
5638
|
// The exact bytes every measured clock was read from, for whoever binds an approval to them.
|
|
@@ -5611,7 +5714,7 @@ export function firstCut({ dir, out: outOpt, skip = new Set(), music: musicOn =
|
|
|
5611
5714
|
if (finish.captions) burned = screens;
|
|
5612
5715
|
burnedCards = finish.cards ? (copied ? copied.cards : storyboardCards(storyboard, timeline)) : [];
|
|
5613
5716
|
writeFileSync(here(ass), editAss({
|
|
5614
|
-
captions: screens,
|
|
5717
|
+
captions: finish.captionColours ? colourScreens(screens, storyboard) : screens,
|
|
5615
5718
|
cap,
|
|
5616
5719
|
...(finish.captionsByLine ? { capMaxShare: CAPTION_MAX_SHARE } : {}),
|
|
5617
5720
|
cards: burnedCards,
|
package/dist/commands/video.d.ts
CHANGED
|
@@ -25,6 +25,7 @@ export declare const ITEMS_PATH = "/api/v2/workflow/items";
|
|
|
25
25
|
export declare const FINAL_PATH = "/api/v2/video/final";
|
|
26
26
|
export declare const VOICES_PATH = "/api/v2/video/voices";
|
|
27
27
|
export declare const PICKS_PATH = "/api/v2/video/picks";
|
|
28
|
+
export declare const MAP_PATH = "/api/v2/video/map";
|
|
28
29
|
export declare const ASSET_UPLOAD_URL_PATH = "/api/v2/workflows/asset-upload-url";
|
|
29
30
|
export declare const ASSETS_PATH = "/api/v2/workflows/assets";
|
|
30
31
|
export interface ClipWord {
|
|
@@ -194,6 +195,7 @@ export interface VideoRun {
|
|
|
194
195
|
};
|
|
195
196
|
requestQuotePending?: boolean;
|
|
196
197
|
sourceEditMap?: true;
|
|
198
|
+
blockingMap?: true;
|
|
197
199
|
nodes: VideoRunNode[];
|
|
198
200
|
pauseAhead?: WorkflowRun["pauseAhead"];
|
|
199
201
|
castLock?: PullCastLock | null;
|
|
@@ -304,6 +306,7 @@ export type RunStop = {
|
|
|
304
306
|
framesNodeId?: string;
|
|
305
307
|
showAd?: true;
|
|
306
308
|
heldReason?: string;
|
|
309
|
+
blockingMap?: true;
|
|
307
310
|
} | {
|
|
308
311
|
at: "final-watch";
|
|
309
312
|
missingScenes?: MissingScene[];
|
|
@@ -682,6 +685,97 @@ export declare function parsePickFlags(occurrences: FlagOccurrence[]): {
|
|
|
682
685
|
};
|
|
683
686
|
export declare function pickFlow(runId: string, request: PickRequest, json: boolean, deps: VideoDeps): Promise<FlowResult>;
|
|
684
687
|
export declare function redoPicksFlow(runId: string, slot: string, note: string | undefined, json: boolean, deps: VideoDeps): Promise<FlowResult>;
|
|
688
|
+
export interface MapPlaceView {
|
|
689
|
+
place: string;
|
|
690
|
+
timeOfDay: string;
|
|
691
|
+
bounds: {
|
|
692
|
+
x0: number;
|
|
693
|
+
y0: number;
|
|
694
|
+
x1: number;
|
|
695
|
+
y1: number;
|
|
696
|
+
};
|
|
697
|
+
people: Array<{
|
|
698
|
+
who: string;
|
|
699
|
+
name: string;
|
|
700
|
+
x: number;
|
|
701
|
+
y: number;
|
|
702
|
+
side: string;
|
|
703
|
+
faces: string | null;
|
|
704
|
+
}>;
|
|
705
|
+
things: Array<{
|
|
706
|
+
what: string;
|
|
707
|
+
x: number;
|
|
708
|
+
y: number;
|
|
709
|
+
far?: true;
|
|
710
|
+
}>;
|
|
711
|
+
setups: Array<{
|
|
712
|
+
setup: string;
|
|
713
|
+
scenes: number[];
|
|
714
|
+
people: string[];
|
|
715
|
+
}>;
|
|
716
|
+
redraw: Array<{
|
|
717
|
+
sceneIndex: number;
|
|
718
|
+
setup?: string;
|
|
719
|
+
shares: number[];
|
|
720
|
+
}>;
|
|
721
|
+
pictures: number;
|
|
722
|
+
usd: {
|
|
723
|
+
low: number;
|
|
724
|
+
high: number;
|
|
725
|
+
} | null;
|
|
726
|
+
}
|
|
727
|
+
export interface MapView {
|
|
728
|
+
runId: string;
|
|
729
|
+
movable: boolean;
|
|
730
|
+
places: MapPlaceView[];
|
|
731
|
+
}
|
|
732
|
+
export declare function mapLines(view: MapView, runId: string, runUrl: string): string[];
|
|
733
|
+
export interface MoveRequest {
|
|
734
|
+
moves: Array<{
|
|
735
|
+
who: string;
|
|
736
|
+
x: number;
|
|
737
|
+
y: number;
|
|
738
|
+
}>;
|
|
739
|
+
place?: string;
|
|
740
|
+
note?: string;
|
|
741
|
+
}
|
|
742
|
+
export interface MoveReceipt {
|
|
743
|
+
place: string;
|
|
744
|
+
moved: Array<{
|
|
745
|
+
name: string;
|
|
746
|
+
from: {
|
|
747
|
+
x: number;
|
|
748
|
+
y: number;
|
|
749
|
+
};
|
|
750
|
+
to: {
|
|
751
|
+
x: number;
|
|
752
|
+
y: number;
|
|
753
|
+
};
|
|
754
|
+
}>;
|
|
755
|
+
unchanged?: true;
|
|
756
|
+
redrawing: Array<{
|
|
757
|
+
sceneIndex: number;
|
|
758
|
+
setup?: string;
|
|
759
|
+
shares: number[];
|
|
760
|
+
}>;
|
|
761
|
+
notStarted: Array<{
|
|
762
|
+
sceneIndex: number;
|
|
763
|
+
why: string;
|
|
764
|
+
}>;
|
|
765
|
+
usd: {
|
|
766
|
+
low: number;
|
|
767
|
+
high: number;
|
|
768
|
+
} | null;
|
|
769
|
+
}
|
|
770
|
+
export declare function parseMoveFlags(occurrences: FlagOccurrence[]): {
|
|
771
|
+
ok: true;
|
|
772
|
+
request: MoveRequest;
|
|
773
|
+
} | {
|
|
774
|
+
ok: false;
|
|
775
|
+
line: string;
|
|
776
|
+
};
|
|
777
|
+
export declare function moveFlow(runId: string, request: MoveRequest, json: boolean, deps: VideoDeps): Promise<FlowResult>;
|
|
778
|
+
export declare function mapFlow(runId: string, place: string | undefined, json: boolean, deps: VideoDeps): Promise<FlowResult>;
|
|
685
779
|
export declare function flagFlow(runId: string, note: string, json: boolean, deps: VideoDeps): Promise<FlowResult>;
|
|
686
780
|
export declare function retryFrameFlow(runId: string, nodeId: string | undefined, sceneIndex: number, note: string | undefined, json: boolean, deps: VideoDeps): Promise<FlowResult>;
|
|
687
781
|
export declare const BROLL_EDIT_STALE_MS: number;
|
package/dist/commands/video.js
CHANGED
|
@@ -170,6 +170,8 @@ Usage:
|
|
|
170
170
|
exodus video picks <runId> [--redo face:<who>|room:<place>] [--note "..."] [--json]
|
|
171
171
|
exodus video pick <runId> [--face <who>=<n>] [--voice <who>=<n|name|id>] [--room <place>=<n>] [--style <key>] [--move <who>=<x>,<y>] [--note "..."] [--json]
|
|
172
172
|
exodus video storyboard <runId> [--json]
|
|
173
|
+
exodus video map <runId> [--place <place>] [--json]
|
|
174
|
+
exodus video move <runId> --move <who>=<x>,<y> [--move ...] [--place <place>] [--note "..."] [--json]
|
|
173
175
|
exodus video approve <runId> [--approve-stale-cut] [--json]
|
|
174
176
|
exodus video retry-frame <runId> [--node <nodeId>] --scene <n> [--note "..."] [--json]
|
|
175
177
|
exodus video broll <runId> [--json]
|
|
@@ -232,9 +234,12 @@ Options:
|
|
|
232
234
|
--room <place>=<n> The room to keep for a place (pick). Repeatable
|
|
233
235
|
--style <key> The director style (pick), when the run offers one
|
|
234
236
|
--move <who>=<x>,<y> Where a person stands on the blocking map, in metres
|
|
235
|
-
(
|
|
237
|
+
(move). Repeatable. At the picks stop (pick) it is
|
|
238
|
+
refused: the map comes with the storyboard
|
|
236
239
|
--redo <slot> Four new paid pictures for face:<who> or room:<place>
|
|
237
240
|
(picks). The second redo of the same slot needs --note
|
|
241
|
+
--place <place> One room of the blocking map, as the map names it (map,
|
|
242
|
+
move)
|
|
238
243
|
--catalog List the voices you can pick by name (voices). No run
|
|
239
244
|
needed. With a run, also the best few for each
|
|
240
245
|
character who speaks
|
|
@@ -414,7 +419,7 @@ status, storyboard, approve (the storyboard), voices, retry-frame --scene <n> (r
|
|
|
414
419
|
picture while the storyboard waits), pull (the finished video, each scene's
|
|
415
420
|
clip and voice, and the music) and upload. These stay admin-only:
|
|
416
421
|
start --video-model / --voice / --voice-path / --director, director,
|
|
417
|
-
status --rejected-draft, retry-clip, revoice and
|
|
422
|
+
status --rejected-draft, retry-clip, revoice, broll, map and move. start --broll works
|
|
418
423
|
for whoever B-roll is switched on for.
|
|
419
424
|
If a command answers "video isn't enabled for this key", the run id is wrong,
|
|
420
425
|
the command is admin-only, or video isn't switched on for your dashboard user.
|
|
@@ -474,6 +479,7 @@ const REVOICE_NOT_ON_THIS_SERVER = "This Exodus server does not have the voice r
|
|
|
474
479
|
export const FINAL_PATH = "/api/v2/video/final";
|
|
475
480
|
export const VOICES_PATH = "/api/v2/video/voices";
|
|
476
481
|
export const PICKS_PATH = "/api/v2/video/picks";
|
|
482
|
+
export const MAP_PATH = "/api/v2/video/map";
|
|
477
483
|
export const ASSET_UPLOAD_URL_PATH = "/api/v2/workflows/asset-upload-url";
|
|
478
484
|
export const ASSETS_PATH = "/api/v2/workflows/assets";
|
|
479
485
|
function withoutJudgeFields({ judgeDetail: _d, judgeSeverity: _s, ...rest }) {
|
|
@@ -714,6 +720,7 @@ export function classifyRun(run) {
|
|
|
714
720
|
: {}),
|
|
715
721
|
...(isShowAd(run) ? { showAd: true } : {}),
|
|
716
722
|
...(held ? { heldReason: held } : {}),
|
|
723
|
+
...(run.blockingMap === true ? { blockingMap: true } : {}),
|
|
717
724
|
};
|
|
718
725
|
}
|
|
719
726
|
if (parkedAtFinalWatch(run)) {
|
|
@@ -899,6 +906,8 @@ export function stopLines(stop, runId, runUrl) {
|
|
|
899
906
|
if (stop.framesNodeId) {
|
|
900
907
|
lines.push(`Redo one frame: exodus video retry-frame ${runId} --node ${stop.framesNodeId} --scene <n>`);
|
|
901
908
|
}
|
|
909
|
+
if (stop.blockingMap)
|
|
910
|
+
lines.push(`See the rooms: exodus video map ${runId}`);
|
|
902
911
|
return lines;
|
|
903
912
|
}
|
|
904
913
|
if (stop.at === "final-watch") {
|
|
@@ -3880,6 +3889,7 @@ export async function storyboardFlow(runId, json, deps) {
|
|
|
3880
3889
|
.get(`${RUN_PATH}?runId=${encodeURIComponent(runId)}`)
|
|
3881
3890
|
.catch(() => null);
|
|
3882
3891
|
const showAd = runRes?.ok === true && isShowAd(asVideoRun(runRes.data));
|
|
3892
|
+
const blockingMap = runRes?.ok === true && asVideoRun(runRes.data).blockingMap === true;
|
|
3883
3893
|
const logic = cards.logicFindings;
|
|
3884
3894
|
if (logic) {
|
|
3885
3895
|
lines.push("", "The check before pictures");
|
|
@@ -3904,6 +3914,8 @@ export async function storyboardFlow(runId, json, deps) {
|
|
|
3904
3914
|
if (cards.broll === true) {
|
|
3905
3915
|
lines.push(`change the B-roll shots: exodus video broll ${runId}`);
|
|
3906
3916
|
}
|
|
3917
|
+
if (blockingMap)
|
|
3918
|
+
lines.push(`see each room and where everyone stands: exodus video map ${runId}`);
|
|
3907
3919
|
return { code: 0, lines };
|
|
3908
3920
|
}
|
|
3909
3921
|
function sceneCardLines(scene) {
|
|
@@ -4169,7 +4181,7 @@ export function parsePickFlags(occurrences) {
|
|
|
4169
4181
|
continue;
|
|
4170
4182
|
}
|
|
4171
4183
|
if (flag === "move") {
|
|
4172
|
-
const [x, y, ...extra] = picked.split(",").map((part) => Number(part.trim()));
|
|
4184
|
+
const [x, y, ...extra] = picked.split(",").map((part) => (part.trim() ? Number(part.trim()) : NaN));
|
|
4173
4185
|
if (extra.length > 0 || !Number.isFinite(x) || !Number.isFinite(y)) {
|
|
4174
4186
|
return { ok: false, line: `--move ${name} needs metres as <x>,<y>, for example --move ${shellWord(name)}=1.25,2 (got "${picked}").` };
|
|
4175
4187
|
}
|
|
@@ -4236,6 +4248,101 @@ export async function redoPicksFlow(runId, slot, note, json, deps) {
|
|
|
4236
4248
|
],
|
|
4237
4249
|
};
|
|
4238
4250
|
}
|
|
4251
|
+
const metres = (n) => String(Number(n.toFixed(2)));
|
|
4252
|
+
function andList(words) {
|
|
4253
|
+
return words.length <= 1 ? words.join("") : `${words.slice(0, -1).join(", ")} and ${words[words.length - 1]}`;
|
|
4254
|
+
}
|
|
4255
|
+
export function mapLines(view, runId, runUrl) {
|
|
4256
|
+
const lines = [
|
|
4257
|
+
`Run ${runId}'s blocking map, in metres, seen from above: x runs left to right as each room's wide shot sees it, y away from its camera.`,
|
|
4258
|
+
`See the pictures: ${runUrl}`,
|
|
4259
|
+
];
|
|
4260
|
+
for (const place of view.places) {
|
|
4261
|
+
const b = place.bounds;
|
|
4262
|
+
lines.push("", `${place.place.toUpperCase()} (${place.timeOfDay}) x ${metres(b.x0)} to ${metres(b.x1)}, y ${metres(b.y0)} to ${metres(b.y1)}: ${metres(b.x1 - b.x0)} m across, ${metres(b.y1 - b.y0)} m deep`);
|
|
4263
|
+
const width = Math.max(6, ...place.people.map((p) => p.name.length));
|
|
4264
|
+
for (const p of place.people) {
|
|
4265
|
+
const at = `x ${metres(p.x)}`.padEnd(8) + `y ${metres(p.y)}`.padEnd(8);
|
|
4266
|
+
lines.push(` ${p.name.padEnd(width)} ${at}${p.side.padEnd(13)}faces ${p.faces ?? "the camera"}`);
|
|
4267
|
+
}
|
|
4268
|
+
for (const t of place.things) {
|
|
4269
|
+
lines.push(` ${t.what.padEnd(width)} ${`x ${metres(t.x)}`.padEnd(8)}y ${metres(t.y)}${t.far ? " (off the map, more than 3 m from everyone)" : ""}`);
|
|
4270
|
+
}
|
|
4271
|
+
for (const s of place.setups) {
|
|
4272
|
+
lines.push(` setup ${s.setup} ${scenesPhrase(s.scenes)} ${s.people.length ? andList(s.people) : "nobody named"}`);
|
|
4273
|
+
}
|
|
4274
|
+
if (place.pictures > 0) {
|
|
4275
|
+
lines.push(` A move here that changes anyone's side of the wide shot redraws ${picturesPhrase(place.pictures)} (${redrawPhrase(place.redraw)})${priceRange(place.usd)}. A move that keeps everyone's side redraws nothing.`);
|
|
4276
|
+
}
|
|
4277
|
+
}
|
|
4278
|
+
lines.push("", view.movable
|
|
4279
|
+
? `Move someone: exodus video move ${runId} --move <who>=<x>,<y> [--place <place>] [--note "<what to change>"]`
|
|
4280
|
+
: "People can be moved only while the storyboard waits for you with its pictures drawn.");
|
|
4281
|
+
return lines;
|
|
4282
|
+
}
|
|
4283
|
+
const picturesPhrase = (n) => `${n} ${n === 1 ? "picture" : "pictures"}`;
|
|
4284
|
+
function redrawPhrase(redraw) {
|
|
4285
|
+
const shared = redraw
|
|
4286
|
+
.filter((r) => r.shares.length > 0)
|
|
4287
|
+
.map((r) => `${scenesPhrase(r.shares)} ${r.shares.length === 1 ? "shares" : "share"} scene ${r.sceneIndex}'s still`);
|
|
4288
|
+
return [scenesPhrase(redraw.map((r) => r.sceneIndex)), ...shared].join("; ");
|
|
4289
|
+
}
|
|
4290
|
+
function priceRange(usd) {
|
|
4291
|
+
if (!usd)
|
|
4292
|
+
return " · price unknown";
|
|
4293
|
+
return usd.high > usd.low ? ` · $${usd.low.toFixed(2)} to $${usd.high.toFixed(2)}` : ` · about $${usd.low.toFixed(2)}`;
|
|
4294
|
+
}
|
|
4295
|
+
export function parseMoveFlags(occurrences) {
|
|
4296
|
+
const moves = occurrences.filter((o) => o.flag === "move");
|
|
4297
|
+
if (moves.length === 0)
|
|
4298
|
+
return { ok: false, line: "video move needs at least one --move <who>=<x>,<y>, in metres on the map." };
|
|
4299
|
+
const picked = parsePickFlags(moves);
|
|
4300
|
+
if (!picked.ok)
|
|
4301
|
+
return picked;
|
|
4302
|
+
const request = { moves: picked.request.moves };
|
|
4303
|
+
for (const { flag, value } of occurrences) {
|
|
4304
|
+
if (flag !== "place" && flag !== "note")
|
|
4305
|
+
continue;
|
|
4306
|
+
if (value === undefined || !value.trim())
|
|
4307
|
+
return { ok: false, line: `--${flag} needs a value.` };
|
|
4308
|
+
if (flag === "place")
|
|
4309
|
+
request.place = value.trim();
|
|
4310
|
+
else
|
|
4311
|
+
request.note = value.trim();
|
|
4312
|
+
}
|
|
4313
|
+
return { ok: true, request };
|
|
4314
|
+
}
|
|
4315
|
+
export async function moveFlow(runId, request, json, deps) {
|
|
4316
|
+
const res = await deps.post(MAP_PATH, { runId, ...request });
|
|
4317
|
+
if (!res.ok)
|
|
4318
|
+
return errorResult(res, json);
|
|
4319
|
+
const receipt = res.data;
|
|
4320
|
+
if (json)
|
|
4321
|
+
return { code: 0, lines: [JSON.stringify({ ok: true, runId, ...receipt })] };
|
|
4322
|
+
const where = (p) => `x ${metres(p.x)}, y ${metres(p.y)}`;
|
|
4323
|
+
const lines = receipt.moved.map((m) => `Moved ${m.name} from ${where(m.from)} to ${where(m.to)} in ${receipt.place}.`);
|
|
4324
|
+
if (receipt.unchanged) {
|
|
4325
|
+
lines.push("Nobody changed side of the wide shot, and the pictures only know who stands on which side, so they would come out the same. Nothing is redrawn and nothing is spent.", `See the map: exodus video map ${runId}`);
|
|
4326
|
+
return { code: 0, lines };
|
|
4327
|
+
}
|
|
4328
|
+
const drawn = receipt.redrawing;
|
|
4329
|
+
if (drawn.length > 0) {
|
|
4330
|
+
lines.push(`Redrawing ${picturesPhrase(drawn.length)} of ${receipt.place} (${redrawPhrase(drawn)})${priceRange(receipt.usd)}. Every other picture stays as it is.`);
|
|
4331
|
+
}
|
|
4332
|
+
for (const n of receipt.notStarted)
|
|
4333
|
+
lines.push(`Scene ${n.sceneIndex}'s picture was not redrawn: ${n.why}`);
|
|
4334
|
+
lines.push(`See them when they are done: exodus video storyboard ${runId}`);
|
|
4335
|
+
return { code: drawn.length > 0 || receipt.notStarted.length === 0 ? 0 : 1, lines };
|
|
4336
|
+
}
|
|
4337
|
+
export async function mapFlow(runId, place, json, deps) {
|
|
4338
|
+
const res = await deps.get(`${MAP_PATH}?runId=${encodeURIComponent(runId)}${place ? `&place=${encodeURIComponent(place)}` : ""}`);
|
|
4339
|
+
if (!res.ok)
|
|
4340
|
+
return errorResult(res, json);
|
|
4341
|
+
const view = res.data;
|
|
4342
|
+
if (json)
|
|
4343
|
+
return { code: 0, lines: [JSON.stringify(view, null, 2)] };
|
|
4344
|
+
return { code: 0, lines: mapLines(view, runId, reviewUrl(deps.dashboardUrl, { _id: runId })) };
|
|
4345
|
+
}
|
|
4239
4346
|
export async function flagFlow(runId, note, json, deps) {
|
|
4240
4347
|
const res = await deps.post(FLAG_PATH, { runId, note });
|
|
4241
4348
|
if (!res.ok)
|
|
@@ -5774,6 +5881,7 @@ const VALUE_FLAGS = new Set([
|
|
|
5774
5881
|
"room",
|
|
5775
5882
|
"move",
|
|
5776
5883
|
"redo",
|
|
5884
|
+
"place",
|
|
5777
5885
|
]);
|
|
5778
5886
|
export function parsePositional(args = process.argv.slice(3)) {
|
|
5779
5887
|
const out = [];
|
|
@@ -5861,6 +5969,8 @@ export async function run(flags, occurrences) {
|
|
|
5861
5969
|
"quote",
|
|
5862
5970
|
"picks",
|
|
5863
5971
|
"pick",
|
|
5972
|
+
"map",
|
|
5973
|
+
"move",
|
|
5864
5974
|
];
|
|
5865
5975
|
if (sub === "voices" && flags["catalog"] !== undefined && flags["catalog"] !== false) {
|
|
5866
5976
|
return printResult(await voiceCatalogFlow(runId, json, defaultDeps));
|
|
@@ -5915,6 +6025,18 @@ export async function run(flags, occurrences) {
|
|
|
5915
6025
|
return printResult(await redoPicksFlow(runId, redo.trim(), flagString(flags, "note"), json, defaultDeps));
|
|
5916
6026
|
return printResult(await picksFlow(runId, json, defaultDeps));
|
|
5917
6027
|
}
|
|
6028
|
+
if (sub === "map") {
|
|
6029
|
+
const place = flagString(flags, "place");
|
|
6030
|
+
if (flags["place"] !== undefined && !place?.trim())
|
|
6031
|
+
usage("video map --place needs a place, as the map names it.");
|
|
6032
|
+
return printResult(await mapFlow(runId, place?.trim(), json, defaultDeps));
|
|
6033
|
+
}
|
|
6034
|
+
if (sub === "move") {
|
|
6035
|
+
const plan = parseMoveFlags(occurrences);
|
|
6036
|
+
if (!plan.ok)
|
|
6037
|
+
usage(plan.line);
|
|
6038
|
+
return printResult(await moveFlow(runId, plan.request, json, defaultDeps));
|
|
6039
|
+
}
|
|
5918
6040
|
if (sub === "pick") {
|
|
5919
6041
|
const plan = parsePickFlags(occurrences);
|
|
5920
6042
|
if (!plan.ok)
|