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

Fix sprite folder for Risu sprites. Don't overwrite existing files.

Browse Source
This commit is contained in:
Cohee
2023-06-26 17:00:13 +03:00
parent 1739af3ef6
commit 89a1378397
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server.js
View File

@@ -1772,7 +1772,7 @@ app.post("/importcharacter", urlencodedParser, async function (request, response
jsonData = readFromV2(jsonData); jsonData = readFromV2(jsonData);
png_name = getPngName(jsonData.data?.name || jsonData.name); png_name = getPngName(jsonData.data?.name || jsonData.name);
let char = JSON.stringify(jsonData); let char = JSON.stringify(jsonData);
importRisuSprites(png_name, jsonData); importRisuSprites(jsonData);
charaWrite(defaultAvatarPath, char, png_name, response, { file_name: png_name }); charaWrite(defaultAvatarPath, char, png_name, response, { file_name: png_name });
} else if (jsonData.name !== undefined) { } else if (jsonData.name !== undefined) {
console.log('importing from v1 json'); console.log('importing from v1 json');
@@ -1843,7 +1843,7 @@ app.post("/importcharacter", urlencodedParser, async function (request, response
if (jsonData.spec !== undefined) { if (jsonData.spec !== undefined) {
console.log('Found a v2 character file.'); console.log('Found a v2 character file.');
importRisuSprites(png_name, jsonData); importRisuSprites(jsonData);
jsonData = readFromV2(jsonData); jsonData = readFromV2(jsonData);
let char = JSON.stringify(jsonData); let char = JSON.stringify(jsonData);
charaWrite(uploadPath, char, png_name, response, { file_name: png_name }); charaWrite(uploadPath, char, png_name, response, { file_name: png_name });
@@ -3849,12 +3849,13 @@ app.post('/upload_sprite', urlencodedParser, async (request, response) => {
} }
}); });
function importRisuSprites(name, data) { function importRisuSprites(data) {
try { try {
const name = data?.data?.name;
const risuData = data?.data?.extensions?.risuai; const risuData = data?.data?.extensions?.risuai;
// Not a Risu AI character // Not a Risu AI character
if (!risuData || !(risuData?.additionalAssets) || !(risuData?.emotions)) { if (!risuData || !name) {
return; return;
} }
@@ -3868,6 +3869,11 @@ function importRisuSprites(name, data) {
images = images.concat(risuData.emotions); images = images.concat(risuData.emotions);
} }
// No sprites to import
if (images.length === 0) {
return;
}
// Create sprites folder if it doesn't exist // Create sprites folder if it doesn't exist
const spritesPath = path.join(directories.characters, name); const spritesPath = path.join(directories.characters, name);
if (!fs.existsSync(spritesPath)) { if (!fs.existsSync(spritesPath)) {
@@ -3879,15 +3885,15 @@ function importRisuSprites(name, data) {
return; return;
} }
console.log(`RisuAI: Found ${images.length} sprites for ${name}. Writing to disk.`) console.log(`RisuAI: Found ${images.length} sprites for ${name}. Writing to disk.`);
const files = fs.readdirSync(spritesPath); const files = fs.readdirSync(spritesPath);
for (const [label, fileBase64] of images) { outer: for (const [label, fileBase64] of images) {
// Remove existing sprite with the same label // Remove existing sprite with the same label
for (const file of files) { for (const file of files) {
if (path.parse(file).name === label) { if (path.parse(file).name === label) {
fs.rmSync(path.join(spritesPath, file)); console.log(`RisuAI: The sprite ${label} for ${name} already exists. Skipping.`);
continue outer;
} }
} }