added tag import back into importCharacter

96cd683d0eb1f772d1c585c8452a6a3bc3bf0fee

d-ber <davide.bertalero@studenti.unimi.it>

public/script.js+11 -7 Viewed

         const extension = file.name.split('.').pop().toLowerCase();
         if (allowedMimeTypes.some(x => file.type.startsWith(x)) || allowedExtensions.includes(extension)) {
             const preservedName = data instanceof Map && data.get(file);
-            const avatarFileName = await importCharacter(file, preservedName);
+            const avatarFileName = await importCharacter(file, {preserveFileName: preservedName});
             if (avatarFileName !== undefined){
                 avatarFileNames.push(avatarFileName);
+            }

@@ -8865,14 +8865,14 @@ export async function processDroppedFiles(files, data = new Map()) {
8865	}	8865	}
8866	}	8866	}
8867		8867
8868	await ImportMultipleCharactersTags(avatarFileNames);	8868	await ImportCharactersTags(avatarFileNames);
8869	}	8869	}
8870		8870
8871	/**	8871	/**
8872	* Imports tags for the given characters	8872	* Imports tags for the given characters
8873	* @param {string[]} avatarFileNames character avatar filenames whose tags are to import	8873	* @param {string[]} avatarFileNames character avatar filenames whose tags are to import
8874	*/	8874	*/
8875	async function ImportMultipleCharactersTags(avatarFileNames) {	8875	async function ImportCharactersTags(avatarFileNames) {
8876	await getCharacters();	8876	await getCharacters();
8877	const currentContext = getContext();	8877	const currentContext = getContext();
8878	for (let i = 0; i < avatarFileNames.length; i++) {	8878	for (let i = 0; i < avatarFileNames.length; i++) {

 /**
  * Imports a character from a file.
  * @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>}
  */
-async function importCharacter(file, preserveFileName = '') {
+async function importCharacter(file, {preserveFileName = '', importTags = false} = {}) {
     if (is_group_generating || is_send_press) {
         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');

@@ -8932,6 +8934,9 @@ async function importCharacter(file, preserveFileName = '') {
8932		8934
8933	select_rm_info('char_import', data.file_name, oldSelectedChar);	8935	select_rm_info('char_import', data.file_name, oldSelectedChar);
8934	let avatarFileName = `${data.file_name}.png`;	8936	let avatarFileName = `${data.file_name}.png`;
		8937	if (importTags) {
		8938	ImportCharactersTags([avatarFileName])
		8939	}
8935	return avatarFileName;	8940	return avatarFileName;
8936	}	8941	}
8937	}	8942	}

@@ -10818,8 +10823,7 @@ jQuery(async function () {
10818	avatarFileNames.push(avatarFileName);	10823	avatarFileNames.push(avatarFileName);
10819	}	10824	}
10820	}	10825	}
10821		10826	await ImportCharactersTags(avatarFileNames);
10822	await ImportMultipleCharactersTags(avatarFileNames);
10823	});	10827	});
10824		10828
10825	$('#export_button').on('click', function () {	10829	$('#export_button').on('click', function () {