Mirrors
/
vizality
mirror of https://github.com/vizality/vizality
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

quick fix for addon market installations

Browse Source
pull/82/head
dperolio 3 years ago
parent de3996b601
commit 449d48e491
2 changed files with 76 additions and 25 deletions
Show Stats Download Patch File Download Diff File

6
src/core/locales/en-US.json
Unescape View File

@ -149,5 +149,9 @@
"VIZALITY_ADDON_SUCCESSFULLY_INSTALLED": "{type} Successfully Installed",
"VIZALITY_ADDON_SUCCESSFULLY_INSTALLED_DESC": "The following {type} has been successfully installed:",
"VIZALITY_ADDON_ALREADY_INSTALLED": "{type} Already Installed",
"VIZALITY_ADDON_ALREADY_INSTALLED_DESC": "The following {type} cannot be installed as it is already installed:"
"VIZALITY_ADDON_ALREADY_INSTALLED_DESC": "The following {type} cannot be installed as it is already installed:",
"VIZALITY_ADDON_ALREADY_INSTALLING": "{type} Already Installing",
"VIZALITY_ADDON_ALREADY_INSTALLING_DESC": "The following {type} cannot be installed as it is already being installed:",
"VIZALITY_ADDON_DIRECTORY_ALREADY_EXISTS": "{type} Directory Already Exists",
"VIZALITY_ADDON_DIRECTORY_ALREADY_EXISTS_DESC": "The following {type} cannot be installed as an addon directory with its name already exists. There is most likely a problem preventing the {type} from being properly initialized:"
}

95
src/core/managers/Addon.js
Unescape View File

