Add copy option to move WI entry (#4335) * Add copy option to move WI entry Closes #4334 * Update moveWorldInfoEntry log to indicate copy or move action

f81e14a2e8ce335254e83bf52ec82f4436bbe8e1

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

Signed

Parents: 4d883fec2623efe9baaf63624e5919d1d9558dd6

public/index.html+1 -1 Viewed

                                     </div>
                                 </div>
                             </div>
-                            <i class="menu_button move_entry_button fa-solid fa-right-left" title="Move Entry to Another Lorebook" data-i18n="[title]Move Entry to Another Lorebook"></i>
+                            <i class="menu_button move_entry_button fa-solid fa-right-left" title="Move/Copy Entry to Another Lorebook" data-i18n="[title]Move/Copy Entry to Another Lorebook"></i>
                             <i class="menu_button duplicate_entry_button fa-solid fa-paste" title="Duplicate world info entry" data-i18n="[title]Duplicate world info entry" type="submit" value=""></i>
                             <i class="menu_button delete_entry_button fa-solid fa-trash-can" title="Delete world info entry" data-i18n="[title]Delete world info entry" type="submit" value=""></i>
                         </div>

public/locales/ru-ru.json+2 -2 Viewed

     "Can be used to automatically activate Quick Replies": "Используется для автоматической активации быстрых ответов (Quick Replies)",
     "( None )": "(Отсутствует)",
     "Tie this entry to specific characters or characters with specific tags": "Привязать запись к опред. персонажам или персонажам с заданными тегами",
-    "Move Entry to Another Lorebook": "Переместить запись в другой лорбук",
+    "Move/Copy Entry to Another Lorebook": "Переместить/Скопировать запись в другой лорбук",
     "There are no other lorebooks to move to.": "Некуда перемещать: не найдено других лорбуков.",
     "Select Target Lorebook": "Выберите куда переместить",
-    "Move '${0}' to:": "Переместить '${0}' в:",
+    "Move/Copy '${0}' to:": "Переместить/Скопировать '${0}' в:",
     "Please select a target lorebook.": "Выберите лорбук, в который будет перемещена запись.",
     "Scan depth cannot be negative": "Глубина сканирования не может быть отрицательной",
     "Scan depth cannot exceed ${0}": "Глубина сканирования не может превышать ${0}",

public/locales/zh-tw.json+2 -2 Viewed

     "Delete Persona": "刪除使用者角色",
     "Duplicate Persona": "複製使用者角色",
     "Expand and zoom": "展開並縮放",
-    "Move Entry to Another Lorebook": "將條目移動到其他知識書",
+    "Move/Copy Entry to Another Lorebook": "將條目移動/複製到其他知識書",
     "Persona is locked to the current character": "使用者角色已綁定至目前角色",
     "Persona is locked to the current chat": "使用者角色已綁定至目前聊天",
     "Rename a prompt": "重新命名提示詞",

     "Tie this entry to specific characters or characters with specific tags": "將此項綁定至特定角色或標籤",
     "There are no other lorebooks to move to.": "暫無其他知識書可供移動。",
     "Select Target Lorebook": "選擇目標知識書",
-    "Move '${0}' to:": "將「${0}」移動至：",
+    "Move/Copy '${0}' to:": "將「${0}」移動/複製至：",
     "Please select a target lorebook.": "請選擇目標知識書。",
     "Scan depth cannot be negative": "掃描深度不能為負值",
     "Scan depth cannot exceed ${0}": "掃描深度不能超過 ${0}",

public/scripts/world-info.js+26 -15 Viewed

 import { SlashCommandEnumValue, enumTypes } from './slash-commands/SlashCommandEnumValue.js';
 import { commonEnumProviders, enumIcons } from './slash-commands/SlashCommandCommonEnumsProvider.js';
 import { SlashCommandClosure } from './slash-commands/SlashCommandClosure.js';
-import { callGenericPopup, Popup, POPUP_TYPE } from './popup.js';
+import { callGenericPopup, Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js';
 import { StructuredCloneMap } from './util/StructuredCloneMap.js';
 import { renderTemplateAsync } from './templates.js';
 import { t } from './i18n.js';

             return;
+        }
         const wrapper = document.createElement('div');
-        wrapper.textContent = t`Move '${sourceName}' to:`;
+        wrapper.textContent = t`Move/Copy '${sourceName}' to:`;
         const container = document.createElement('div');
         container.appendChild(wrapper);
         container.appendChild(select);

         select.addEventListener('change', function () {
             selectedWorldIndex = this.value === '' ? -1 : Number(this.value);
         });
-        const popupConfirm = await callGenericPopup(container, POPUP_TYPE.CONFIRM, '', {
+        const popup = new Popup(container, POPUP_TYPE.CONFIRM, '', {
-            okButton: t`Move`,
             cancelButton: t`Cancel`,
+            customButtons: [
+                { text: t`Move`, result: POPUP_RESULT.CUSTOM1 },
+                { text: t`Copy`, result: POPUP_RESULT.CUSTOM2 },
+            ],
         });
+        popup.okButton.style.display = 'none'; // Hide the default OK button
+        const popupConfirm = await popup.show();
         if (!popupConfirm) return;
         if (selectedWorldIndex === -1) return;
         const selectedValue = world_names[selectedWorldIndex];

             toastr.warning(t`Please select a target lorebook.`);
             return;
+        }
-        await moveWorldInfoEntry(sourceWorld, selectedValue, sourceUid);
+        const deleteOriginal = popupConfirm === POPUP_RESULT.CUSTOM1;
+        await moveWorldInfoEntry(sourceWorld, selectedValue, sourceUid, { deleteOriginal });
     });
     let drawerInitialized = false;

  * @param {string} sourceName - The name of the source lorebook file.
  * @param {string} targetName - The name of the target lorebook file.
  * @param {string|number} uid - The UID of the entry to move from the source lorebook.
