62b02bec · permissionBRICK/SillyTavern

src/endpoints/assets.js+2 -2 Viewed

             const contentType = mime.lookup(temp_path) || 'application/octet-stream';
             response.setHeader('Content-Type', contentType);
             response.send(fileContent);
-            fs.rmSync(temp_path);
+            fs.unlinkSync(temp_path);
             return;
+        }
         // Move into asset place
         console.info('Download finished, moving file from', temp_path, 'to', file_path);
         fs.copyFileSync(temp_path, file_path);
-        fs.rmSync(temp_path);
+        fs.unlinkSync(temp_path);
         response.sendStatus(200);
+    }
     catch (error) {

src/endpoints/avatars.js+2 -2 Viewed

     const fileName = path.join(request.user.directories.avatars, sanitize(request.body.avatar));
     if (fs.existsSync(fileName)) {
-        fs.rmSync(fileName);
+        fs.unlinkSync(fileName);
         return response.send({ result: 'ok' });
+    }

         const filename = request.body.overwrite_name || `${Date.now()}.png`;
         const pathToNewFile = path.join(request.user.directories.avatars, filename);
         writeFileAtomicSync(pathToNewFile, image);
-        fs.rmSync(pathToUpload);
+        fs.unlinkSync(pathToUpload);
         return response.send({ path: filename });
     } catch (err) {
         return response.status(400).send('Is not a valid image');

src/endpoints/backends/kobold.js+1 -1 Viewed

         console.debug('Transcribing audio with KoboldCpp', server);
         const fileBase64 = fs.readFileSync(request.file.path).toString('base64');
-        fs.rmSync(request.file.path);
+        fs.unlinkSync(request.file.path);
         const headers = {};
         setAdditionalHeadersByType(headers, TEXTGEN_TYPES.KOBOLDCPP, server, request.user.directories);

src/endpoints/backgrounds.js+3 -3 Viewed

         return response.sendStatus(400);
+    }
-    fs.rmSync(fileName);
+    fs.unlinkSync(fileName);
     invalidateThumbnail(request.user.directories, 'bg', request.body.bg);
     return response.send('ok');
 });

+    }
     fs.copyFileSync(oldFileName, newFileName);
-    fs.rmSync(oldFileName);
+    fs.unlinkSync(oldFileName);
     invalidateThumbnail(request.user.directories, 'bg', request.body.old_bg);
     return response.send('ok');
 });

     try {
         fs.copyFileSync(img_path, path.join(request.user.directories.backgrounds, filename));
-        fs.rmSync(img_path);
+        fs.unlinkSync(img_path);
         invalidateThumbnail(request.user.directories, 'bg', filename);
         response.send(filename);
     } catch (err) {

src/endpoints/characters.js+4 -4 Viewed

  */
 async function importFromYaml(uploadPath, context, preservedFileName) {
     const fileText = fs.readFileSync(uploadPath, 'utf8');
-    fs.rmSync(uploadPath);
+    fs.unlinkSync(uploadPath);
     const yamlData = yaml.parse(fileText);
     console.info('Importing from YAML');
     yamlData.name = sanitize(yamlData.name);

  */
 async function importFromCharX(uploadPath, { request }, preservedFileName) {
     const data = fs.readFileSync(uploadPath).buffer;
-    fs.rmSync(uploadPath);
+    fs.unlinkSync(uploadPath);
     console.info('Importing from CharX');
     const cardBuffer = await extractFileFromZipBuffer(data, 'card.json');

+        }
         // Remove the old character file
-        fs.rmSync(oldAvatarPath);
+        fs.unlinkSync(oldAvatarPath);
         // Return new avatar name to ST
         return response.send({ avatar: newAvatarName });

         return response.sendStatus(400);
+    }
-    fs.rmSync(avatarPath);
+    fs.unlinkSync(avatarPath);
     invalidateThumbnail(request.user.directories, 'avatar', request.body.avatar_url);
     let dir_name = (request.body.avatar_url.replace('.png', ''));

src/endpoints/chats.js+3 -3 Viewed

+    }
     fs.copyFileSync(pathToOriginalFile, pathToRenamedFile);
-    fs.rmSync(pathToOriginalFile);
+    fs.unlinkSync(pathToOriginalFile);
     console.info('Successfully renamed.');
     return response.send({ ok: true, sanitizedFileName });
 });

         return response.sendStatus(400);
+    }
-    fs.rmSync(filePath);
+    fs.unlinkSync(filePath);
     console.info(`Deleted chat file: ${filePath}`);
     return response.send('ok');
 });

     const pathToFile = path.join(request.user.directories.groupChats, `${id}.jsonl`);
     if (fs.existsSync(pathToFile)) {
-        fs.rmSync(pathToFile);
+        fs.unlinkSync(pathToFile);
         return response.send({ ok: true });
+    }

src/endpoints/files.js+1 -1 Viewed

             return response.status(404).send('File not found');