@ -22,7 +22,8 @@ const requiredManifestKeys = [ 'name', 'version', 'description', 'author' ];
const ErrorTypes = Object.freeze({
ADDON_ALREADY_INSTALLED: 'ADDON_ALREADY_INSTALLED',
ADDON_ALREADY_INSTALLING: 'ADDON_ALREADY_INSTALLING',
DIRECTORY_ALREADY_EXISTS: 'DIRECTORY_ALREADY_EXISTS'
});
/**
@ -338,6 +339,13 @@ export default class AddonManager extends Events {
const ignore = existsSync(ignorePath) ? readFileSync(ignorePath, 'utf-8').trim().split(/\r?\n/) : [];
const files = readdirSync(this.dir).sort(this._sortBuiltins);
for (const filename of files) {
/**
* Remove any leftover addons that were being installed.
*/
if (filename.startsWith('__installing__')) {
await removeDirRecursive(resolve(this.dir, filename));
continue;
}
addonId = filename;
// If it's a file or listed in .vzignore, skip it
if (lstatSync(join(this.dir, addonId)).isFile() || ignore.includes(addonId)) {
@ -546,23 +554,17 @@ export default class AddonManager extends Events {
*/
async install (addonId) {
try {
console.log(addonId);
let git;
if (vizality.manager.community[toPlural(this.type)].has(addonId)) {
console.log('uh');
({ git } = vizality.manager.community[toPlural(this.type)].get(addonId));
}
console.log('okay');
if (!new RegExp(/^(((https?:\/\/)(((([a-zA-Z0-9][a-zA-Z0-9\-_]{1,252})\.){1,8}[a-zA-Z]{2,63})\/))|((ssh:\/\/)?git@)(((([a-zA-Z0-9][a-zA-Z0-9\-_]{1,252})\.){1,8}[a-zA-Z]{2,63})(:)))([a-zA-Z0-9][a-zA-Z0-9_-]{1,36})(\/)([a-zA-Z0-9][a-zA-Z0-9_-]{1,36})((\.git)?)$/).test(git || addonId)) {
console.log('yes');
throw new Error('You must provide a valid GitHub repository URL or an addon ID from https://github.com/vizality-community!');
} else {
console.log('no');
git = addonId;
} else if (vizality.manager.community.plugins.has(addonId)) {
git = `https://github.com/vizality-community/${addonId}`;
}
console.log('here', git);
/**
* The URL must end in git to get processed by isomorphic-git below.
*/
@ -573,8 +575,6 @@ export default class AddonManager extends Events {
addonId = git.split('.git')[0].split('/')[git.split('.git')[0].split('/').length - 1];
addonId = toKebabCase(addonId);
console.log(git);
console.log(addonId);
if (this.isInstalled(addonId)) {
throw {
name: ErrorTypes.ADDON_ALREADY_INSTALLED,
@ -584,12 +584,22 @@ export default class AddonManager extends Events {
};
}
if (existsSync(join(this.dir, `__installing__${addonId}`)) && lstatSync(join(this.dir, addonId))?.isDirectory()) {
throw new Error(`${toTitleCase(this.type)} "${addonId}" looks like it's already being installed!`);
if (existsSync(join(this.dir, `__installing__${addonId}`)) && lstatSync(join(this.dir, `__installing__${addonId}`))?.isDirectory()) {
throw {
name: ErrorTypes.ADDON_ALREADY_INSTALLING,
message: Messages.VIZALITY_ADDON_ALREADY_INSTALLING_DESC.format({ type: this.type, addonId }),
stack: `\n${(new Error()).stack.replace('Error\n', '')}`,
addonId
};
}
if (existsSync(join(this.dir, addonId)) && lstatSync(join(this.dir, addonId))?.isDirectory()) {
throw new Error(`${toTitleCase(this.type)} directory "${addonId}" already exists!`);
throw {
name: ErrorTypes.DIRECTORY_ALREADY_EXISTS,
message: Messages.VIZALITY_ADDON_DIRECTORY_ALREADY_EXISTS_DESC.format({ type: this.type, addonId }),
stack: `\n${(new Error()).stack.replace('Error\n', '')}`,
addonId
};
}
try {
@ -612,24 +622,30 @@ export default class AddonManager extends Events {
await removeDirRecursive(resolve(this.dir, addonId));
throw new Error(`There was a problem while attempting to install "${addonId}"!`, err);
}
renameSync(join(this.dir, `__installing__${addonId}`), join(this.dir, addonId));
console.log('hello?');
try {
renameSync(join(this.dir, `__installing__${addonId}`), join(this.dir, addonId));
} catch (err) {
console.log(err);
}
console.log('okay');
/**
* Send a success toast.
*/
vizality.api.notifications.sendToast({
id: ErrorTypes.ADDON_ALREADY_INSTALLED,
id: 'addon-installed',
header: Messages.VIZALITY_ADDON_SUCCESSFULLY_INSTALLED.format({ type: toTitleCase(this.type) }),
content: <AddonInfoMessage addon={addon} message={Messages.VIZALITY_ADDON_SUCCESSFULLY_INSTALLED_DESC.format({ type: toTitleCase(this.type) })} />,
content: <AddonInfoMessage addon={this.get(addonId)} message={Messages.VIZALITY_ADDON_SUCCESSFULLY_INSTALLED_DESC.format({ type: toTitleCase(this.type) })} />,
icon: toTitleCase(this.type),
buttons: [
{
text: 'View',
onClick: () => vizality.api.routes.navigateTo(`/${toPlural(this.type)}/${addon.addonId}`)
onClick: () => vizality.api.routes.navigateTo(`/vizality/${this.type}/${addonId}`)
}
]
});
} catch (err) {
console.warn(err);
let addon;
if (err.addonId) {
addon = this.get(err.addonId);
@ -642,7 +658,7 @@ export default class AddonManager extends Events {
this._error(err.message, err.addonId, err.stack);
vizality.api.notifications.sendToast({
id: ErrorTypes.ADDON_ALREADY_INSTALLED,
header: Messages.VIZALITY_ADDON_ALREADY_INSTALLED.format({ type: toTitleCase(this.type) }),
header: Messages.VIZALITY_ADDON_ALREADY_INSTALLED_DESC.format({ type: toTitleCase(this.type) }),
content: <AddonInfoMessage addon={addon} message={err.message} />,
icon: toTitleCase(this.type),
buttons: [
@ -660,13 +676,44 @@ export default class AddonManager extends Events {
}
]
});
break;
}
/**
* Addon Already Installed
* Addon Already Installing
*/
// case ErrorTypes.ADDON_ALREADY_INSTALLED: {
// }
case ErrorTypes.ADDON_ALREADY_INSTALLING: {
this._error(err.message, err.addonId, err.stack);
vizality.api.notifications.sendToast({
id: ErrorTypes.ADDON_ALREADY_INSTALLING,
header: Messages.VIZALITY_ADDON_ALREADY_INSTALLING_DESC.format({ type: toTitleCase(this.type) }),
content: <AddonInfoMessage addon={addon} message={err.message} />,
icon: toTitleCase(this.type),
buttons: [
{
text: 'Cancel',
color: 'red',
onClick: async () => {
vizality.api.notifications.closeToast(ErrorTypes.ADDON_ALREADY_INSTALLING);
await removeDirRecursive(resolve(this.dir, `__installing__${err.addonId}`));
}
}
]
});
break;
}
/**
* Addon Directory Already Exists
*/
case ErrorTypes.ADDON_DIRECTORY_ALREADY_EXISTS: {
this._error(err.message, err.addonId, err.stack);
vizality.api.notifications.sendToast({
id: ErrorTypes.ADDON_DIRECTORY_ALREADY_EXISTS,
header: Messages.ADDON_DIRECTORY_ALREADY_EXISTS_DESC.format({ type: toTitleCase(this.type) }),
content: <AddonInfoMessage addon={addon} message={err.message} />,
icon: toTitleCase(this.type)
});
break;
}
}
}
}

Write Preview
Loading…
Cancel
Save