Merge pull request #3967 from gakada/regex Regex: allow multiple definitions in a single file

1b5a11206fffe3c924a375089086cea654abf3ab

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: a6928289b352449d63c83665ba100039a6e0f9a8 523cc36b4667be590d03528c5b77aff77cd5b00c

public/scripts/extensions/regex/dropdown.html+23 -0 Viewed

                     <small data-i18n="ext_regex_import_script">Import</small>
                 </div>
                 <input type="file" id="import_regex_file" hidden accept="*.json" multiple />
 +                <label for="regex_bulk_edit" class="menu_button menu_button_icon">
 +                    <input id="regex_bulk_edit" type="checkbox" class="displayNone" />
 +                    <i class="fa-solid fa-edit"></i>
 +                    <small data-i18n="ext_regex_bulk_edit">Bulk Edit</small>
 +                </label>
 +            </div>
 +            <div class="regex_bulk_operations flex-container justifyCenter">
 +                <div id="bulk_enable_regex" class="menu_button menu_button_icon">
 +                    <i class="fa-solid fa-toggle-on"></i>
 +                    <small data-i18n="Enable">Enable</small>
 +                </div>
 +                <div id="bulk_disable_regex" class="menu_button menu_button_icon">
 +                    <i class="fa-solid fa-toggle-off"></i>
 +                    <small data-i18n="Disable">Disable</small>
 +                </div>
 +                <div id="bulk_export_regex" class="menu_button menu_button_icon">
 +                    <i class="fa-solid fa-file-export"></i>
 +                    <small data-i18n="Export">Export</small>
 +                </div>
 +                <div id="bulk_delete_regex" class="menu_button menu_button_icon">
 +                    <i class="fa-solid fa-trash"></i>
 +                    <small data-i18n="Delete">Delete</small>
 +                </div>
             </div>
             <hr />
             <div id="global_scripts_block" class="padding5">

public/scripts/extensions/regex/index.js+96 -11 Viewed

 import { t } from '../../i18n.js';
 import { accountStorage } from '../../util/AccountStorage.js';
 +const sanitizeFileName = name => name.replace(/[\s.<>:"/\\|?*\x00-\x1F\x7F]/g, '_').toLowerCase();
++
 /**
  * @typedef {import('../../char-data.js').RegexScriptData} RegexScript
  */

             await saveRegexScript(script, -1, true);
         });
         scriptHtml.find('.export_regex').on('click', async function () {
 -            const fileName = `${script.scriptName.replace(/[\s.<>:"/\\|?*\x00-\x1F\x7F]/g, '_').toLowerCase()}.json`;
 +            const fileName = `regex-${sanitizeFileName(script.scriptName)}.json`;
             const fileData = JSON.stringify(script, null, 4);
             download(fileData, fileName, 'application/json');
         });

+}
 /**
  * Performs the import of the regex fileobject.
  * @param {FileObject} fileregexScript Input fileobject
  * @param {boolean} isScoped Is the script scoped to a character?
  */
 async function onRegexImportFileChangeonRegexImportObjectChange(fileregexScript, isScoped) {
 -    if (!file) {
 -        toastr.error('No file provided.');
 -        return;
 -    }
+-
     try {
 -        const fileText = await getFileText(file);
 -        const regexScript = JSON.parse(fileText);
         if (!regexScript.scriptName) {
             throw new Error('No script name provided.');
+        }

         toastr.success(`Regex script "${regexScript.scriptName}" imported.`);
     } catch (error) {
         console.log(error);
 +        toastr.error('Invalid regex object.');
 +        return;
 +    }
 +}
++
 +/**
 + * Performs the import of the regex file.
 + * @param {File} file Input file
 + * @param {boolean} isScoped Is the script scoped to a character?
 + */
 +async function onRegexImportFileChange(file, isScoped) {
 +    if (!file) {
 +        toastr.error('No file provided.');
 +        return;
 +    }
++
 +    try {
 +        const regexScripts = JSON.parse(await getFileText(file));
 +        if (Array.isArray(regexScripts)) {
 +            for (const regexScript of regexScripts) {
 +                await onRegexImportObjectChange(regexScript, isScoped);
 +            }
 +        } else {
 +            await onRegexImportObjectChange(regexScripts, isScoped);
 +        }
 +    } catch (error) {
 +        console.log(error);
         toastr.error('Invalid JSON file.');
         return;
+    }

         $('#import_regex_file').trigger('click');
     });
 +    function getSelectedScripts() {
 +        const scripts = getRegexScripts();
 +        const selector = '#regex_container .regex-script-label:has(.regex_bulk_checkbox:checked)';
 +        const selectedIds = Array.from(document.querySelectorAll(selector)).map(e => e.getAttribute('id')).filter(id => id);
 +        return scripts.filter(script => selectedIds.includes(script.id));
 +    }
