Refactor: remove unused Options from CandidatePatchGenerator (#1173)

emmercm · Jun 22, 2024 · 5ebee0c · 5ebee0c
1 parent 12ce729
commit 5ebee0c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/igir.ts b/src/igir.ts
@@ -351,7 +351,7 @@ export default class Igir {
     const candidates = await new CandidateGenerator(this.options, progressBar)
       .generate(dat, indexedRoms);
 
-    const patchedCandidates = await new CandidatePatchGenerator(this.options, progressBar)
+    const patchedCandidates = await new CandidatePatchGenerator(progressBar)
       .generate(dat, candidates, patches);
 
     const preferredCandidates = await new CandidatePreferer(this.options, progressBar)

diff --git a/src/modules/candidatePatchGenerator.ts b/src/modules/candidatePatchGenerator.ts
@@ -10,7 +10,6 @@ import ROM from '../types/dats/rom.js';
 import ArchiveEntry from '../types/files/archives/archiveEntry.js';
 import File from '../types/files/file.js';
 import { ChecksumBitmask } from '../types/files/fileChecksums.js';
-import Options from '../types/options.js';
 import Patch from '../types/patches/patch.js';
 import ReleaseCandidate from '../types/releaseCandidate.js';
 import ROMWithFiles from '../types/romWithFiles.js';
@@ -21,11 +20,8 @@ import Module from './module.js';
  * {@link ReleaseCandidate} of that {@link Game}.
  */
 export default class CandidatePatchGenerator extends Module {
-  private readonly options: Options;
-
-  constructor(options: Options, progressBar: ProgressBar) {
+  constructor(progressBar: ProgressBar) {
     super(progressBar, CandidatePatchGenerator.name);
-    this.options = options;
   }
 
   /**

diff --git a/src/types/options.ts b/src/types/options.ts
@@ -902,7 +902,8 @@ export default class Options implements OptionsProps {
     return (await Options.scanPaths(outputDirs, walkCallback, false))
       .map((filePath) => path.normalize(filePath))
       .filter((filePath) => !writtenFilesNormalized.has(filePath))
-      .filter((filePath) => !cleanExcludedFilesNormalized.has(filePath));
+      .filter((filePath) => !cleanExcludedFilesNormalized.has(filePath))
+      .sort();
   }
 
   getCleanDryRun(): boolean {

diff --git a/test/modules/candidatePatchGenerator.test.ts b/test/modules/candidatePatchGenerator.test.ts
@@ -38,7 +38,7 @@ async function runPatchCandidateGenerator(
 
   const patches = await new PatchScanner(options, new ProgressBarFake()).scan();
 
-  return new CandidatePatchGenerator(options, new ProgressBarFake())
+  return new CandidatePatchGenerator(new ProgressBarFake())
     .generate(dat, parentsToCandidates, patches);
 }
 

diff --git a/test/modules/candidateWriter.test.ts b/test/modules/candidateWriter.test.ts
@@ -104,7 +104,7 @@ async function candidateWriter(
     .generate(dat, indexedRomFiles);
   if (patchGlob) {
     const patches = await new PatchScanner(options, new ProgressBarFake()).scan();
-    candidates = await new CandidatePatchGenerator(options, new ProgressBarFake())
+    candidates = await new CandidatePatchGenerator(new ProgressBarFake())
       .generate(dat, candidates, patches);
   }
   candidates = await new CandidateCombiner(options, new ProgressBarFake())