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

added tag import back into importCharacter

Browse Source
This commit is contained in:
d-ber 2025-01-06 00:28:38 +01:00
parent c7cbeed9bb
commit 96cd683d0e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/script.js
View File

@ -8856,7 +8856,7 @@ export async function processDroppedFiles(files, data = new Map()) {
const extension = file.name.split('.').pop().toLowerCase(); const extension = file.name.split('.').pop().toLowerCase();
if (allowedMimeTypes.some(x => file.type.startsWith(x)) || allowedExtensions.includes(extension)) { if (allowedMimeTypes.some(x => file.type.startsWith(x)) || allowedExtensions.includes(extension)) {
const preservedName = data instanceof Map && data.get(file); const preservedName = data instanceof Map && data.get(file);
const avatarFileName = await importCharacter(file, preservedName); const avatarFileName = await importCharacter(file, {preserveFileName: preservedName});
if (avatarFileName !== undefined){ if (avatarFileName !== undefined){
avatarFileNames.push(avatarFileName); avatarFileNames.push(avatarFileName);
} }
@ -8865,14 +8865,14 @@ export async function processDroppedFiles(files, data = new Map()) {
} }
} }
await ImportMultipleCharactersTags(avatarFileNames); await ImportCharactersTags(avatarFileNames);
} }
/** /**
* Imports tags for the given characters * Imports tags for the given characters
* @param {string[]} avatarFileNames character avatar filenames whose tags are to import * @param {string[]} avatarFileNames character avatar filenames whose tags are to import
*/ */
async function ImportMultipleCharactersTags(avatarFileNames) { async function ImportCharactersTags(avatarFileNames) {
await getCharacters(); await getCharacters();
const currentContext = getContext(); const currentContext = getContext();
for (let i = 0; i < avatarFileNames.length; i++) { for (let i = 0; i < avatarFileNames.length; i++) {
@ -8886,10 +8886,12 @@ async function ImportMultipleCharactersTags(avatarFileNames) {
/** /**
* Imports a character from a file. * Imports a character from a file.
* @param {File} file File to import * @param {File} file File to import
* @param {string?} preserveFileName Whether to preserve original file name * @param {object} [options] - Options
* @param {string} [options.preserveFileName] Whether to preserve original file name
* @param {Boolean} [options.importTags=false] Whether to import tags
* @returns {Promise<string>} * @returns {Promise<string>}
*/ */
async function importCharacter(file, preserveFileName = '') { async function importCharacter(file, {preserveFileName = '', importTags = false} = {}) {
if (is_group_generating || is_send_press) { if (is_group_generating || is_send_press) {
toastr.error(t`Cannot import characters while generating. Stop the request and try again.`, t`Import aborted`); toastr.error(t`Cannot import characters while generating. Stop the request and try again.`, t`Import aborted`);
throw new Error('Cannot import character while generating'); throw new Error('Cannot import character while generating');
@ -8932,6 +8934,9 @@ async function importCharacter(file, preserveFileName = '') {
select_rm_info('char_import', data.file_name, oldSelectedChar); select_rm_info('char_import', data.file_name, oldSelectedChar);
let avatarFileName = `${data.file_name}.png`; let avatarFileName = `${data.file_name}.png`;
if (importTags) {
ImportCharactersTags([avatarFileName])
}
return avatarFileName; return avatarFileName;
} }
} }
@ -10818,8 +10823,7 @@ jQuery(async function () {
avatarFileNames.push(avatarFileName); avatarFileNames.push(avatarFileName);
} }
} }
await ImportCharactersTags(avatarFileNames);
await ImportMultipleCharactersTags(avatarFileNames);
}); });
$('#export_button').on('click', function () { $('#export_button').on('click', function () {