Fix: info command not parsing metadata on Windows (#28)

emmercm · Jul 23, 2024 · e767eed · e767eed
1 parent f3fd13d
commit e767eed
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/src/chdman/chdmanInfo.ts b/src/chdman/chdmanInfo.ts
@@ -56,7 +56,7 @@ export default {
       }
     }
 
-    const metadata = [...output.matchAll(/metadata: +(.+)\n +(.+)/gi)]
+    const metadata = [...output.matchAll(/metadata: +(.+)\r?\n +(.+)/gi)]
       .map((match, index_) => {
         const tag = match[1].match(/tag='([\d a-z]+)'/i)?.at(1)?.trim() ?? '';
         const index = Number.parseInt(
@@ -76,7 +76,7 @@ export default {
       });
 
     const metadataTags = new Set(metadata.map((m) => m.tag));
-    let type = CHDType.UNKNOWN;
+    let type = CHDType.RAW;
     if (metadataTags.has('GDDD')) {
       type = CHDType.HARD_DISK;
     } else if (metadataTags.has('CHCD') || metadataTags.has('CHTR') || metadataTags.has('CHT2')) {

diff --git a/src/chdman/common.ts b/src/chdman/common.ts
@@ -19,5 +19,4 @@ export enum CHDType {
   GD_ROM,
   DVD_ROM,
   // LASER_DISC,
-  UNKNOWN,
 }
diff --git a/test/chdman/chdmanBin.test.ts b/test/chdman/chdmanBin.test.ts
@@ -1,6 +1,6 @@
 import ChdmanBin from '../../src/chdman/chdmanBin.js';
 
-test('should print the help message', async () => {
+it('should print the help message', async () => {
   try {
     await ChdmanBin.run(['help']);
   } catch (error) {

diff --git a/test/chdman/chdmanCd.test.ts b/test/chdman/chdmanCd.test.ts
@@ -5,8 +5,9 @@ import fs from 'node:fs';
 import ChdmanCd from '../../src/chdman/chdmanCd.js';
 import ChdmanInfo from '../../src/chdman/chdmanInfo.js';
 import TestUtil from '../testUtil.js';
+import { CHDType } from '../../src/chdman/common.js';
 
-test('should fail on nonexistent file', async () => {
+it('should fail on nonexistent file', async () => {
   const temporaryChd = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.chd`;
   const temporaryCue = `${temporaryChd}.cue`;
   const temporaryBin = `${temporaryChd}.bin`;
@@ -60,6 +61,7 @@ test.each([
     expect(info.ratio).toBeGreaterThan(0);
     expect(info.sha1).toBeTruthy();
     expect(info.dataSha1).toBeTruthy();
+    expect(info.type).toEqual(CHDType.CD_ROM);
 
     await ChdmanCd.extractCd({
       inputFilename: temporaryChd,

diff --git a/test/chdman/chdmanDvd.test.ts b/test/chdman/chdmanDvd.test.ts
@@ -6,10 +6,11 @@ import crypto from 'node:crypto';
 import ChdmanInfo from '../../src/chdman/chdmanInfo.js';
 import TestUtil from '../testUtil.js';
 import ChdmanDvd from '../../src/chdman/chdmanDvd.js';
+import { CHDType } from '../../src/chdman/common.js';
 
 // https://unix.stackexchange.com/a/33634
 
-test('should fail on nonexistent file', async () => {
+it('should fail on nonexistent file', async () => {
   const temporaryChd = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.chd`;
   const temporaryIso = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.iso`;
 
@@ -58,6 +59,7 @@ test.each([
     expect(info.ratio).toBeGreaterThan(0);
     expect(info.sha1).toBeTruthy();
     expect(info.dataSha1).toBeTruthy();
+    expect(info.type).toEqual(CHDType.DVD_ROM);
 
     await ChdmanDvd.extractDvd({
       inputFilename: temporaryChd,

diff --git a/test/chdman/chdmanHd.test.ts b/test/chdman/chdmanHd.test.ts
@@ -5,10 +5,11 @@ import fs from 'node:fs';
 import ChdmanHd from '../../src/chdman/chdmanHd.js';
 import ChdmanInfo from '../../src/chdman/chdmanInfo.js';
 import TestUtil from '../testUtil.js';
+import { CHDType } from '../../src/chdman/common.js';
 
 // https://unix.stackexchange.com/a/33634
 
-test('should fail on nonexistent file', async () => {
+it('should fail on nonexistent file', async () => {
   const temporaryChd = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.chd`;
   const temporaryHd = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.hd`;
 
@@ -60,6 +61,7 @@ test.each([
     expect(info.ratio).toBeGreaterThan(0);
     expect(info.sha1).toBeTruthy();
     expect(info.dataSha1).toBeTruthy();
+    expect(info.type).toEqual(CHDType.HARD_DISK);
 
     await ChdmanHd.extractHd({
       inputFilename: temporaryChd,

diff --git a/test/chdman/chdmanRaw.test.ts b/test/chdman/chdmanRaw.test.ts
@@ -5,8 +5,9 @@ import fs from 'node:fs';
 import ChdmanInfo from '../../src/chdman/chdmanInfo.js';
 import TestUtil from '../testUtil.js';
 import ChdmanRaw from '../../src/chdman/chdmanRaw.js';
+import { CHDType } from '../../src/chdman/common.js';
 
-test('should fail on nonexistent file', async () => {
+it('should fail on nonexistent file', async () => {
   const temporaryChd = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.chd`;
   const temporaryRaw = `${await TestUtil.mktemp(path.join(os.tmpdir(), 'dummy'))}.hd`;
 
@@ -61,6 +62,7 @@ test.each([
     expect(info.ratio).toBeGreaterThan(0);
     expect(info.sha1).toBeTruthy();
     expect(info.dataSha1).toBeTruthy();
+    expect(info.type).toEqual(CHDType.RAW);
 
     await ChdmanRaw.extractRaw({
       inputFilename: temporaryChd,