+        }
-        fs.rmSync(pathToDelete);
+        fs.unlinkSync(pathToDelete);
         console.info(`Deleted file: ${request.body.path} from ${request.user.profile.handle}`);
         return response.sendStatus(200);
     } catch (error) {

src/endpoints/groups.js+2 -2 Viewed

@@ -117,7 +117,7 @@ router.post('/delete', async (request, response) => {
117	const pathToFile = path.join(request.user.directories.groupChats, `${id}.jsonl`);	117	const pathToFile = path.join(request.user.directories.groupChats, `${id}.jsonl`);
118		118
119	if (fs.existsSync(pathToFile)) {	119	if (fs.existsSync(pathToFile)) {
120	fs.rmSync(pathToFile);	120	fs.unlinkSync(pathToFile);
121	}	121	}
122	}	122	}
123	}	123	}

@@ -126,7 +126,7 @@ router.post('/delete', async (request, response) => {
126	}	126	}
127		127
128	if (fs.existsSync(pathToGroup)) {	128	if (fs.existsSync(pathToGroup)) {
129	fs.rmSync(pathToGroup);	129	fs.unlinkSync(pathToGroup);
130	}	130	}
131		131
132	return response.send({ ok: true });	132	return response.send({ ok: true });

src/endpoints/openai.js+1 -1 Viewed

             return response.status(500).send(text);
+        }
-        fs.rmSync(request.file.path);
+        fs.unlinkSync(request.file.path);
         const data = await result.json();
         console.debug('OpenAI transcription response', data);
         return response.json(data);

src/endpoints/presets.js+1 -1 Viewed

     const pathToFile = path.join(request.user.directories.openAI_Settings, `${name}.json`);
     if (fs.existsSync(pathToFile)) {
-        fs.rmSync(pathToFile);
+        fs.unlinkSync(pathToFile);
         return response.send({ ok: true });
+    }

src/endpoints/sprites.js+5 -5 Viewed

@@ -165,7 +165,7 @@ router.post('/delete', async (request, response) => {
165	// Remove existing sprite with the same label	165	// Remove existing sprite with the same label
166	for (const file of files) {	166	for (const file of files) {
167	if (path.parse(file).name === spriteName) {	167	if (path.parse(file).name === spriteName) {
168	fs.rmSync(path.join(spritesPath, file));	168	fs.unlinkSync(path.join(spritesPath, file));
169	}	169	}
170	}	170	}
171		171

             const existingFile = files.find(file => path.parse(file).name === path.parse(filename).name);
             if (existingFile) {
-                fs.rmSync(path.join(spritesPath, existingFile));
+                fs.unlinkSync(path.join(spritesPath, existingFile));
+            }
             // Write sprite buffer to disk

+        }
         // Remove uploaded ZIP file
-        fs.rmSync(spritePackPath);
+        fs.unlinkSync(spritePackPath);
         return response.send({ count: sprites.length });
     } catch (error) {
         console.error(error);

@@ -251,7 +251,7 @@ router.post('/upload', async (request, response) => {
251	// Remove existing sprite with the same label	251	// Remove existing sprite with the same label
252	for (const file of files) {	252	for (const file of files) {
253	if (path.parse(file).name === spriteName) {	253	if (path.parse(file).name === spriteName) {
254	fs.rmSync(path.join(spritesPath, file));	254	fs.unlinkSync(path.join(spritesPath, file));
255	}	255	}
256	}	256	}
257		257

         // Copy uploaded file to sprites folder
         fs.cpSync(spritePath, pathToFile);
         // Remove uploaded file
-        fs.rmSync(spritePath);
+        fs.unlinkSync(spritePath);
         return response.sendStatus(200);
     } catch (error) {
         console.error(error);

src/endpoints/themes.js+1 -1 Viewed

             console.error('Theme file not found:', filename);
             return response.sendStatus(404);
+        }
-        fs.rmSync(filename);
+        fs.unlinkSync(filename);
         return response.sendStatus(200);
     } catch (error) {
         console.error(error);

src/endpoints/thumbnails.js+1 -1 Viewed

@@ -75,7 +75,7 @@ export function invalidateThumbnail(directories, type, file) {
75	const pathToThumbnail = path.join(folder, file);	75	const pathToThumbnail = path.join(folder, file);
76		76
77	if (fs.existsSync(pathToThumbnail)) {	77	if (fs.existsSync(pathToThumbnail)) {
78	fs.rmSync(pathToThumbnail);	78	fs.unlinkSync(pathToThumbnail);
79	}	79	}
80	}	80	}
81		81

src/endpoints/worldinfo.js+1 -1 Viewed

         throw new Error(`World info file ${filename} doesn't exist.`);
+    }
-    fs.rmSync(pathToWorldInfo);
+    fs.unlinkSync(pathToWorldInfo);
     return response.sendStatus(200);
 });

src/util.js+1 -1 Viewed

@@ -435,7 +435,7 @@ export function removeOldBackups(directory, prefix, limit = null) {
435	break;	435	break;
436	}	436	}
437		437
438	fs.rmSync(oldest);	438	fs.unlinkSync(oldest);
439	}	439	}
440	}	440	}
441	}	441	}

Merge pull request #3940 from wickedcode01/bug-fixed Fix the issue where deleting files on Windows may cause the application to crash.