++
 +    $('#bulk_enable_regex').on('click', async function () {
 +        const scripts = getSelectedScripts().filter(script => script.disabled);
 +        if (scripts.length === 0) {
 +            toastr.warning(t`No regex scripts selected for enabling.`);
 +            return;
 +        }
 +        for (const script of scripts) {
 +            script.disabled = false;
 +        }
 +        saveSettingsDebounced();
 +        await loadRegexScripts();
 +    });
++
 +    $('#bulk_disable_regex').on('click', async function () {
 +        const scripts = getSelectedScripts().filter(script => !script.disabled);
 +        if (scripts.length === 0) {
 +            toastr.warning(t`No regex scripts selected for disabling.`);
 +            return;
 +        }
 +        for (const script of scripts) {
 +            script.disabled = true;
 +        }
 +        saveSettingsDebounced();
 +        await loadRegexScripts();
 +    });
++
 +    $('#bulk_delete_regex').on('click', async function () {
 +        const scripts = getSelectedScripts();
 +        if (scripts.length === 0) {
 +            toastr.warning(t`No regex scripts selected for deletion.`);
 +            return;
 +        }
 +        const confirm = await callGenericPopup('Are you sure you want to delete the selected regex scripts?', POPUP_TYPE.CONFIRM);
 +        if (!confirm) {
 +            return;
 +        }
 +        for (const script of scripts) {
 +            const isScoped = characters[this_chid]?.data?.extensions?.regex_scripts?.some(s => s.id === script.id);
 +            await deleteRegexScript({ id: script.id, isScoped: isScoped });
 +        }
 +        await reloadCurrentChat();
 +        saveSettingsDebounced();
 +    });
++
 +    $('#bulk_export_regex').on('click', async function () {
 +        const scripts = getSelectedScripts();
 +        if (scripts.length === 0) {
 +            toastr.warning(t`No regex scripts selected for export.`);
 +            return;
 +        }
 +        const fileName = `regex-${new Date().toISOString()}.json`;
 +        const fileData = JSON.stringify(scripts, null, 4);
 +        download(fileData, fileName, 'application/json');
 +        await loadRegexScripts();
 +    });
++
     let sortableDatas = [
+        {
             selector: '#saved_regex_scripts',

public/scripts/extensions/regex/scriptTemplate.html+1 -0 Viewed

 <div class="regex-script-label flex-container flexnowrap">
 +    <input type="checkbox" class="regex_bulk_checkbox" />
     <span class="drag-handle menu-handle">&#9776;</span>
     <div class="regex_script_name flexGrow overflow-hidden"></div>
     <div class="flex-container flexnowrap">

public/scripts/extensions/regex/style.css+23 -1 Viewed

+}
 .regex-script-label {
     align-items: centerbaseline;
     border: 1px solid var(--SmartThemeBorderColor);
     border-radius: 10px;
     padding: 0 5px;

     right: 10px;
     transform: translateY(-50%);
+}
++
 +.regex_settings label[for="regex_bulk_edit"]:has(#regex_bulk_edit:checked) {
 +    color: var(--golden);
 +}
++
 +.regex_settings .regex-script-container .regex-script-label .regex_bulk_checkbox {
 +    margin-left: 5px;
 +    margin-right: 5px;
 +}
++
 +.regex_settings .regex_bulk_operations,
 +.regex_settings .regex_bulk_checkbox {
 +    display: none;
 +}
++
 +.regex_settings:has(#regex_bulk_edit:checked) .regex_bulk_operations {
 +    display: flex;
 +}
++
 +.regex_settings:has(#regex_bulk_edit:checked) .regex_bulk_checkbox {
 +    display: inline-grid;
 +}