@gentbajko/slopify 3.18.0 → 3.19.0

package/dist/slices/rebuild/runtime-local.js

@@ -5,12 +5,14 @@ import { referenceKey, thumbnailVariant } from "../admission/model.js";
 import { plainText } from "../article/plain.js";
 import { splitEndMatter } from "../article/split.js";
 import { levelPieces } from "../loudness/level-pieces.js";
+import { removeBreaths } from "../narration/breaths.js";
 import { joinNarration } from "../narration/concat.js";
 import { applyPauses, planPieces } from "../narration/pauses.js";
 import { allocateAsset, discardPreparedAssets, sealAsset } from "../storage/assets.js";
 import { outputPath } from "../storage/layout.js";
 import { probeDurationMs, runFfmpeg } from "../video/ffmpeg.js";
 import { turnJoinArgs } from "../voices/join.js";
+import { breathsAsked } from "./recipe-breaths.js";
 import { levelOperation } from "./recipe-loudness.js";
 import { executeFigureCard } from "./runtime-figure-card.js";
 import { publishNarrationText } from "./runtime-narration-text.js";
@@ -134,16 +136,27 @@ async function concatenate(deps, context, piece) {
     try {
         const run = { bin: deps.ffmpeg, log: deps.log, signal: context.signal };
         const levelled = level ? await levelPieces(run, files, piecesDirectory) : undefined;
+        // Remove breaths: muted in what is joined, before the pauses; nothing moves, so the pauses
+        // are still planned from the pieces as spoken.
+        const breathless = breathsAsked(values)
+            ? await removeBreaths(run, levelled?.files ?? files, join(piecesDirectory, "breaths"))
+            : undefined;
+        if (breathless !== undefined)
+            deps.log.write("info", "narration.breaths", {
+                projectId: context.work.projectId,
+                stage: "audio",
+                detail: `${String(breathless.removed)} breaths muted in ${String(files.length)} pieces`,
+            });
         // Pauses between sentences: planned from the pieces as spoken, made in what is joined.
         const pauses = pausesIn(values);
         const paced = pauses === undefined
             ? undefined
-            : await applyPauses(run, levelled?.files ?? files, paceScaled(await planPieces(run, files.map((file, at) => ({
+            : await applyPauses(run, breathless?.files ?? levelled?.files ?? files, paceScaled(await planPieces(run, files.map((file, at) => ({
                 file,
                 text: pieceText(plan.recipes.find((one) => one.key === recipe.dependsOn[at])),
                 next: pauses.next[at] ?? "end",
             })), pauses.settings), operation === "concat-turns-v1" ? values : undefined), join(piecesDirectory, "paced"));
-        const joined = paced?.files ?? levelled?.files ?? files;
+        const joined = paced?.files ?? breathless?.files ?? levelled?.files ?? files;
         const durationMs = operation === "concat-turns-v1"
             ? await joinTurns(run, joined, values, pending.absolutePath)
             : await joinNarration({ bin: deps.ffmpeg, log: deps.log }, {
@@ -151,7 +164,7 @@ async function concatenate(deps, context, piece) {
                 output: pending.absolutePath,
                 listPath: join(dirname(pending.absolutePath), "parts.txt"),
                 signal: context.signal,
-                reencode: level || paced !== undefined,
+                reencode: level || paced !== undefined || breathless !== undefined,
             });
         rmSync(piecesDirectory, { recursive: true, force: true });
         context.signal.throwIfAborted();

package/dist/slices/storage/arrange.js

@@ -5,7 +5,13 @@ import { backupsFolderName, projectDir, renderCacheFolder } from "./layout.js";
 // The file in each project folder that says which project it is, for when the database and
 // the folders disagree (a restored database, a folder renamed by hand). Reconcile keeps it.
 export const projectMarker = ".slopify-project";
-// What makes a project's arrangement current: its title, head version and files. A project
+// The pictures a video or short shows. Every version's stay in Upload, an older version's under
+// Images/Earlier/<date>/, never in History: making them again never gives the same ones.
+const imageRoles = new Set(["image", "animated_image", "short_image"]);
+// Raised when a role's place changes, so every project arranged by the older places is moved
+// once: 2 put every version's images the video and shorts show into Upload (3.18.1).
+const layoutVersion = 2;
+// What makes a project's arrangement current: the layout, its title, head version and files. A project
 // whose key is unchanged since it was last arranged is left alone.
 export function arrangeKeys(db) {
     const keys = new Map();
@@ -16,7 +22,10 @@ export function arrangeKeys(db) {
         (SELECT count(*)||':'||COALESCE(max(r.id),'') FROM revision_outputs r WHERE r.project_id=p.id AND r.selected=1 AND r.revision_id=h.revision_id) AS current
        FROM projects p LEFT JOIN project_heads h ON h.project_id=p.id`)
         .all())
-        keys.set(String(row.id), [row.title, row.revision_id, row.assets, row.legacy, row.current].map(String).join("|"));
+        keys.set(String(row.id), [
+            `layout ${layoutVersion}`,
+            ...[row.title, row.revision_id, row.assets, row.legacy, row.current].map(String),
+        ].join("|"));
     return keys;
 }
 // Whether anything of the project runs or may start: its files stay where they are until then.
@@ -241,7 +250,9 @@ export function desiredPlaces(db, projectId) {
         const place = placeFor(reference, order, titles);
         out.set(reference.path, reference.current
             ? place
-            : `History/${day(reference.createdAt)}/${place.replace(/^Upload\//u, "")}`);
+            : imageRoles.has(reference.role)
+                ? `Upload/Images/Earlier/${day(reference.createdAt)}/${place.replace(/^Upload\/(?:Images\/)?/u, "")}`
+                : `History/${day(reference.createdAt)}/${place.replace(/^Upload\//u, "")}`);
     }
     return out;
 }
@@ -286,14 +297,16 @@ function placeFor(reference, order, titles) {
             const key = /^image:(.+)$/u.exec(slot)?.[1];
             const at = key === undefined ? undefined : order.get(key);
             return at === undefined
-                ? `Working/Images/${file}`
-                : `Working/Images/${pad(at + 1)}${extension}`;
+                ? `Upload/Images/${file}`
+                : `Upload/Images/${pad(at + 1)}${extension}`;
         }
         case "short_image": {
             const match = /^shorts:([0-9]+):image:([0-9]+)$/u.exec(slot);
-            return match === null
-                ? `Working/Shorts/${file}`
-                : `Working/Shorts/Short ${match[1]}/image ${match[2]}${extension}`;
+            if (match === null)
+                return `Upload/Shorts/Images/${file}`;
+            // Beside the short's video, in a folder named like it: Shorts/3 - Title/image 1.png.
+            const title = titles.get(Number(match[1]));
+            return `Upload/Shorts/${match[1]}${title === undefined || title === "" ? "" : ` - ${clean(title)}`}/image ${match[2]}${extension}`;
         }
         case "figure_card":
             return `Working/Cards/${file}`;

package/dist/slices/storage/trim.js

@@ -5,8 +5,9 @@ import { liveProject, projectExists, projectPaused, stagesOf } from "../admissio
 import { projectSettled } from "./arrange.js";
 import { backupsFolderName, outputPath, projectDir } from "./layout.js";
 import { pieceFile } from "./reconcile.js";
-// Keep outputs only: a finished project drops the working files it was made from (images,
-// narration parts, subtitle timing, render settings) and keeps what gets published. Two
+// Keep outputs only: a finished project drops the working files it was made from (narration
+// parts, subtitle timing, render settings) and keeps what gets published, the images the
+// video and shorts show included: making them again costs money and never gives the same ones. Two
 // rules keep it safe. A file the user supplied is never removed, because nothing could make
 // it again. And only files a project record names are removed: anything else in the folder
 // is reconcile's business (`reconcile.ts`), which leaves the Backups folder alone.
@@ -28,6 +29,9 @@ export const outputRoles = [
     "audio_export",
     "subtitles_srt",
     "subtitles_vtt",
+    "image",
+    "animated_image",
+    "short_image",
 ];
 export function projectStorage(deps, projectId) {
     const files = filesOf(deps.paths, projectId);

package/dist/tutorials/Editing-a-Project.md

@@ -128,12 +128,13 @@ See [Narration Aliases and Glossary](Narration-Aliases-and-Glossary).
 
 ## Pauses and volume
 
-**Edit project → Inputs → Pauses and volume** holds four settings. All run on your computer with no API calls.
+**Edit project → Inputs → Pauses and volume** holds these settings. All run on your computer with no API calls.
 
 | Option | What it does | Default / range |
 | --- | --- | --- |
 | **Pause between sentences (seconds)** | The least quiet after each sentence. Adds silence where the pause is shorter; never shortens one or cuts a word. About 0.25 s is brisk, 0.35 to 0.45 natural, 0.5 to 0.8 an audiobook's pace, 0.8 and up sleep content. 0 keeps the voice's own. | 0.4; 0 to 2 in steps of 0.05 |
 | **Pause between paragraphs (seconds)** | The least quiet at the end of a paragraph, when you want more than between sentences. At 0 paragraphs get the sentence pause. Try 0.8 to 1.2 for a slower read. A speaker's turn gap is set under Speakers instead. | 0; 0 to 2 |
+| **Remove breaths** | Mutes the audible in-breaths a voice takes between sentences and after commas (Inworld's TTS-2 takes a loud one almost every time). Only the breath goes quiet: words, pauses and captions stay where they were. | Off |
 | **Level the volume** | Brings every narration piece to one loudness before they are joined, then sets the video, shorts and audio files to a finished loudness. | On for new runs (Settings → General → **Level the volume for new runs**) |
 | **Video volume** | How loud the video and shorts are, in dB from the recommended level (0 dB is -14 LUFS, what YouTube and Spotify play at). -6 dB is about 50%, +4 dB about 158%. Peaks stay under -1.5 dBTP. | 0 dB; -10 to +4 dB in 0.5 dB steps |
 | **Audio files volume** | How loud the WAV, MP3 and M4B are, in dB from -18 LUFS (what audiobook shops such as ACX ask for). Peaks stay under -3 dBTP. | 0 dB; -10 to +4 dB |
@@ -142,7 +143,7 @@ You can type a volume in dB or as a percentage of the recommended level.
 
 What changing them remakes:
 
-- **Pauses**: the narration is joined again from the pieces it already has and timed again, which remakes what is timed from it: captions, the video and, when on, the YouTube description and the shorts' pick (those two are text calls). No speech is made again.
+- **Pauses or Remove breaths**: the narration is joined again from the pieces it already has and timed again, which remakes what is timed from it: captions, the video and, when on, the YouTube description and the shorts' pick (those two are text calls). No speech is made again.
 - **Level the volume on or off**: the levelled narration is joined again and the exports rendered again. No speech is made again, and word timing, description, shorts' pick and reviews are not redone.
 - **A volume only**: the exports are mastered again, nothing else.
 

package/dist/tutorials/Project-Page.md

@@ -197,7 +197,7 @@ Only generated steps can have a checkpoint. Pausing the project still applies on
 
 ## Free space
 
-A finished project can drop the working files it was made from (images, narration parts, subtitle timing, render settings) and keep what gets published: the video, shorts, thumbnail, article, description, document and anything you uploaded. In the right rail, **Free space** shows the size of both, for example "Outputs 1.4 GB · working files 1.2 GB", with the button **Free 1.2 GB: keep the outputs, drop the working files**.
+A finished project can drop the working files it was made from (narration parts, subtitle timing, render settings) and keep what gets published: the video, shorts, the images they show, thumbnail, article, description, document and anything you uploaded. In the right rail, **Free space** shows the size of both, for example "Outputs 1.4 GB · working files 1.2 GB", with the button **Free 1.2 GB: keep the outputs, drop the working files**.
 
 1. Press the button.
 2. Read what goes, then confirm with **Free 1.2 GB**, or press **Keep the working files**.

package/dist/tutorials/Settings-Reference.md

@@ -198,7 +198,7 @@ After importing, enter your keys again in Settings → Providers. You can also r
 |---|---|
 | **Disk space** | What Slopify stores: the total, project files, staged uploads, and deleted projects still in the trash (freed when the trash removes them after 30 days, or with **Delete now**). |
 | Storage by project | Each project's size, split into outputs and working files, largest first. A finished project's page offers the same on its own (**Free space**, see [Project Page](Project-Page#free-space)). |
-| **Keep outputs only** | On a finished project, deletes the working files (images, narration parts, subtitle timing, render settings) and keeps the video, shorts, thumbnail, article, description, document and your uploads. You confirm first. Changing the project later makes those files again, which takes time and provider credits. |
+| **Keep outputs only** | On a finished project, deletes the working files (narration parts, subtitle timing, render settings) and keeps the video, shorts, the images they show, thumbnail, article, description, document and your uploads. You confirm first. Changing the project later makes those files again, which takes time and provider credits. |
 
 ### Sample projects
 

package/dist/tutorials/Where-Your-Files-Live.md

@@ -31,8 +31,8 @@ Each project has one folder in `Projects/`, named after its title (`Lolth | D&D
 
 | Folder | What is in it | Safe to delete? |
 | --- | --- | --- |
-| `Upload/` | The current version, ready to publish: `video.mp4`, `thumbnail.png` (and `thumbnail 2.png`…), `subtitles.srt` and `.vtt`, `description.txt`, `tags.txt`, `titles.txt`, `pinned comment.txt`, `document.pdf`, `article.md`, and `Shorts/1 - <title>.mp4`… | No: it is what you upload. |
-| `Working/` | What the current version was made from: `Images/`, `Narration/` (each chunk, the joined and levelled narration), `Research/`, `Article/`, `Subtitles/`, `Render/`, `Shorts/` (each short's images). | Only to free space on a finished video: changing that project later makes these again, which takes time and provider credits. **Keep outputs only** does it for you. |
+| `Upload/` | The current version, ready to publish: `video.mp4`, `thumbnail.png` (and `thumbnail 2.png`…), `subtitles.srt` and `.vtt`, `description.txt`, `tags.txt`, `titles.txt`, `pinned comment.txt`, `document.pdf`, `article.md`, `Images/` (every image the video shows, in order; an older version's images in `Images/Earlier/<date>/`), and `Shorts/1 - <title>.mp4`… with each short's images beside it in `Shorts/1 - <title>/`. No cleanup ever deletes these images. | No: it is what you upload. |
+| `Working/` | What the current version was made from: `Narration/` (each chunk, the joined and levelled narration), `Research/`, `Article/`, `Subtitles/`, `Render/`. | Only to free space on a finished video: changing that project later makes these again, which takes time and provider credits. **Keep outputs only** does it for you. |
 | `History/<date>/` | Files of older versions, by the day they were made (an earlier render, the narration before a voice change). | Yes. Delete a day's folder, or all of `History/`, to free its space. Going back to that version in History makes its files again. |
 
 A hidden `.slopify-project` file tells Slopify which project the folder holds and where its files went. Leave it there.
@@ -132,7 +132,7 @@ Deleted projects free their space when the trash removes them after 30 days, or
 
 ### Keep outputs only
 
-On a finished project, **Keep outputs only** deletes the working files it was made from (images, narration parts, subtitle timing, render settings) and keeps the video, shorts, thumbnail, article, description, document and your uploads.
+On a finished project, **Keep outputs only** deletes the working files it was made from (narration parts, subtitle timing, render settings) and keeps the video, shorts, the images they show, thumbnail, article, description, document and your uploads.
 
 1. Find the project in the **Disk space** list. The button says how much it frees.
 2. Press **Keep outputs only**.