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

1.4.0 CharaCloud Webp interop

Browse Source
This commit is contained in:
SillyLossy
2023-05-02 16:55:10 +03:00
parent 0dee00570c
commit 7b99597432
1 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server.js
View File

@@ -55,6 +55,9 @@ const ExifReader = require('exifreader');
const exif = require('piexifjs'); const exif = require('piexifjs');
const webp = require('webp-converter'); const webp = require('webp-converter');
const DeviceDetector = require("device-detector-js"); const DeviceDetector = require("device-detector-js");
const { TextEncoder, TextDecoder } = require('util');
const utf8Encode = new TextEncoder();
const utf8Decode = new TextDecoder('utf-8', { ignoreBOM: true });
const config = require(path.join(__dirname, './config.conf')); const config = require(path.join(__dirname, './config.conf'));
const server_port = process.env.SILLY_TAVERN_PORT || config.port; const server_port = process.env.SILLY_TAVERN_PORT || config.port;
@@ -822,12 +825,34 @@ async function charaRead(img_url, input_format) {
switch (format) { switch (format) {
case 'webp': case 'webp':
try {
const exif_data = await ExifReader.load(fs.readFileSync(img_url)); const exif_data = await ExifReader.load(fs.readFileSync(img_url));
const char_data = exif_data['UserComment']['description']; let char_data;
if (char_data === 'Undefined' && exif_data['UserComment'].value && exif_data['UserComment'].value.length === 1) {
return exif_data['UserComment'].value[0]; if (exif_data['UserComment']['description']) {
let description = exif_data['UserComment']['description'];
if (description === 'Undefined' && exif_data['UserComment'].value && exif_data['UserComment'].value.length === 1) {
description = exif_data['UserComment'].value[0];
}
try {
JSON.parse(description);
char_data = description;
} catch {
const byteArr = description.split(",").map(Number);
const uint8Array = new Uint8Array(byteArr);
const char_data_string = utf8Decode.decode(uint8Array);
char_data = char_data_string;
}
} else {
console.log('No description found in EXIF data.');
return false;
} }
return char_data; return char_data;
}
catch (err) {
console.log(err);
return false;
}
case 'png': case 'png':
const buffer = fs.readFileSync(img_url); const buffer = fs.readFileSync(img_url);
const chunks = extract(buffer); const chunks = extract(buffer);
@@ -1506,13 +1531,14 @@ app.post("/exportcharacter", jsonParser, async function (request, response) {
case 'webp': { case 'webp': {
try { try {
let json = await charaRead(filename); let json = await charaRead(filename);
let stringByteArray = utf8Encode.encode(json).toString();
let inputWebpPath = `./uploads/${Date.now()}_input.webp`; let inputWebpPath = `./uploads/${Date.now()}_input.webp`;
let outputWebpPath = `./uploads/${Date.now()}_output.webp`; let outputWebpPath = `./uploads/${Date.now()}_output.webp`;
let metadataPath = `./uploads/${Date.now()}_metadata.exif`; let metadataPath = `./uploads/${Date.now()}_metadata.exif`;
let metadata = let metadata =
{ {
"Exif": { "Exif": {
[exif.ExifIFD.UserComment]: json, [exif.ExifIFD.UserComment]: stringByteArray,
}, },
}; };
const exifString = exif.dump(metadata); const exifString = exif.dump(metadata);
@@ -1521,10 +1547,11 @@ app.post("/exportcharacter", jsonParser, async function (request, response) {
await webp.cwebp(filename, inputWebpPath, '-q 95'); await webp.cwebp(filename, inputWebpPath, '-q 95');
await webp.webpmux_add(inputWebpPath, outputWebpPath, metadataPath, 'exif'); await webp.webpmux_add(inputWebpPath, outputWebpPath, metadataPath, 'exif');
response.sendFile(outputWebpPath, { root: __dirname }); response.sendFile(outputWebpPath, { root: __dirname }, () => {
fs.rmSync(inputWebpPath); fs.rmSync(inputWebpPath);
fs.rmSync(metadataPath); fs.rmSync(metadataPath);
fs.rmSync(outputWebpPath);
});
return; return;
} }