Simplified archive opening process

src/projector.ts

@@ -1,13 +1,8 @@
 import {type TranscodeEncoding} from 'node:buffer';
-import {mkdir, readFile, stat, writeFile} from 'node:fs/promises';
+import {mkdir, readFile, writeFile} from 'node:fs/promises';
 import {join as pathJoin, dirname} from 'node:path';
 
-import {
-	ArchiveDir,
-	ArchiveHdi,
-	createArchiveByFileExtension,
-	fsLstatExists
-} from '@shockpkg/archive-files';
+import {fsLstatExists} from '@shockpkg/archive-files';
 
 import {pathRelativeBase, trimExtension} from './util';
 
@@ -95,6 +90,11 @@ export abstract class Projector {
 	 */
 	public nestXtrasConfiguration: boolean = false;
 
+	/**
+	 * Set the nobrowse option on mounted disk images.
+	 */
+	public nobrowse = false;
+
 	/**
 	 * Output path.
 	 */
@@ -446,27 +446,6 @@ export abstract class Projector {
 	 */
 	public abstract get lingoNewline(): string;
 
-	/**
-	 * Open path as archive.
-	 *
-	 * @param path Archive path.
-	 * @returns Archive instance.
-	 */
-	protected async _openArchive(path: string) {
-		const st = await stat(path);
-		if (st.isDirectory()) {
-			return new ArchiveDir(path);
-		}
-		const archive = createArchiveByFileExtension(path);
-		if (!archive) {
-			throw new Error(`Unrecognized archive format: ${path}`);
-		}
-		if (archive instanceof ArchiveHdi) {
-			archive.nobrowse = true;
-		}
-		return archive;
-	}
-
 	/**
 	 * Write the projector skeleton from archive.
 	 *

src/projector/mac/app.ts

@@ -1,7 +1,11 @@
 import {readFile, mkdir, rm, writeFile} from 'node:fs/promises';
 import {join as pathJoin, basename, dirname} from 'node:path';
 
-import {PathType, Entry} from '@shockpkg/archive-files';
+import {
+	PathType,
+	Entry,
+	createArchiveByFileStatOrThrow
+} from '@shockpkg/archive-files';
 import {Plist} from '@shockpkg/plist-dom';
 
 import {
@@ -629,7 +633,9 @@ export class ProjectorMacApp extends ProjectorMac {
 			return true;
 		};
 
-		const archive = await this._openArchive(skeleton);
+		const archive = await createArchiveByFileStatOrThrow(skeleton, {
+			nobrowse: this.nobrowse
+		});
 		await archive.read(async entry => {
 			if (entry.type === PathType.RESOURCE_FORK) {
 				return true;

src/projector/windows.ts

@@ -1,7 +1,12 @@
 import {readFile} from 'node:fs/promises';
 import {join as pathJoin, dirname, basename} from 'node:path';
 
-import {Entry, PathType, fsWalk} from '@shockpkg/archive-files';
+import {
+	Entry,
+	PathType,
+	createArchiveByFileStatOrThrow,
+	fsWalk
+} from '@shockpkg/archive-files';
 
 import {pathRelativeBase, pathRelativeBaseMatch} from '../util';
 import {
@@ -197,7 +202,9 @@ export class ProjectorWindows extends Projector {
 			return true;
 		};
 
-		const archive = await this._openArchive(skeleton);
+		const archive = await createArchiveByFileStatOrThrow(skeleton, {
+			nobrowse: this.nobrowse
+		});
 		await archive.read(async entry => {
 			if (entry.type === PathType.RESOURCE_FORK) {
 				return true;