rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-01-22 07:26:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

Browse Source
This commit is contained in:
RossAscends 2024-05-19 15:06:32 +09:00
commit 9637b3fbe1
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/endpoints/assets.js
View File

@ -75,6 +75,24 @@ function getFiles(dir, files = []) {
return files; return files;
} }
/**
* Ensure that the asset folders exist.
* @param {import('../users').UserDirectoryList} directories - The user's directories
*/
function ensureFoldersExist(directories) {
const folderPath = path.join(directories.assets);
for (const category of VALID_CATEGORIES) {
const assetCategoryPath = path.join(folderPath, category);
if (fs.existsSync(assetCategoryPath) && !fs.statSync(assetCategoryPath).isDirectory()) {
fs.unlinkSync(assetCategoryPath);
}
if (!fs.existsSync(assetCategoryPath)) {
fs.mkdirSync(assetCategoryPath, { recursive: true });
}
}
}
const router = express.Router(); const router = express.Router();
/** /**
@ -92,15 +110,7 @@ router.post('/get', jsonParser, async (request, response) => {
try { try {
if (fs.existsSync(folderPath) && fs.statSync(folderPath).isDirectory()) { if (fs.existsSync(folderPath) && fs.statSync(folderPath).isDirectory()) {
for (const category of VALID_CATEGORIES) { ensureFoldersExist(request.user.directories);
const assetCategoryPath = path.join(folderPath, category);
if (fs.existsSync(assetCategoryPath) && !fs.statSync(assetCategoryPath).isDirectory()) {
fs.unlinkSync(assetCategoryPath);
}
if (!fs.existsSync(assetCategoryPath)) {
fs.mkdirSync(assetCategoryPath);
}
}
const folders = fs.readdirSync(folderPath, { withFileTypes: true }) const folders = fs.readdirSync(folderPath, { withFileTypes: true })
.filter(file => file.isDirectory()); .filter(file => file.isDirectory());
@ -193,6 +203,7 @@ router.post('/download', jsonParser, async (request, response) => {
} }
// Validate filename // Validate filename
ensureFoldersExist(request.user.directories);
const validation = validateAssetFileName(request.body.filename); const validation = validateAssetFileName(request.body.filename);
if (validation.error) if (validation.error)
return response.status(400).send(validation.message); return response.status(400).send(validation.message);