fix: better handling of larger instances for ExportModal (#6559)

apps/app-frontend/src/components/ui/ExportModal.vue

@@ -57,7 +57,7 @@ defineExpose({
 	show: () => {
 		resetExportState()
 		exportModal.value.show()
-		initFiles()
+		void initFiles().catch(handleError)
 	},
 })
 
@@ -69,34 +69,29 @@ const files = ref([])
 const selectedFilePaths = ref([])
 const fileTreeKey = ref(0)
 const filesLoadId = ref(0)
+const instanceRoot = ref('')
+const loadedDirectories = ref(new Set())
 
-const initFiles = async () => {
+async function initFiles() {
 	const loadId = ++filesLoadId.value
-	const [filePaths, instanceRoot] = await Promise.all([
+	const [filePaths, root] = await Promise.all([
 		get_pack_export_candidates(props.instance.id),
 		get_full_path(props.instance.id),
 	])
-	const expandedFiles = await Promise.all(
-		filePaths.map((path) => expandExportCandidate(instanceRoot, path)),
+	if (loadId !== filesLoadId.value) return
+
+	instanceRoot.value = root
+	const exportCandidates = await Promise.all(
+		filePaths.map((path) => buildExportCandidateItem(root, path)),
 	)
 	if (loadId !== filesLoadId.value) return
 
-	files.value = expandedFiles.flat()
+	files.value = exportCandidates
 	selectedFilePaths.value = files.value
-		.filter(
-			(file) =>
-				!file.disabled &&
-				(file.path.startsWith('mods') ||
-					file.path.startsWith('datapacks') ||
-					file.path.startsWith('resourcepacks') ||
-					file.path.startsWith('shaderpacks') ||
-					file.path.startsWith('config')),
-		)
+		.filter((file) => !file.disabled && isDefaultSelectedExportCandidate(file.path))
 		.map((file) => file.path)
 }
 
-await initFiles()
-
 const exportPack = async () => {
 	const outputPath = await save({
 		defaultPath: `${nameInput.value} ${versionInput.value}.mrpack`,
@@ -128,58 +123,79 @@ function resetExportState() {
 	files.value = []
 	selectedFilePaths.value = []
 	fileTreeKey.value += 1
+	instanceRoot.value = ''
+	loadedDirectories.value = new Set()
 }
 
-async function expandExportCandidate(instanceRoot, path) {
+async function loadExportDirectory(path) {
+	if (!path || !instanceRoot.value || loadedDirectories.value.has(path)) return
+
+	const loadId = filesLoadId.value
+	loadedDirectories.value.add(path)
+
+	try {
+		const entries = await readDir(`${instanceRoot.value}/${path}`)
+		const childItems = await Promise.all(
+			entries.map((entry) => buildExportDirectoryChildItem(instanceRoot.value, path, entry)),
+		)
+		if (loadId !== filesLoadId.value) return
+
+		appendExportItems(childItems)
+	} catch {
+		loadedDirectories.value.delete(path)
+	}
+}
+
+async function buildExportCandidateItem(instanceRoot, path) {
 	try {
 		const entries = await readDir(`${instanceRoot}/${path}`)
-		if (entries.length === 0) {
-			const metadata = await getExportCandidateMetadata(instanceRoot, path)
-			return [
-				{
-					path,
-					type: 'directory',
-					disabled: true,
-					modified: metadata.modified,
-					count: 0,
-				},
-			]
-		}
-
-		const children = await Promise.all(
-			entries.map(async (entry) => {
-				const childPath = `${path}/${entry.name}`
-				if (entry.isDirectory) {
-					return expandExportCandidate(instanceRoot, childPath)
-				}
-
-				const metadata = await getExportCandidateMetadata(instanceRoot, childPath)
-				return [
-					{
-						path: childPath,
-						type: 'file',
-						disabled: isExportCandidateDisabled(childPath),
-						size: metadata.size,
-						modified: metadata.modified,
-					},
-				]
-			}),
-		)
-		return children.flat()
-	} catch {
 		const metadata = await getExportCandidateMetadata(instanceRoot, path)
-		return [
-			{
-				path,
-				type: 'file',
-				disabled: isExportCandidateDisabled(path),
-				size: metadata.size,
-				modified: metadata.modified,
-			},
-		]
+		return {
+			path,
+			type: 'directory',
+			disabled: isExportCandidateDisabled(path),
+			modified: metadata.modified,
+			count: entries.length,
+		}
+	} catch {
+		return buildExportFileItem(instanceRoot, path)
 	}
 }
 
+async function buildExportDirectoryChildItem(instanceRoot, parentPath, entry) {
+	const path = `${parentPath}/${entry.name}`
+	if (entry.isDirectory) {
+		const metadata = await getExportCandidateMetadata(instanceRoot, path)
+		return {
+			path,
+			type: 'directory',
+			disabled: isExportCandidateDisabled(path),
+			modified: metadata.modified,
+		}
+	}
+
+	return buildExportFileItem(instanceRoot, path)
+}
+
+async function buildExportFileItem(instanceRoot, path) {
+	const metadata = await getExportCandidateMetadata(instanceRoot, path)
+	return {
+		path,
+		type: 'file',
+		disabled: isExportCandidateDisabled(path),
+		size: metadata.size,
+		modified: metadata.modified,
+	}
+}
+
+function appendExportItems(items) {
+	const nextFiles = new Map(files.value.map((file) => [normalizeExportPath(file.path), file]))
+	for (const item of items) {
+		nextFiles.set(normalizeExportPath(item.path), item)
+	}
+	files.value = [...nextFiles.values()]
+}
+
 async function getExportCandidateMetadata(instanceRoot, path) {
 	try {
 		const metadata = await stat(`${instanceRoot}/${path}`)
@@ -192,6 +208,20 @@ async function getExportCandidateMetadata(instanceRoot, path) {
 	}
 }
 
+function normalizeExportPath(path) {
+	return path.replaceAll('\\', '/').split('/').filter(Boolean).join('/')
+}
+
+function isDefaultSelectedExportCandidate(path) {
+	return (
+		path.startsWith('mods') ||
+		path.startsWith('datapacks') ||
+		path.startsWith('resourcepacks') ||
+		path.startsWith('shaderpacks') ||
+		path.startsWith('config')
+	)
+}
+
 function isExportCandidateDisabled(path) {
 	return (
 		path === 'profile.json' ||
@@ -251,6 +281,7 @@ function isExportCandidateDisabled(path) {
 				v-model="selectedFilePaths"
 				class="min-w-0"
 				:items="files"
+				@navigate="loadExportDirectory"
 			/>
 		</div>
 		<template #actions>

apps/app-frontend/src/pages/instance/Index.vue

@@ -676,7 +676,7 @@ const handleOptionsClick = async (args: { option: string; item: unknown }) => {
 			break
 		case 'copy_path': {
 			if (instance.value) {
-				const fullPath = await get_full_path(instance.value?.path)
+				const fullPath = await get_full_path(instance.value.id)
 				await navigator.clipboard.writeText(fullPath)
 			}
 			break

packages/app-lib/src/api/instance/export_mrpack.rs

@@ -13,8 +13,7 @@ use crate::util::io::{self, IOError};
 use async_zip::tokio::write::ZipFileWriter;
 use async_zip::{Compression, ZipEntryBuilder};
 use path_util::SafeRelativeUtf8UnixPathBuf;
-use std::collections::{HashMap, HashSet};
-use std::iter::FromIterator;
+use std::collections::HashMap;
 use std::path::PathBuf;
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
@@ -56,12 +55,12 @@ pub async fn export_mrpack(
     let version_id = version_id.unwrap_or("1.0.0".to_string());
     let mut packfile =
         create_mrpack_json(&metadata, version_id, description).await?;
-    let included_candidates_set = HashSet::<_>::from_iter(
-        included_export_candidates.iter().map(|x| x.as_str()),
-    );
-    packfile
-        .files
-        .retain(|f| included_candidates_set.contains(f.path.as_str()));
+    packfile.files.retain(|f| {
+        is_export_candidate_included(
+            f.path.as_str(),
+            &included_export_candidates,
+        )
+    });
 
     let mut path_list = Vec::new();
     add_all_recursive_folder_paths(&instance_base_path, &mut path_list).await?;
@@ -80,9 +79,10 @@ pub async fn export_mrpack(
         let relative_path = pack_get_relative_path(&instance_base_path, &path)?;
 
         if packfile.files.iter().any(|f| f.path == relative_path)
-            || !included_candidates_set
-                .iter()
-                .any(|x| relative_path.starts_with(&**x))
+            || !is_export_candidate_included(
+                relative_path.as_str(),
+                &included_export_candidates,
+            )
         {
             continue;
         }
@@ -112,6 +112,18 @@ pub async fn export_mrpack(
     Ok(())
 }
 
+fn is_export_candidate_included(
+    path: &str,
+    included_export_candidates: &[String],
+) -> bool {
+    included_export_candidates.iter().any(|candidate| {
+        path == candidate
+            || path
+                .strip_prefix(candidate)
+                .is_some_and(|suffix| suffix.starts_with('/'))
+    })
+}
+
 #[tracing::instrument]
 pub async fn get_pack_export_candidates(
     instance_id: &str,