fix: Assorted character manager fixes

Author: prima

klite.embd

@@ -5233,7 +5233,7 @@ Current version indicated by LITEVER below.
 					image: b64Url
 				}
 				indexeddb_save(`character_${charName}`, JSON.stringify(dataToSave)).then(() => {
-					allCharacterNames.push({name: charName, thumbnail: dataUrl})
+					allCharacterNames.push({name: charName, thumbnail: dataUrl, type: "Character"})
 					updateCharacterListFromAllDe();
 				})
 			})
@@ -5244,6 +5244,24 @@ Current version indicated by LITEVER below.
 		}
 	}
 
+	function saveLorebookToIndexDB(filename, data)
+	{
+		let charName = filename.replaceAll(/[^\w()_\-'",!\[\].]/g, " ").replaceAll(/\s+/g, " ").trim();
+		let dataToSave = {
+			name: charName,
+			data: data
+		}
+		indexeddb_save(`character_${charName}`, JSON.stringify(dataToSave)).then(() => {
+			allCharacterNames.push({name: charName,	type: "World Info"})
+			updateCharacterListFromAllDe();
+		})
+	}
+
+	function getTypeFromAllCharacterData(data)
+	{
+		return !!data?.type ? data.type : "Character"
+	}
+
 	function convertTavernPng(data, filename) //import tavern png data. adapted from png-chunks-extract under MIT license
 	{
 		//accepts png input data, and returns the extracted JSON
@@ -24180,7 +24198,7 @@ Current version indicated by LITEVER below.
 	function getImageUrlFromCharacter(characterName)
 	{
 		let charData = allCharacterNames.find(c => c.name === characterName)
-		if (charData !== undefined)
+		if (charData !== undefined && charData?.thumbnail !== undefined)
 		{
 			let charName = characterName.replaceAll(/[^\w]/g, "_"), id = `style_image_${charName}`;
 			let varName = `--img_character_${charName}`
@@ -37260,7 +37278,9 @@ flowchart TD\n${treeToViewOutput.outputText.trim()}`
 	#popupContainer .popupContent
 	{
 		overflow-y: auto;
+		overflow-x: hidden;
 		height: calc(100% - 40px);
+		width: 70vw;
 	}
 
 	#popupContainer .popupfooter button
@@ -37385,50 +37405,95 @@ flowchart TD\n${treeToViewOutput.outputText.trim()}`
 	})
 
 	let showCharacterList = async () => {
-		let container = document.createElement("div");
-		container.classList.add("fillContainer", "autoGrid")
-		container.style.width = "70vw"
-		container.style.overflowX = "hidden"
-		if (allCharacterNames.length === 0)
-		{
+		let containers = []
+
+		let createIcon = (name, image) => {
 			let charIcon = document.createElement("span");
-			charIcon.innerText = "No characters added yet";
-			charIcon.style.color = "white";
+			let charText = document.createElement("b");
+			charIcon.classList.add("containAndScaleImage", "tile")
+			charIcon.style.backgroundImage = !!image ? image : "var(--img_esobold)"
+			charIcon.title = name
+			charText.innerText = name
+			charIcon.appendChild(charText)
+			return charIcon
+		}
+		let getContainerForType = (containerName) => {
+			let containerNameAsClass = containerName.replaceAll(/\s/g, "_")
+			let existingContainer = containers.find(container => container.classList.contains(containerNameAsClass));
+			if (!!existingContainer)
+			{
+				return existingContainer;	
+			}
+
+			let container = document.createElement("div");
+			container.classList.add("autoGrid")
+			container.style.overflowX = "hidden"
+			container.style.border = "lightcoral"
+			container.style.borderStyle = "dashed"
+			container.style.marginBottom = "10px"
+			container.classList.add(containerNameAsClass)
+			containers.push(container)
+
+			let charIcon = createIcon(containerName, "var(--img_load)")
 			container.appendChild(charIcon);
+			return container
+		}
+		
+		if (allCharacterNames.length === 0)
+		{
+			let charIcon = createIcon("No characters added yet")
+			getContainerForType("Character").appendChild(charIcon);
 		}
 		else
 		{
 			for (let i = 0; i < allCharacterNames.length; i++)
 			{
-				let {name, thumbnail} = allCharacterNames[i];
-				let charIcon = document.createElement("span");
-				let charText = document.createElement("b");
-				charIcon.classList.add("containAndScaleImage", "tile")
-				charIcon.style.backgroundImage = `url(${thumbnail})`
-				charIcon.title = name
-				charText.innerText = name
+				let {name, thumbnail} = allCharacterNames[i], type = getTypeFromAllCharacterData(allCharacterNames[i]);
+				let charIcon = createIcon(name, !!thumbnail ? `url(${thumbnail})` : undefined)
 				charIcon.onclick = () => {
-					popupUtils.reset().title("Character Options").button("Load character", async () => {
-						popupUtils.reset()
-						let charData = await getCharacterData(name)
-						load_tavern_obj(charData.data);
-					}).button("Add character to WI", async () => {
-						popupUtils.reset()
-						let charData = await getCharacterData(name)
-						let wiToAdd = importCharacterCardAsWIInternal(charData.data);
-						current_wi = current_wi.filter(wi => wi?.folder !== name)
-						current_wi.push(...wiToAdd)
-					}).button("Delete character", async () => {
+					if (type === "Character")
+					{
+						popupUtils.reset().title("Character Options").button("Load character", async () => {
+							popupUtils.reset()
+							let charData = await getCharacterData(name)
+							load_tavern_obj(charData.data);
+						}).button("Add character to WI", async () => {
+							popupUtils.reset()
+							let charData = await getCharacterData(name)
+							let wiToAdd = importCharacterCardAsWIInternal(charData.data);
+							current_wi = current_wi.filter(wi => wi?.folder !== name)
+							current_wi.push(...wiToAdd)
+						}).button("Delete character", async () => {
+							popupUtils.reset()
+							allCharacterNames = allCharacterNames.filter(c => c.name !== name)
+							updateCharacterListFromAll()
+						}).button("Close", () => popupUtils.reset()).show();
+					}
+					else if (type === "World Info")
+					{
+						popupUtils.reset().title("World Info Options").button("Add to WI", async () => {
+							popupUtils.reset()
+							let charData = await getCharacterData(name)
+							let wiToAdd = charData.data;
+							current_wi = current_wi.filter(wi => wi?.folder !== name)
+							current_wi.push(...wiToAdd)
+						}).button("Delete world info", async () => {
+							popupUtils.reset()
+							allCharacterNames = allCharacterNames.filter(c => c.name !== name)
+							updateCharacterListFromAll()
+						}).button("Close", () => popupUtils.reset()).show();
+					}
+					else
+					{
 						popupUtils.reset()
-						allCharacterNames = allCharacterNames.filter(c => c.name !== name)
-						updateCharacterListFromAll()
-					}).button("Close", () => popupUtils.reset()).show();
+					}
 				}
-				charIcon.appendChild(charText)
-				container.appendChild(charIcon)
+				getContainerForType(type).appendChild(charIcon)
 			}
 		}
-		popupUtils.reset().title("Character List").content(container).button("Upload characters", () => {
+		popupUtils.reset().title(`Character List (${allCharacterNames.length})`)
+		containers.forEach(container => popupUtils.content(container))
+		popupUtils.button("Upload characters, lorebooks and world info", () => {
 			popupUtils.reset()
 			promptUserForLocalFile(async (result) => {
 				let { file, fileName, ext, content, plaintext, dataArr } = result;
@@ -37438,12 +37503,34 @@ flowchart TD\n${treeToViewOutput.outputText.trim()}`
 				{
 					let arr = new Uint8Array(dataArr)
 					let res = convertTavernPng(arr)
-					if (!res)
+				}
+				else if (ext === ".webp")
+				{
+					let arr = new Uint8Array(dataArr)
+					getTavernExifJSON(arr)
+				}
+				else
+				{
+					let wiToAdd = JSON.parse(plaintext);
+					let has_tav_wi_check = has_tavern_wi_check(wiToAdd);
+					if(has_tav_wi_check)
+					{
+						wiToAdd = load_tavern_wi(wiToAdd);
+						if(wiToAdd && wiToAdd.length > 0)
+						{
+							wiToAdd.forEach(wi => wi.wigroup = fileName.replace("'", ""))
+						}
+					}
+					if (Array.isArray(wiToAdd))
 					{
-						getTavernExifJSON(arr)
+						wiToAdd = wiToAdd.filter(wi => wi?.key !== undefined)
+						if (wiToAdd.length > 0)
+						{
+							saveLorebookToIndexDB(fileName, wiToAdd)
+						}
 					}
 				}
-			}, [".png", ".webp"], true)
+			}, [".png", ".webp", ".json"], true)
 		}).button("Delete all characters", async () => {
 			popupUtils.reset()
 			waitingToast.show()