upd: cache com mojang projects

This speeds up subsequent project chooser activations significantly.
bridge-core · Sep 10, 2022 · ebb1db5 · ebb1db5
1 parent dd34150
commit ebb1db5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/components/OutputFolders/ComMojang/ProjectLoader.ts b/src/components/OutputFolders/ComMojang/ProjectLoader.ts
@@ -1,7 +1,7 @@
 import { compareVersions } from 'bridge-common-utils'
 import { AnyDirectoryHandle } from '../../FileSystem/Types'
 import { App } from '/@/App'
-import { loadAsDataURL, loadHandleAsDataURL } from '/@/utils/loadAsDataUrl'
+import { loadHandleAsDataURL } from '/@/utils/loadAsDataUrl'
 
 export interface IComMojangPack {
 	type: 'behaviorPack' | 'resourcePack'
@@ -17,6 +17,8 @@ export interface IComMojangProject {
 }
 
 export class ComMojangProjectLoader {
+	protected cachedProjects: IComMojangProject[] | null = null
+
 	constructor(protected app: App) {}
 
 	get comMojang() {
@@ -26,7 +28,14 @@ export class ComMojangProjectLoader {
 		return this.app.comMojang.fileSystem
 	}
 
+	async reload() {
+		this.cachedProjects = null
+		await this.loadProjects()
+	}
+
 	async loadProjects() {
+		if (this.cachedProjects) return this.cachedProjects
+
 		if (
 			!this.comMojang.setup.hasFired ||
 			!this.comMojang.status.hasComMojang
@@ -39,7 +48,6 @@ export class ComMojangProjectLoader {
 		if (behaviorPacks.size === 0) return []
 		const resourcePacks = await this.loadPacks('development_resource_packs')
 
-		console.log(behaviorPacks)
 		const projects: IComMojangProject[] = []
 		for (const behaviorPack of behaviorPacks.values()) {
 			const dependencies = behaviorPack.manifest?.dependencies
@@ -64,6 +72,7 @@ export class ComMojangProjectLoader {
 			})
 		}
 
+		this.cachedProjects = projects
 		return projects
 	}
 

diff --git a/src/components/Projects/ProjectChooser/ProjectChooser.ts b/src/components/Projects/ProjectChooser/ProjectChooser.ts
@@ -21,14 +21,15 @@ export class ProjectChooserWindow extends NewBaseWindow {
 	protected experimentalToggles: (IExperimentalToggle & {
 		isActive: boolean
 	})[] = []
+	protected comMojangProjectLoader
 
 	protected state: IProjectChooserState = reactive<any>({
 		...super.getState(),
 		showLoadAllButton: false,
 		currentProject: undefined,
 	})
 
-	constructor() {
+	constructor(app: App) {
 		super(ProjectChooserComponent, false, true)
 
 		this.state.actions.push(
@@ -52,6 +53,7 @@ export class ProjectChooserWindow extends NewBaseWindow {
 				},
 			})
 		)
+		this.comMojangProjectLoader = markRaw(new ComMojangProjectLoader(app))
 
 		this.defineWindow()
 	}
@@ -114,9 +116,8 @@ export class ProjectChooserWindow extends NewBaseWindow {
 		)
 
 		console.time('Load com.mojang projects')
-		const comMojangProjects = await new ComMojangProjectLoader(
-			app
-		).loadProjects()
+		const comMojangProjects =
+			await this.comMojangProjectLoader.loadProjects()
 		comMojangProjects.forEach((project) =>
 			this.addProject(`comMojang/${project.name}`, project.name, {
 				name: project.name,

diff --git a/src/components/Windows/Windows.ts b/src/components/Windows/Windows.ts
@@ -13,7 +13,7 @@ import { CompilerWindow } from '../Compiler/Window/Window'
 export class Windows {
 	settings: SettingsWindow
 	socialsWindow = new SocialsWindow()
-	projectChooser = new ProjectChooserWindow()
+	projectChooser: ProjectChooserWindow
 	createProject = new CreateProjectWindow()
 	loadingWindow = new LoadingWindow()
 	createPreset = new CreatePresetWindow()
@@ -24,5 +24,6 @@ export class Windows {
 
 	constructor(protected app: App) {
 		this.settings = new SettingsWindow(app)
+		this.projectChooser = new ProjectChooserWindow(app)
 	}
 }