fix: some broken cases

nrkno · Jun 20, 2019 · 9ebde2e · 9ebde2e
1 parent 957ed76
commit 9ebde2e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/src/commands/Macro/MacroPropertiesCommand.ts b/src/commands/Macro/MacroPropertiesCommand.ts
@@ -11,8 +11,8 @@ export class MacroPropertiesCommand extends AbstractCommand {
 
 	deserialize (rawCommand: Buffer) {
 		this.macroIndexID = rawCommand.readUInt16BE(0)
-		const descLen = rawCommand.readUInt16BE(4)
-		const nameLen = rawCommand.readUInt16BE(6)
+		const nameLen = rawCommand.readUInt16BE(4)
+		const descLen = rawCommand.readUInt16BE(6)
 
 		this.properties = {
 			description: '',

diff --git a/src/commands/Media/MediaPoolFrameDescription.ts b/src/commands/Media/MediaPoolFrameDescription.ts
@@ -15,7 +15,7 @@ export class MediaPoolFrameDescriptionCommand extends AbstractCommand {
 		this.frameIndex = rawCommand.readUInt16BE(2)
 		this.properties = {
 			isUsed: rawCommand[4] === 1,
-			hash: Util.bufToNullTerminatedString(rawCommand, 5, 16),
+			hash: Util.bufToBase64String(rawCommand, 5, 16),
 			fileName: Util.bufToNullTerminatedString(rawCommand, 24, rawCommand[23])
 		}
 	}

diff --git a/src/commands/__tests__/index.spec.ts b/src/commands/__tests__/index.spec.ts
@@ -94,6 +94,14 @@ const commandConverters: CommandTestConverterSet = {
 			'gain': (v: number) => ({ val: Math.round(v * 100) / 100 })
 		}
 	},
+	'AMMO': {
+		idAliases: {},
+		propertyAliases: {
+			'programOutFollowFadeToBlack': (val: any) => ({ val, name: 'followFadeToBlack' }),
+			'balance': (v: number) => ({ val: Math.round(v * 10) / 10 }),
+			'gain': (v: number) => ({ val: Math.round(v * 100) / 100 })
+		}
+	},
 	'_top': {
 		idAliases: {},
 		propertyAliases: {
@@ -258,6 +266,14 @@ const commandConverters: CommandTestConverterSet = {
 			'borderWidth': (v: number) => ({ val: Math.round(v * 100) })
 		}
 	},
+	'TrPs': {
+		idAliases: {
+			'mixEffect': 'index'
+		},
+		propertyAliases: {
+			'handlePosition': (v: number) => ({ val: Math.round(v * 10000) })
+		}
+	},
 	'MRPr': {
 		idAliases: {},
 		propertyAliases: {
@@ -288,6 +304,32 @@ const commandConverters: CommandTestConverterSet = {
 		},
 		propertyAliases: {}
 	},
+	'MPCS': {
+		idAliases: {
+			'mediaPool': 'index'
+		},
+		propertyAliases: {},
+		customMutate: (obj: any) => {
+			obj.frames = []
+			return obj
+		}
+	},
+	'MPfe': {
+		idAliases: {
+			'mediaPool': 'bank',
+			'frameIndex': 'index'
+		},
+		propertyAliases: {
+			'filename': (val: any) => ({ val, name: 'fileName' }),
+			// 'hash': (v: string) => ({ val: Buffer.from(v, 'base64').toString('ascii') })
+		}
+	},
+	'MPrp': {
+		idAliases: {},
+		propertyAliases: {
+			'index': (val: any) => ({ val, name: 'macroIndex' })
+		}
+	},
 	'PrgI': {
 		idAliases: {
 			'mixEffect': 'index'
@@ -347,12 +389,7 @@ describe('Commands v7.2', () => {
 				// Temporarily ignore the failures
 				case 'AMIP':
 				case '_top':
-
-				//
 				case 'AMMO':
-				case 'MPrp':
-				case 'MPfe':
-				case 'MPCS':
 				case 'KKFP':
 				case 'TrPs':
 					return

diff --git a/src/lib/atemUtil.ts b/src/lib/atemUtil.ts
@@ -13,6 +13,10 @@ export namespace Util {
 		return array
 	}
 
+	export function bufToBase64String (buffer: Buffer, start: number, length: number): string {
+		return buffer.toString('base64', start, start + length)
+	}
+
 	export function bufToNullTerminatedString (buffer: Buffer, start: number, length: number): string {
 		const slice = buffer.slice(start, start + length)
 		const nullIndex = slice.indexOf('\0')