Skip to content

Commit

Permalink
Refactor converterService to check for missing song IDs and throw an …
Browse files Browse the repository at this point in the history
…error if found.
  • Loading branch information
ioanlucut committed Jan 13, 2024
1 parent de36b81 commit ebe79c0
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
27 changes: 27 additions & 0 deletions src/__snapshots__/proPresenter7SongConverter.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -989,6 +990,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -1769,6 +1771,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -2783,6 +2786,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -3788,6 +3792,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -4722,6 +4727,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -5678,6 +5684,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -6644,6 +6651,7 @@ exports[`proPresenter7SongConverter Advanced song (w/ subsection) should convert
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -8257,6 +8265,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -9021,6 +9030,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -9801,6 +9811,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -10706,6 +10717,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -11611,6 +11623,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -12396,6 +12409,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -13182,6 +13196,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -13967,6 +13982,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -14753,6 +14769,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -15538,6 +15555,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -16323,6 +16341,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -17109,6 +17128,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -17895,6 +17915,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -18681,6 +18702,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -19467,6 +19489,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -20253,6 +20276,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -21039,6 +21063,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -21825,6 +21850,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down Expand Up @@ -22611,6 +22637,7 @@ exports[`proPresenter7SongConverter Basic song (no subsection) should convert to
"audioInput": undefined,
"background": undefined,
"blendMode": undefined,
"capture": undefined,
"clear": undefined,
"clearGroup": undefined,
"collectionElement": undefined,
Expand Down
11 changes: 10 additions & 1 deletion src/converterService.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs';
import path from 'path';
import { isEqual } from 'lodash';
import { isEmpty, isEqual } from 'lodash';
import recursive from 'recursive-readdir';
import { Presentation } from '../proto/presentation';
import {
Expand Down Expand Up @@ -143,6 +143,15 @@ export const getBasicDeploymentInfo = async (
// Current deployment
const deployableSongs = await getDeployableSongs(sourceDir);

const problematicSongs = deployableSongs.filter(({ song }) => !song.id);
if (!isEmpty(problematicSongs)) {
throw new Error(
`The following songs are missing an ID: ${JSON.stringify(
problematicSongs.map(({ fileName }) => fileName),
)}`,
);
}

const currentManifest = {
inventory: await generateManifest(deployableSongs),
updatedOn: versionedDir,
Expand Down

0 comments on commit ebe79c0

Please sign in to comment.