fix: add checks for FFPrope executable

nrkno · Oct 19, 2023 · f1084e8 · f1084e8
1 parent 9688588
commit f1084e8
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 2 deletions.
diff --git a/.../packages/worker/src/worker/workers/windowsWorker/expectationHandlers/mediaFilePreview.ts b/.../packages/worker/src/worker/workers/windowsWorker/expectationHandlers/mediaFilePreview.ts
@@ -49,6 +49,14 @@ export const MediaFilePreview: ExpectationWindowsHandler = {
 					tech: `Cannot access FFMpeg executable: ${windowsWorker.testFFMpeg}`,
 				},
 			}
+		if (windowsWorker.testFFProbe)
+			return {
+				support: false,
+				reason: {
+					user: 'There is an issue with the Worker (FFProbe)',
+					tech: `Cannot access FFProbe executable: ${windowsWorker.testFFProbe}`,
+				},
+			}
 		return checkWorkerHasAccessToPackageContainersOnPackage(genericWorker, {
 			sources: exp.startRequirement.sources,
 			targets: exp.endRequirement.targets,

diff --git a/...ackages/worker/src/worker/workers/windowsWorker/expectationHandlers/mediaFileThumbnail.ts b/...ackages/worker/src/worker/workers/windowsWorker/expectationHandlers/mediaFileThumbnail.ts
@@ -50,6 +50,14 @@ export const MediaFileThumbnail: ExpectationWindowsHandler = {
 					tech: `Cannot access FFMpeg executable: ${windowsWorker.testFFMpeg}`,
 				},
 			}
+		if (windowsWorker.testFFProbe)
+			return {
+				support: false,
+				reason: {
+					user: 'There is an issue with the Worker (FFProbe)',
+					tech: `Cannot access FFProbe executable: ${windowsWorker.testFFProbe}`,
+				},
+			}
 		return checkWorkerHasAccessToPackageContainersOnPackage(genericWorker, {
 			sources: exp.startRequirement.sources,
 		})

diff --git a/...d/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/packageDeepScan.ts b/...d/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/packageDeepScan.ts
@@ -46,6 +46,14 @@ export const PackageDeepScan: ExpectationWindowsHandler = {
 					tech: `Cannot access FFMpeg executable: ${windowsWorker.testFFMpeg}`,
 				},
 			}
+		if (windowsWorker.testFFProbe)
+			return {
+				support: false,
+				reason: {
+					user: 'There is an issue with the Worker (FFProbe)',
+					tech: `Cannot access FFProbe executable: ${windowsWorker.testFFProbe}`,
+				},
+			}
 		return checkWorkerHasAccessToPackageContainersOnPackage(genericWorker, {
 			sources: exp.startRequirement.sources,
 		})

diff --git a/...ckages/worker/src/worker/workers/windowsWorker/expectationHandlers/packageLoudnessScan.ts b/...ckages/worker/src/worker/workers/windowsWorker/expectationHandlers/packageLoudnessScan.ts
@@ -45,6 +45,14 @@ export const PackageLoudnessScan: ExpectationWindowsHandler = {
 					tech: `Cannot access FFMpeg executable: ${windowsWorker.testFFMpeg}`,
 				},
 			}
+		if (windowsWorker.testFFProbe)
+			return {
+				support: false,
+				reason: {
+					user: 'There is an issue with the Worker (FFProbe)',
+					tech: `Cannot access FFProbe executable: ${windowsWorker.testFFProbe}`,
+				},
+			}
 		return checkWorkerHasAccessToPackageContainersOnPackage(genericWorker, {
 			sources: exp.startRequirement.sources,
 		})

diff --git a/shared/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/packageScan.ts b/shared/packages/worker/src/worker/workers/windowsWorker/expectationHandlers/packageScan.ts
@@ -38,6 +38,14 @@ export const PackageScan: ExpectationWindowsHandler = {
 					tech: `Cannot access FFMpeg executable: ${windowsWorker.testFFMpeg}`,
 				},
 			}
+		if (windowsWorker.testFFProbe)
+			return {
+				support: false,
+				reason: {
+					user: 'There is an issue with the Worker (FFProbe)',
+					tech: `Cannot access FFProbe executable: ${windowsWorker.testFFProbe}`,
+				},
+			}
 		return checkWorkerHasAccessToPackageContainersOnPackage(genericWorker, {
 			sources: exp.startRequirement.sources,
 		})

diff --git a/shared/packages/worker/src/worker/workers/windowsWorker/windowsWorker.ts b/shared/packages/worker/src/worker/workers/windowsWorker/windowsWorker.ts
@@ -36,9 +36,9 @@ import { FileVerify } from './expectationHandlers/fileVerify'
 export class WindowsWorker extends GenericWorker {
 	static readonly type = 'windowsWorker'
 
-	/** null = all is well */
+	/** Contains the result of testing the FFMpeg executable. null = all is well, otherwise contains error message */
 	public testFFMpeg: null | string = 'Not initialized'
-	/** null = all is well */
+	/** Contains the result of testing the FFProbe executable. null = all is well, otherwise contains error message */
 	public testFFProbe: null | string = 'Not initialized'
 
 	private monitor: NodeJS.Timer | undefined