Fix: clearer conflicting input files log message (#886)

emmercm · Jan 19, 2024 · a45ac47 · a45ac47
1 parent bb378d3
commit a45ac47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/modules/candidateGenerator.ts b/src/modules/candidateGenerator.ts
@@ -345,7 +345,7 @@ export default class CandidateGenerator extends Module {
         .reduce(ArrayPoly.reduceUnique(), []);
       if (conflictedInputFiles.length > 1) {
         hasConflict = true;
-        let message = `Cannot ${this.options.writeString()} different files to: ${duplicateOutput}:`;
+        let message = `No single archive contains all necessary files, cannot ${this.options.writeString()} these different input files to: ${duplicateOutput}:`;
         conflictedInputFiles.forEach((conflictedInputFile) => { message += `\n  ${conflictedInputFile}`; });
         this.progressBar.logWarn(message);
       }

diff --git a/test/modules/candidateGenerator.test.ts b/test/modules/candidateGenerator.test.ts
@@ -354,8 +354,8 @@ describe('with different input files for every game ROM', () => {
   const filePromises = [
     File.fileOf('one.rom', 1, { crc32: '12345678' }),
     ArchiveEntry.entryOf(new Tar('1.tar'), '1.rom', 1, { crc32: '12345678' }), // duplicate
-    ArchiveEntry.entryOf(new Rar('a.7z'), 'a.rom', 2, { crc32: 'abcdef90' }),
-    ArchiveEntry.entryOf(new Rar('b.7z'), 'b.rom', 3, { crc32: '09876543' }),
+    ArchiveEntry.entryOf(new Rar('a.rar'), 'a.rom', 2, { crc32: 'abcdef90' }),
+    ArchiveEntry.entryOf(new Rar('b.rar'), 'b.rom', 3, { crc32: '09876543' }),
   ];
 
   test.each(['zip', 'extract'])('should generate candidates when all ROMs for a game are in different files: %s', async (command) => {
@@ -368,7 +368,7 @@ describe('with different input files for every game ROM', () => {
     // Then there should still be 3 parents, with the input -> output:
     //  (nothing) -> game with no ROMs
     //  one.rom -> game with one ROM
-    //  a.7z|a.rom & b.7z|b.rom -> game with two ROMs (either in a folder or a zip, together)
+    //  a.rar|a.rom & b.rar|b.rom -> game with two ROMs (either in a folder or a zip, together)
     expect(parentsToCandidates.size).toEqual(3);
     const candidates = [...parentsToCandidates.values()];
 
@@ -398,7 +398,7 @@ describe('with different input files for every game ROM', () => {
     // Then there should still be 3 parents, with the input -> output:
     //  (nothing) -> game with no ROMs
     //  one.rom -> one.rom
-    //  a.7z|a.rom & b.7z|b.rom -> game with two ROMs.7z -- CONFLICT!
+    //  a.rar|a.rom & b.rar|b.rom -> game with two ROMs.rar -- CONFLICT!
     // Because we're not extracting or zipping, two different input 7z files wanted to write to the
     //  same output file, which is a problem, so the parent resulted in no candidates
     expect(parentsToCandidates.size).toEqual(3);