+ * @param {Object} options - Additional options for the move operation.
+ * @param {boolean} [options.deleteOriginal=true] - Whether to delete the original entry from the source lorebook after moving it.
  * @returns {Promise<boolean>} True if the move was successful, false otherwise.
  */
-export async function moveWorldInfoEntry(sourceName, targetName, uid) {
+export async function moveWorldInfoEntry(sourceName, targetName, uid, { deleteOriginal = true } = {}) {
     if (sourceName === targetName) {
         return false;
+    }

         const entryToMove = structuredClone(sourceData.entries[entryUidString]);
         const newUid = getFreeWorldEntryUid(targetData);
         if (newUid === null) {
             console.error(`[WI Move] Failed to get a free UID in '${targetName}'.`);

         targetData.entries[newUid] = entryToMove;
-        delete sourceData.entries[entryUidString];
+        if (deleteOriginal) {
-        // Remove from originalData if it exists
+            delete sourceData.entries[entryUidString];
-        deleteWIOriginalDataValue(sourceData, entryUidString);
+            // Remove from originalData if it exists
-        // TODO: setWIOriginalDataValue
+            deleteWIOriginalDataValue(sourceData, entryUidString);
-        console.debug(`[WI Move] Removed entry UID ${entryUidString} from source '${sourceName}'.`);
+            // TODO: setWIOriginalDataValue
+            console.debug(`[WI Move] Removed entry UID ${entryUidString} from source '${sourceName}'.`);
+        }
         await saveWorldInfo(targetName, targetData, true);
         console.debug(`[WI Move] Saved target lorebook '${targetName}'.`);
         await saveWorldInfo(sourceName, sourceData, true);
         console.debug(`[WI Move] Saved source lorebook '${sourceName}'.`);
+        console.log(`[WI Move] ${entryToMove.comment} ${deleteOriginal ? 'moved' : 'copied'} successfully to '${targetName}'.`);
-        console.log(`[WI Move] ${entryToMove.comment} moved successfully to '${targetName}'.`);
         // Check if the currently viewed book in the editor is the source or target and reload it
         const currentEditorBookIndex = Number($('#world_editor_select').val());

@@ -5504,6 +5511,10 @@ export async function moveWorldInfoEntry(sourceName, targetName, uid) {
5504	}	5511	}
5505	}	5512	}
5506		5513
		5514	toastr.success(deleteOriginal
		5515	? t`Entry moved successfully from '${sourceName}' to '${targetName}'.`
		5516	: t`Entry copied successfully to '${targetName}'.`);
		5517
5507	return true;	5518	return true;
5508	} catch (error) {	5519	} catch (error) {
5509	toastr.error(t`An unexpected error occurred while moving the entry: ${error.message}`);	5520	toastr.error(t`An unexpected error occurred while moving the entry: ${error.message}`);