Skip to content

Limit profile name length to prevent file system level errors #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Limit profile name length to prevent file system level errors #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc06ef
Limit profile name length to prevent file system level errors
VilppeRiskidev Oct 15, 2024
d83fb23
WIP error handling
VilppeRiskidev Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/profiles-modals/ImportProfileModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ export default class ImportProfileModal extends mixins(ProfilesMixin) {
<template v-slot:body v-if="importUpdateSelection === 'CREATE'">
<p>This profile will store its own mods independently from other profiles.</p>
<br/>
<input class="input" v-model="targetProfileName" ref="profileNameInput" />
<input class="input" maxlength="100" v-model="targetProfileName" ref="profileNameInput" />
<br/><br/>
<span class="tag is-dark" v-if="makeProfileNameSafe(targetProfileName) === ''">
Profile name required
Expand Down
54 changes: 29 additions & 25 deletions src/components/views/DownloadModModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,32 +340,36 @@ let assignId = 0;
DownloadModModal.allVersions.push([currentAssignId, this.downloadObject]);
this.downloadingMod = true;
setTimeout(() => {
ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
if (status === StatusEnum.FAILURE) {
if (err !== null) {
this.downloadingMod = false;
const existing = DownloadModModal.allVersions[assignIndex]
existing[1].failed = true;
this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, existing[1]]);
DownloadModModal.addCdnSolutionToError(err);
this.$store.commit('error/handleError', err);
return;
}
} else if (status === StatusEnum.PENDING) {
const obj = {
progress: progress,
initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
modName: modName,
assignId: currentAssignId,
failed: false,
}
if (this.downloadObject!.assignId === currentAssignId) {
this.downloadObject = Object.assign({}, obj);
try {
ThunderstoreDownloaderProvider.instance.download(this.profile.asImmutableProfile(), tsMod, tsVersion, this.ignoreCache, (progress: number, modName: string, status: number, err: R2Error | null) => {
const assignIndex = DownloadModModal.allVersions.findIndex(([number, val]) => number === currentAssignId);
if (status === StatusEnum.FAILURE) {
if (err !== null) {
this.downloadingMod = false;
const existing = DownloadModModal.allVersions[assignIndex]
existing[1].failed = true;
this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, existing[1]]);
DownloadModModal.addCdnSolutionToError(err);
this.$store.commit('error/handleError', err);
return;
}
} else if (status === StatusEnum.PENDING) {
const obj = {
progress: progress,
initialMods: [`${tsMod.getName()} (${tsVersion.getVersionNumber().toString()})`],
modName: modName,
assignId: currentAssignId,
failed: false,
}
if (this.downloadObject!.assignId === currentAssignId) {
this.downloadObject = Object.assign({}, obj);
}
this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, obj]);
}
this.$set(DownloadModModal.allVersions, assignIndex, [currentAssignId, obj]);
}
}, this.downloadCompletedCallback);
}, this.downloadCompletedCallback);
} catch (e) {
console.warn(e);
}
}, 1);
}

Expand Down
5 changes: 4 additions & 1 deletion src/utils/FileUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import R2Error from "../model/errors/R2Error";
import FsProvider from '../providers/generic/file/FsProvider';
import path from 'path';

Expand All @@ -13,7 +14,9 @@ export default class FileUtils {

public static async ensureDirectory(dir: string) {
const fs = FsProvider.instance;
await fs.mkdirs(dir);
await fs.mkdirs(dir).catch(function (reason) {
throw new R2Error('Ensuring directory failed', reason);
});
}

public static async emptyDirectory(dir: string) {
Expand Down
Loading