merge queue: checking #8281 on main (ecf116d)

Cargo.toml

@@ -138,6 +138,7 @@ lettre = { version = "0.11.23", default-features = false, features = [
   "tokio1",
   "tokio1-rustls",
 ] }
+libc = "0.2.191"
 lingua = "=1.8.0"
 linkify = "0.11.0"
 lz4_flex = { version = "0.14.0", default-features = false, features = [

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

@@ -67,8 +67,8 @@
 						</g>
 					</g>
 				</svg>
-				<ProgressBar class="loading-bar" :progress="Math.min(loadingProgress, 100)" />
-				<span v-if="message">{{ message }}</span>
+				<ProgressBar class="loading-bar" :progress="progress" />
+				<span v-if="message" class="text-secondary">{{ message }}</span>
 			</div>
 			<div class="gradient-bg" data-tauri-drag-region></div>
 			<div class="cube-bg"></div>
@@ -78,19 +78,36 @@
 </template>
 
 <script setup>
-import { injectLoadingState } from '@modrinth/ui'
-import { onMounted, ref, watch } from 'vue'
+import { defineMessages, injectLoadingState, useVIntl } from '@modrinth/ui'
+import { computed, onMounted, ref, watch } from 'vue'
 
 import ProgressBar from '@/components/ui/ProgressBar.vue'
 import { useAppEvent } from '@/composables/use-app-event'
 import { useTheme } from '@/composables/use-theme.ts'
 import { debugStartup } from '@/helpers/startup-debug'
 
 const theme = useTheme()
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	movingAppDirectory: {
+		id: 'app.splash.moving-app-directory',
+		defaultMessage: 'Moving your app directory...',
+	},
+})
 
 const doneLoading = ref(false)
 const loadingProgress = ref(0)
-const message = ref()
+const directoryMoveFraction = ref(null)
+
+const progress = computed(() =>
+	directoryMoveFraction.value === null
+		? Math.min(loadingProgress.value, 100)
+		: directoryMoveFraction.value * 100,
+)
+const message = computed(() =>
+	directoryMoveFraction.value === null ? null : formatMessage(messages.movingAppDirectory),
+)
 
 const MIN_DISPLAY_MS = 500
 const mountedAt = Date.now()
