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

Do not delete characters on failed WebP conversion

Browse Source
This commit is contained in:
Grzegorz Gidel
2023-04-26 23:12:16 +02:00
parent c4d49729cc
commit e4f9c7e9c6
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server.js
View File

@@ -748,11 +748,13 @@ async function charaWrite(img_url, data, target_img, response = undefined, mes =
fs.writeFileSync(charactersPath + target_img + '.png', new Buffer.from(encode(chunks))); fs.writeFileSync(charactersPath + target_img + '.png', new Buffer.from(encode(chunks)));
if (response !== undefined) response.send(mes); if (response !== undefined) response.send(mes);
return true;
} catch (err) { } catch (err) {
console.log(err); console.log(err);
if (response !== undefined) response.send(err); if (response !== undefined) response.status(500).send(err);
return false;
} }
} }
@@ -2547,7 +2549,12 @@ async function convertWebp() {
await webp.dwebp(source, dest, "-o"); await webp.dwebp(source, dest, "-o");
console.log(`Write... ${dest}`); console.log(`Write... ${dest}`);
await charaWrite(dest, data, path.parse(dest).name); const success = await charaWrite(dest, data, path.parse(dest).name);
if (!success) {
console.log(`Failure on ${source} -> ${dest}`);
continue;
}
console.log(`Remove... ${source}`); console.log(`Remove... ${source}`);
fs.rmSync(source); fs.rmSync(source);

11
tools/charaverter/main.mjs
View File

@@ -71,11 +71,13 @@ async function charaWrite(img_url, data, target_img, response = undefined, mes =
fs.writeFileSync(target_img, new Buffer.from(encode(chunks))); fs.writeFileSync(target_img, new Buffer.from(encode(chunks)));
if (response !== undefined) response.send(mes); if (response !== undefined) response.send(mes);
return true;
} catch (err) { } catch (err) {
console.log(err); console.log(err);
if (response !== undefined) response.send(err); if (response !== undefined) response.status(500).send(err);
return false;
} }
} }
@@ -102,7 +104,12 @@ async function charaWrite(img_url, data, target_img, response = undefined, mes =
await webp.dwebp(source, dest, "-o") await webp.dwebp(source, dest, "-o")
console.log(`Write... ${dest}`) console.log(`Write... ${dest}`)
await charaWrite(dest, data, dest) const success = await charaWrite(dest, data, path.parse(dest).name);
if (!success) {
console.log(`Failure on ${source} -> ${dest}`);
continue;
}
console.log(`Remove... ${source}`) console.log(`Remove... ${source}`)
fs.rmSync(source) fs.rmSync(source)