Refactor logging, loop metadata, and conversion flow

Author: SpaceFoon

README.md

@@ -16,29 +16,15 @@
 </p>
 
 <!-- Pre-Headline -->
-<p style="font-size: 16px; color: yellow; text-align: center;">Boost your productivity and streamline your workflow today!</p>
+<p style="font-size: 16px; color: yellow; text-align: center;">Easiest, fastest and most reliable way to convert audio files available</p>
 
-## Why I built Ez Game Audio Converter
 
-I started this project after wasting many hours finding, organizing and converting assets for my game project. When you are using mostly free assets from different sources with different formats, bitrates and naming conventions, it can be a real time sink. If you spend all day learning how audio files work, you just spent all day not working on your project. You shouldn't have to be a audio engineer or terminal wizard just to have audio files in the right format/codec/bitrate.
-
-The Problem: Game devs and anyone else who needs to convert audio files for whatever reason, need to know a lot about digital audio before they can even get started. This is a huge barrier to entry for new game devs and a time sink for experienced ones.
-
-The Solution: A simple, easy to use tool that does all the heavy lifting for you. You don't need to know anything about audio files to use this tool. Just point it at your files and let it do the work. It will automatically select the best codec and bitrate for you. It will even handle loop tags for you. It's the easiest, fastest and most reliable solution available. And it's FREE!
-
-Please leave feedback on Itch.io or Github.
 
 <!--
 ## Introduction
 
 EZ-Game-Audio-Converter streamlines the process of batch audio conversion. Tailored specifically for game developers, this tool ensures great audio quality and small file sizes without the need for extensive knowledge. With almost no setup and multi-threaded conversion, it's the easiest, fastest and most reliable solution available. Plus, now with support for loop tags! -->
 
-<!-- ## Not just for game devs anymore.
-
-  Now with FULL support for Apple iTunes metadata even when converting to and from non-M4A formats. This means you can convert your iTunes library to OGG or FLAC and keep all your metadata. This includes loop tags. Not many tools that do it all, also do this.
-
-  A big feature request has been to add CD ripping support. That this feature is now available! You can now rip your CDs to any format you like. Just select the CD drive as your source and the destination folder as your output. You can even rip multiple CDs at once. This feature is still in beta so please report any issues you find. -->
-
 ## Features
 
 - 💻 **User-Friendly Interface:** Designed with simplicity as the main goal, eliminating any learning curve.
@@ -51,7 +37,7 @@ EZ-Game-Audio-Converter streamlines the process of batch audio conversion. Tailo
 - 🤖 **Intelligent File Handling:** Automatically resolves duplicate file names with different file extensions. Selects the best input file format.
 - 📝 **Meta Data Support:** All meta data, including iTunes data and Apple music will be transferred to the new file. Will transfer all basic meta data to and from all formats that support it.
 - 🔁 **Loop Tag Support:** All loop meta data will be transferred to new OGG or FLAC files. When changing sample rate, loop timings will be adjusted automatically. Cannot write loop tags TO M4A, only FROM.
-- 🎼 **Opus AND Vorbis Support for Ogg:** Use Opus when you can and Vorbis when you have to.
+- 🎼 **Opus AND Vorbis Support for Ogg:** Use Opus when you can and Vorbis for compatibility.
 
 ## Installation
 

src/__tests__/convertFiles.test.ts

@@ -253,9 +253,7 @@ describe('convertFiles', () => {
     console.log("Test 'should handle worker errors' completed");
 
     expect(console.error).toHaveBeenCalledWith(
-      expect.stringContaining('Worker had an error'),
-      expect.any(String),
-      expect.any(String)
+      expect.stringContaining('Worker had an error')
     );
   }, 30000);
 
@@ -405,8 +403,7 @@ describe('convertFiles', () => {
     );
 
     expect(console.error).toHaveBeenCalledWith(
-      expect.stringContaining('Error creating worker'),
-      expect.any(Object)
+      expect.stringContaining('Error creating worker')
     );
   }, 30000);
 

src/__tests__/converterWorker.test.js

@@ -99,7 +99,7 @@ describe('converterWorker.js', () => {
       loopStart: null,
       loopLength: null,
     });
-    metadataService.formatLoopData.mockReturnValue('');
+    metadataService.formatLoopData.mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -321,9 +321,16 @@ describe('converterWorker.js', () => {
       loopStart: 123,
       loopLength: 456,
     });
