speed up char import by postponing tag import

c7cbeed9bb1b73ccb011ad2ba5da373837109360

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

Parents: 989f5a8692bc5060fba0c8fac152cd78fef7ad9a

public/script.js+32 -10 Viewed

         'charx',
     ];
 +    const avatarFileNames = [];
     for (const file of files) {
         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);
 +            if (avatarFileName !== undefined){
 +                avatarFileNames.push(avatarFileName);
 +            }
         } else {
             toastr.warning(t`Unsupported file type: ` + file.name);
+        }
+    }
++
 +    await ImportMultipleCharactersTags(avatarFileNames);
 +}
++
 +/**
 + * Imports tags for the given characters
 + * @param {string[]} avatarFileNames character avatar filenames whose tags are to import
 + */
 +async function ImportMultipleCharactersTags(avatarFileNames) {
 +    await getCharacters();
 +    const currentContext = getContext();
 +    for (let i = 0; i < avatarFileNames.length; i++) {
 +        if (power_user.tag_import_setting !== tag_import_setting.NONE) {
 +            const importedCharacter = currentContext.characters.find(character => character.avatar === avatarFileNames[i]);
 +            await importTags(importedCharacter);
 +        }
 +    }
+}
 /**
  * Imports a character from a file.
  * @param {File} file File to import
  * @param {string?} preserveFileName Whether to preserve original file name
  * @returns {Promise<voidstring>}
  */
 async function importCharacter(file, preserveFileName = '') {
     if (is_group_generating || is_send_press) {

@@ -8909,14 +8930,9 @@ async function importCharacter(file, preserveFileName = '') {
8909	8930	oldSelectedChar = characters[this_chid].avatar;
8910	8931	}
8911	8932
8912		- await getCharacters();
8913	8933	select_rm_info('char_import', data.file_name, oldSelectedChar);
8914		- if (power_user.tag_import_setting !== tag_import_setting.NONE) {
	8934	+ let avatarFileName = `${data.file_name}.png`;
8915		- let currentContext = getContext();
	8935	+ return avatarFileName;
8916		- let avatarFileName = `${data.file_name}.png`;
8917		- let importedCharacter = currentContext.characters.find(character => character.avatar === avatarFileName);
8918		- await importTags(importedCharacter);
8919		- }
8920	8936	}
8921	8937	}
8922	8938

             return;
+        }
 +        const avatarFileNames = [];
         for (const file of e.target.files) {
             const avatarFileName = await importCharacter(file);
 +            if (avatarFileName !== undefined){
 +                avatarFileNames.push(avatarFileName);
 +            }
+        }
++
 +        await ImportMultipleCharactersTags(avatarFileNames);
     });
     $('#export_button').on('click', function () {