@@ -144,8 +161,7 @@ function fakeLoadingIncrease() {
 
 useAppEvent('loading', (e) => {
 	if (e.event.type === 'directory_move') {
-		loadingProgress.value = 100 * (e.fraction ?? 1)
-		message.value = 'Updating app directory...'
+		directoryMoveFraction.value = e.fraction ?? null
 	}
 })
 </script>

apps/app-frontend/src/features/library/shared-instances/shared-instance-modals.vue

@@ -57,6 +57,7 @@ async function install(
 			async () => {
 				if (loadingIds.value.has(sharedInstanceId)) return
 				setLoading(sharedInstanceId, true)
+				let jobId: string
 				try {
 					const job = await install_shared_instance(
 						sharedInstanceId,
@@ -67,12 +68,16 @@ async function install(
 						instance.icon_path ?? null,
 						instance.icon_path ? (instance.icon_config ?? null) : null,
 					)
+					jobId = job.job_id
 					await queryClient.invalidateQueries({ queryKey: ['instances'] })
 					options.onInstalled?.()
-					await wait_for_install_job(appEvents, job.job_id).catch(() => {})
-				} finally {
+				} catch (error) {
 					setLoading(sharedInstanceId, false)
+					throw error
 				}
+				void wait_for_install_job(appEvents, jobId)
+					.catch(() => {})
+					.finally(() => setLoading(sharedInstanceId, false))
 			},
 			manager
 				? { id: manager.id, username: manager.username, avatarUrl: manager.avatar_url ?? null }

apps/app-frontend/src/features/settings/system/resource-management-settings/app-directory/change-directory-modal.vue

@@ -0,0 +1,228 @@
+<script setup lang="ts">
+import {
+	ClipboardCopyIcon,
+	ClockIcon,
+	FolderSearchIcon,
+	RefreshCwIcon,
+	XIcon,
+} from '@modrinth/assets'
+import {
+	Admonition,
+	Button,
+	type ButtonMenuOption,
+	commonMessages,
+	defineMessages,
+	NewModal,
+	SplitButton,
+	useVIntl,
+} from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed, ref } from 'vue'
+
+import { get_all as getRunningProcesses } from '@/helpers/process.js'
+import { pickDirectory } from '@/platform/dialogs'
+
+import { isDriveRoot, isNestedPath, normalizePath } from './paths'
+import { useCopyPath } from './use-copy-path'
+
+const props = defineProps<{
+	currentDir: string
+	caseInsensitive: boolean
+}>()
+
+const emit = defineEmits<{
+	confirm: [directory: string, restartNow: boolean]
+}>()
+
+const { formatMessage } = useVIntl()
+const copyPath = useCopyPath()
+
+const messages = defineMessages({
+	header: {
+		id: 'app.settings.resource-management.app-directory.modal.header',
+		defaultMessage: 'Change app directory',
+	},
+	admonitionHeader: {
+		id: 'app.settings.resource-management.app-directory.modal.admonition-header',
+		defaultMessage: 'All your files will be moved',
+	},
+	admonitionBody: {
+		id: 'app.settings.resource-management.app-directory.modal.admonition-body',
+		defaultMessage:
+			"You won't be able to use Modrinth App while we move your data. This may take a while.",
+	},
+	currentLabel: {
+		id: 'app.settings.resource-management.app-directory.modal.current',
+		defaultMessage: 'Current',
+	},
+	newLabel: {
+		id: 'app.settings.resource-management.app-directory.modal.new',
+		defaultMessage: 'New',
+	},
+	choose: {
+		id: 'app.settings.resource-management.app-directory.modal.choose',
+		defaultMessage: 'Choose a folder',
+	},
+	pickerTitle: {
+		id: 'app.settings.resource-management.app-directory.modal.picker-title',
+		defaultMessage: 'Select a new app directory',
+	},
+	instancesRunning: {
+		id: 'app.settings.resource-management.app-directory.modal.instances-running',
+		defaultMessage: 'Close all running instances before changing the app directory.',
+	},
+	nested: {
+		id: 'app.settings.resource-management.app-directory.modal.nested',
+		defaultMessage: "The new folder can't be inside your current app directory, or contain it.",
+	},
+	driveRoot: {
+		id: 'app.settings.resource-management.app-directory.modal.drive-root',
+		defaultMessage:
+			"Choose a folder rather than the top of a drive, so your files don't mix with everything else on it.",
+	},
+	moveAndRestart: {
+		id: 'app.settings.resource-management.app-directory.modal.move-and-restart',
+		defaultMessage: 'Move and restart',
+	},
+	moveLater: {
+		id: 'app.settings.resource-management.app-directory.modal.move-later',
+		defaultMessage: 'Move on next launch',
+	},
+	moreOptions: {
+		id: 'app.settings.resource-management.app-directory.modal.more-options',
+		defaultMessage: 'More move options',
+	},
+})
+
+const modal = ref<InstanceType<typeof NewModal>>()
+const newDir = ref<string | null>(null)
+const locked = ref(false)
+
+const processesQuery = useQuery({
+	queryKey: ['processes', 'list'],
+	networkMode: 'always',
+	queryFn: (): Promise<unknown[]> => getRunningProcesses(),
+	staleTime: 0,
+})
+const instancesRunning = computed(() => (processesQuery.data.value?.length ?? 0) > 0)
+
+const normalizedNew = computed(() =>
+	newDir.value === null ? null : normalizePath(newDir.value, props.caseInsensitive),
+)
+const normalizedCurrent = computed(() => normalizePath(props.currentDir, props.caseInsensitive))
+const sameAsCurrent = computed(() => normalizedNew.value === normalizedCurrent.value)
+const nested = computed(
+	() =>
+		normalizedNew.value !== null &&
+		!sameAsCurrent.value &&
+		isNestedPath(normalizedNew.value, normalizedCurrent.value),
+)
+const driveRoot = computed(() => newDir.value !== null && isDriveRoot(newDir.value))
+const canMove = computed(
+	() => newDir.value !== null && !sameAsCurrent.value && !nested.value && !instancesRunning.value,
+)
+
+const moveOptions = computed<ButtonMenuOption[]>(() => [
+	{
+		id: 'move-later',
+		label: formatMessage(messages.moveLater),
+		icon: ClockIcon,
+		action: () => confirm(false),
+	},
+])
+
+function show(event?: MouseEvent, directory?: string) {
+	newDir.value = directory ?? null
+	locked.value = directory !== undefined
+	void processesQuery.refetch()
+	modal.value?.show(event)
+}
+
+async function browse() {
+	const directory = await pickDirectory(formatMessage(messages.pickerTitle))
+	if (directory) {
+		newDir.value = directory
+	}
+}
+
+async function confirm(restartNow: boolean) {
+	await processesQuery.refetch()
+	if (!canMove.value || newDir.value === null) return
+	modal.value?.hide()
+	emit('confirm', newDir.value, restartNow)
+}
+
+defineExpose({ show })
+</script>
+
+<template>
+	<NewModal ref="modal" :header="formatMessage(messages.header)" fade="danger" max-width="560px">
+		<div class="flex flex-col gap-6">
+			<Admonition
+				type="critical"
+				:header="formatMessage(messages.admonitionHeader)"
+				:body="formatMessage(messages.admonitionBody)"
+			/>
+
+			<div class="flex flex-col gap-2">
+				<span class="font-semibold text-contrast">{{ formatMessage(messages.currentLabel) }}</span>
+				<Button size="lg" class="w-full !justify-between text-left" @click="copyPath(currentDir)">
+					<span class="min-w-0 truncate text-base font-semibold text-primary">
+						{{ currentDir }}
+					</span>
+					<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+				</Button>
+			</div>
+
+			<div class="flex flex-col gap-2">
+				<span class="font-semibold text-contrast">{{ formatMessage(messages.newLabel) }}</span>
+				<Button
+					size="lg"
+					class="w-full !justify-between text-left"
+					:disabled="locked"
+					@click="browse"
+				>
+					<span
+						class="min-w-0 truncate font-semibold"
+						:class="newDir ? 'text-primary' : 'text-secondary'"
+						:title="newDir ?? undefined"
+					>
+						{{ newDir ?? formatMessage(messages.choose) }}
+					</span>
+					<FolderSearchIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+				</Button>
+				<div aria-live="polite" class="flex flex-col gap-1 empty:hidden">
+					<p v-if="instancesRunning" class="m-0 text-sm text-red">
+						{{ formatMessage(messages.instancesRunning) }}
+					</p>
+					<p v-if="nested" class="m-0 text-sm text-red">
+						{{ formatMessage(messages.nested) }}
+					</p>
+					<p v-else-if="driveRoot" class="m-0 text-sm text-orange">
+						{{ formatMessage(messages.driveRoot) }}
+					</p>
+				</div>
+			</div>
+		</div>
+
+		<template #actions>
+			<div class="flex justify-end gap-2">
+				<Button type="outlined" @click="modal?.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(commonMessages.cancelButton) }}
+				</Button>
+				<SplitButton
+					type="colored"
+					color="red"
+					:menu-label="formatMessage(messages.moreOptions)"
+					:options="moveOptions"
+					:disabled="!canMove"
+					@click="confirm(true)"
+				>
+					<RefreshCwIcon aria-hidden="true" />
+					{{ formatMessage(messages.moveAndRestart) }}
+				</SplitButton>
+			</div>
+		</template>
+	</NewModal>
+</template>