rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a stupid delete bug, reload on delete.

Browse Source
This commit is contained in:
BlipRanger
2023-07-13 01:12:57 -04:00
parent 35336b1646
commit 2b8db6350e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/extensions.js
View File

@@ -556,6 +556,8 @@ async function onDeleteClick() {
} }
toastr.success(`Extension ${extensionName} deleted`); toastr.success(`Extension ${extensionName} deleted`);
showExtensionsDetails(); showExtensionsDetails();
// reload the page to remove the extension from the list
location.reload();
} }
}; };

10
server.js
View File

@@ -35,7 +35,6 @@ const compression = require('compression');
const app = express(); const app = express();
const responseTime = require('response-time'); const responseTime = require('response-time');
const simpleGit = require('simple-git'); const simpleGit = require('simple-git');
const git = simpleGit();
app.use(compression()); app.use(compression());
app.use(responseTime()); app.use(responseTime());
@@ -4391,6 +4390,7 @@ async function getManifest(extensionPath) {
} }
async function checkIfRepoIsUpToDate(extensionPath) { async function checkIfRepoIsUpToDate(extensionPath) {
const git = simpleGit();
await git.cwd(extensionPath).fetch('origin'); await git.cwd(extensionPath).fetch('origin');
const currentBranch = await git.cwd(extensionPath).branch(); const currentBranch = await git.cwd(extensionPath).branch();
const currentCommitHash = await git.cwd(extensionPath).revparse(['HEAD']); const currentCommitHash = await git.cwd(extensionPath).revparse(['HEAD']);
@@ -4420,11 +4420,17 @@ async function checkIfRepoIsUpToDate(extensionPath) {
* @returns {void} * @returns {void}
*/ */
app.post('/get_extension', jsonParser, async (request, response) => { app.post('/get_extension', jsonParser, async (request, response) => {
const git = simpleGit();
if (!request.body.url) { if (!request.body.url) {
return response.status(400).send('Bad Request: URL is required in the request body.'); return response.status(400).send('Bad Request: URL is required in the request body.');
} }
try { try {
// make sure the third-party directory exists
if (!fs.existsSync(directories.extensions + '/third-party')) {
fs.mkdirSync(directories.extensions + '/third-party');
}
const url = request.body.url; const url = request.body.url;
const extensionPath = path.join(directories.extensions, 'third-party', path.basename(url, '.git')); const extensionPath = path.join(directories.extensions, 'third-party', path.basename(url, '.git'));
@@ -4459,6 +4465,7 @@ app.post('/get_extension', jsonParser, async (request, response) => {
* @returns {void} * @returns {void}
*/ */
app.post('/update_extension', jsonParser, async (request, response) => { app.post('/update_extension', jsonParser, async (request, response) => {
const git = simpleGit();
if (!request.body.extensionName) { if (!request.body.extensionName) {
return response.status(400).send('Bad Request: extensionName is required in the request body.'); return response.status(400).send('Bad Request: extensionName is required in the request body.');
} }
@@ -4503,6 +4510,7 @@ app.post('/update_extension', jsonParser, async (request, response) => {
* @returns {void} * @returns {void}
*/ */
app.post('/get_extension_version', jsonParser, async (request, response) => { app.post('/get_extension_version', jsonParser, async (request, response) => {
const git = simpleGit();
if (!request.body.extensionName) { if (!request.body.extensionName) {
return response.status(400).send('Bad Request: extensionName is required in the request body.'); return response.status(400).send('Bad Request: extensionName is required in the request body.');
} }