-    metadataService.formatLoopData.mockReturnValue(
-      ' -metadata LOOPSTART=123 -metadata loopstart=123 -metadata LOOPLENGTH=456 -metadata looplength=456'
-    );
+    metadataService.formatLoopData.mockReturnValue([
+      '-metadata',
+      'LOOPSTART=123',
+      '-metadata',
+      'loopstart=123',
+      '-metadata',
+      'LOOPLENGTH=456',
+      '-metadata',
+      'looplength=456',
+    ]);
 
     await converterWorker({
       file: {

src/__tests__/converterWorker.test.ts

@@ -142,7 +142,7 @@ describe('converterWorker.js', () => {
       loopStart: NaN,
       loopLength: NaN,
     });
-    formatLoopDataMock.mockReturnValue('');
+    formatLoopDataMock.mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -288,6 +288,25 @@ describe('converterWorker.js', () => {
     });
   }, 10000);
 
+  it('does not re-apply metadata args when preserving metadata for AIFF', async () => {
+    fs.existsSync.mockReturnValue(true);
+
+    await converterWorker({
+      file: {
+        inputFile: 'in.mp3',
+        outputFile: 'out.aiff',
+        outputFormat: 'aiff',
+      },
+      settings: { oggCodec: 'vorbis' },
+    });
+
+    const args = spawnMock.mock.calls[0]?.[1] as string[];
+
+    expect(args).toContain('-write_id3v2');
+    expect(args).toContain('1');
+    expect(args).not.toContain('title=Test');
+  }, 10000);
+
   it('handles directory creation error gracefully', async () => {
     process.env.NODE_ENV = 'test';
 
@@ -485,16 +504,17 @@ describe('converterWorker.js', () => {
     consoleLogSpy.mockRestore();
   }, 10000);
 
-  it('blocks outputs marked as "Skipped!"', async () => {
+  it('blocks output files with embedded quotes', async () => {
     fs.existsSync.mockReturnValue(true);
     // Mutate live workerData binding
     workerThreads.workerData.file = {
       inputFile: 'in.wav',
-      outputFile: 'out Skipped!.mp3',
+      outputFile: 'out "Skipped!".mp3',
       outputFormat: 'mp3',
     };
+    workerThreads.workerData.settings = { oggCodec: 'vorbis' };
 
-    await expect(runConversion()).rejects.toThrow(/Skipped!/);
+    await expect(runConversion()).rejects.toThrow(/quotes/i);
   }, 10000);
 
   describe('self-overwrite defense in depth', () => {

src/__tests__/getUserInput.test.ts

@@ -1,4 +1,5 @@
 import { jest, describe, it, expect, beforeEach } from '@jest/globals';
+import { resolve } from 'path';
 
 // ESM mocks must be declared BEFORE dynamic imports
 jest.unstable_mockModule('fs', () => ({
@@ -52,8 +53,8 @@ describe('getUserInput', () => {
 
     const result = await getUserInput(settings);
 
-    expect(result.inputFilePath).toBe('/input/path');
-    expect(result.outputFilePath).toBe('/output/path');
+    expect(result.inputFilePath).toBe(resolve('/input/path'));
+    expect(result.outputFilePath).toBe(resolve('/output/path'));
     expect(result.inputFormats).toEqual(['mp3', 'wav']);
     expect(result.outputFormats).toEqual(['ogg']);
   });

src/__tests__/metadataFormatting.integration.test.ts

@@ -166,8 +166,8 @@ describe('formatMetaDataArgs - Real Output Tests', () => {
 
       const result = formatMetaDataArgs(metadata);
 
-      // Backslashes should be escaped
-      expect(result.metaDataArgs).toContain('title=Path\\\\To\\\\File');
+      // With spawn args array (shell: false), backslashes are preserved as-is
+      expect(result.metaDataArgs).toContain('title=Path\\To\\File');
     });
 
     it('should escape double quotes', () => {
@@ -195,7 +195,8 @@ describe('formatMetaDataArgs - Real Output Tests', () => {
 
       const result = formatMetaDataArgs(metadata);
 
-      expect(result.metaDataArgs).toContain('title=Song \\"With\\" Quotes');
+      // With spawn args array (shell: false), quotes are preserved as-is
+      expect(result.metaDataArgs).toContain('title=Song "With" Quotes');
     });
 
     it('should convert Windows newlines to escaped \\n', () => {
@@ -223,7 +224,8 @@ describe('formatMetaDataArgs - Real Output Tests', () => {
 
       const result = formatMetaDataArgs(metadata);
 
-      expect(result.metaDataArgs).toContain('comment=Line 1\\nLine 2\\nLine 3');
+      // With spawn args array (shell: false), newlines are normalized to \n and preserved
+      expect(result.metaDataArgs).toContain('comment=Line 1\nLine 2\nLine 3');
     });
 
     it('should convert Unix newlines to escaped \\n', () => {
@@ -251,9 +253,8 @@ describe('formatMetaDataArgs - Real Output Tests', () => {
 
       const result = formatMetaDataArgs(metadata);
 
-      expect(result.metaDataArgs).toContain(
-        'lyrics=Verse 1\\nChorus\\nVerse 2'
-      );
+      // With spawn args array (shell: false), newlines are preserved as-is
+      expect(result.metaDataArgs).toContain('lyrics=Verse 1\nChorus\nVerse 2');
     });
 
     it('should convert old Mac newlines (CR only) to escaped \\n', () => {
@@ -281,7 +282,8 @@ describe('formatMetaDataArgs - Real Output Tests', () => {
 
       const result = formatMetaDataArgs(metadata);
 
-      expect(result.metaDataArgs).toContain('comment=Old\\nMac\\nStyle');
+      // With spawn args array (shell: false), CR is normalized to LF
+      expect(result.metaDataArgs).toContain('comment=Old\nMac\nStyle');
     });
 
     it('should remove null bytes', () => {
@@ -337,9 +339,9 @@ describe('formatMetaDataArgs - Real Output Tests', () => {
 
       const result = formatMetaDataArgs(metadata);
 
-      // Should escape backslashes, quotes, and newlines
+      // With spawn args array (shell: false), chars are preserved; newlines normalized
       expect(result.metaDataArgs).toContain(
-        'comment=Path: C:\\\\Music\\\\\\"Best\\" Songs\\nLine 2'
+        'comment=Path: C:\\Music\\"Best" Songs\nLine 2'
       );
     });
   });
@@ -1021,53 +1023,103 @@ describe('convertLoopPoints - Real Output Tests', () => {
 });
 
 describe('formatLoopData - Real Output Tests', () => {
-  it('should format loop data for ffmpeg', () => {
+  it('should format loop data for ffmpeg as args array', () => {
     const result = formatLoopData(12345, 67890);
 
-    expect(result).toContain('-metadata LOOPSTART=12345');
-    expect(result).toContain('-metadata LOOPLENGTH=67890');
-    expect(result).toContain('-metadata loopstart=12345');
-    expect(result).toContain('-metadata looplength=67890');
+    expect(result).toEqual([
+      '-metadata',
+      'LOOPSTART=12345',
+      '-metadata',
+      'LOOPLENGTH=67890',
+      '-metadata',
+      'loopstart=12345',
+      '-metadata',
+      'looplength=67890',
+    ]);
   });
 
-  it('should return empty string for NaN loop start', () => {
+  it('should return empty array for NaN loop start', () => {
     const result = formatLoopData(NaN, 67890);
 
-    expect(result).toBe('');
+    expect(result).toEqual([]);
   });
 
-  it('should return empty string for NaN loop length', () => {
+  it('should return empty array for NaN loop length', () => {
     const result = formatLoopData(12345, NaN);
 
-    expect(result).toBe('');
+    expect(result).toEqual([]);
   });
 
-  it('should return empty string for both NaN', () => {
+  it('should return empty array for both NaN', () => {
     const result = formatLoopData(NaN, NaN);
 
-    expect(result).toBe('');
+    expect(result).toEqual([]);
   });
 
   it('should handle zero values (valid loop points)', () => {
     const result = formatLoopData(0, 100000);
 
-    expect(result).toContain('-metadata LOOPSTART=0');
-    expect(result).toContain('-metadata LOOPLENGTH=100000');
+    expect(result).toEqual([
+      '-metadata',
+      'LOOPSTART=0',
+      '-metadata',
+      'LOOPLENGTH=100000',
+      '-metadata',
+      'loopstart=0',
+      '-metadata',
+      'looplength=100000',
+    ]);
   });
 
-  it('should produce valid ffmpeg argument string', () => {
+  it('should produce valid ffmpeg argument array', () => {
     const result = formatLoopData(48000, 96000);
 
-    // Should be usable directly in ffmpeg command
-    // Format: " -metadata LOOPSTART=X -metadata LOOPLENGTH=Y -metadata loopstart=X -metadata looplength=Y"
-    expect(result).toMatch(
-      /^\s*-metadata LOOPSTART=\d+ -metadata LOOPLENGTH=\d+ -metadata loopstart=\d+ -metadata looplength=\d+$/
+    // Should be usable directly spread into ffmpeg args
+    expect(result).toEqual(
+      expect.arrayContaining(['-metadata', 'LOOPSTART=48000'])
     );
+    expect(result).toEqual(
+      expect.arrayContaining(['-metadata', 'LOOPLENGTH=96000'])
+    );
+    expect(result.length).toBe(8);
   });
 });
 
 // Additional preservation-focused scenarios requested post-review
 describe('formatMetaDataArgs - Preservation scenarios', () => {
+  it('should prefer non-replacement-character performer value when duplicates conflict', () => {
+    const metadata: AudioMetadata = {
+      streams: [
+        {
+          index: 0,
+          codec_name: 'aiff',
+          codec_type: 'audio',
+          channels: 2,
+          sample_rate: '44100',
+          tags: {
+            Performer: '�B',
+          },
+        },
+      ],
+      format: {
+        filename: 'performer.aiff',
+        format_name: 'aiff',
+        duration: '180',
+        size: '1234',
+        bit_rate: '256000',
+        tags: {
+          PERFORMER: 'µB',
+        },
+      },
+    };
+
+    const { metaDataArgs } = formatMetaDataArgs(metadata);
+    const joined = metaDataArgs.join(' ');
+
+    expect(joined).toContain('performer=µB');
+    expect(joined).not.toContain('performer=�B');
+  });
+
   it('should round-trip extra/unknown tags unchanged', () => {
     const metadata: AudioMetadata = {
       streams: [