fix: Assorted character manager fixes

Author: prima

klite.embd

@@ -5187,6 +5187,7 @@ Current version indicated by LITEVER below.
 
 	function updateCharacterListFromAll()
 	{
+		allCharacterNames = allCharacterNames.filter((elem, pos, arr) => arr.findIndex(searchElem => searchElem.name === elem.name) === pos).sort((a, b) => a.name > b.name ? 1 : -1)
 		indexeddb_save("characterList", JSON.stringify(allCharacterNames)).then(() => {
 			waitingToast.hide()
 		})
@@ -5203,7 +5204,47 @@ Current version indicated by LITEVER below.
 	}
 	let updateCharacterListFromAllDe = debounce(updateCharacterListFromAll, 5000);
 
-	function convertTavernPng(data) //import tavern png data. adapted from png-chunks-extract under MIT license
+	
+	// https://stackoverflow.com/questions/12710001/how-to-convert-uint8-array-to-base64-encoded-string
+	async function bufferToBase64(buffer) {
+		// use a FileReader to generate a base64 data URI:
+		const base64url = await new Promise(r => {
+			const reader = new FileReader()
+			reader.onload = () => r(reader.result)
+			reader.readAsDataURL(new Blob([buffer]))
+		});
+		// remove the `data:...;base64,` part from the start
+		return base64url.slice(base64url.indexOf(',') + 1);
+	}
+
+	function saveCharacterDataToIndexDB(data, decoded, filename)
+	{
+		try
+		{
+			bufferToBase64(data).then(async (b64) => {
+				b64Url = `data:image/png;base64,${b64}`
+				let charData = !!decoded?.data ? decoded.data : decoded;
+				let rawName = !!charData?.name ? charData?.name : (!!filename ? filename : "No character name"), charName = rawName.replaceAll(/[^\w()_\-'",!\[\].]/g, " ").replaceAll(/\s+/g, " ").trim();
+				charData.name = charName;
+				let dataUrl = await generateThumbnail(b64Url, [256, 256])
+				let dataToSave = {
+					name: charName,
+					data: charData,
+					image: b64Url
+				}
+				indexeddb_save(`character_${charName}`, JSON.stringify(dataToSave)).then(() => {
+					allCharacterNames.push({name: charName, thumbnail: dataUrl})
+					updateCharacterListFromAllDe();
+				})
+			})
+		}
+		catch (e)
+		{
+			console.error(e)
+		}
+	}
+
+	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
 		console.log("Attempting PNG import...");
@@ -5316,48 +5357,15 @@ Current version indicated by LITEVER below.
 				}
 				var decoded = JSON.parse(b64_decode_unicode(b64buf));
 				console.log(decoded);
-				try
-				{
-					// https://stackoverflow.com/questions/12710001/how-to-convert-uint8-array-to-base64-encoded-string
-					async function bufferToBase64(buffer) {
-						// use a FileReader to generate a base64 data URI:
-						const base64url = await new Promise(r => {
-							const reader = new FileReader()
-							reader.onload = () => r(reader.result)
-							reader.readAsDataURL(new Blob([buffer]))
-						});
-						// remove the `data:...;base64,` part from the start
-						return base64url.slice(base64url.indexOf(',') + 1);
-					}
-
-					bufferToBase64(data).then(async (b64) => {
-						b64Url = `data:image/png;base64,${b64}`
-						let charData = !!decoded?.data ? decoded.data : decoded, charName = charData.name;
-						let dataUrl = await generateThumbnail(b64Url, [256, 256])
-						let dataToSave = {
-							name: charName,
-							data: charData,
-							image: b64Url
-						}
-						indexeddb_save(`character_${charName}`, JSON.stringify(dataToSave)).then(() => {
-							allCharacterNames.push({name: charName, thumbnail: dataUrl})
-							updateCharacterListFromAllDe();
-						})
-					})
-					
-				}
-				catch (e)
-				{
-					console.error(e)
-				}
+				saveCharacterDataToIndexDB(data, decoded, filename)
 				return decoded;
 			} catch (e) {
 				console.log("Error decoding b64 in image: " + e);
 				return null;
 			}
 		}
 	}
-	function getTavernExifJSON(data) //a hacky exif reader for new tavernai format
+	function getTavernExifJSON(data, filename) //a hacky exif reader for new tavernai format
 	{
 		console.log("Attempting WEBP import...");
 		var uint8 = new Uint8Array(4);
@@ -5421,6 +5429,7 @@ Current version indicated by LITEVER below.
 						try {
 							var decoded = JSON.parse(readtxt);
 							console.log(decoded);
+							saveCharacterDataToIndexDB(data, decoded, filename)
 							return decoded;
 						} catch (e) {
 							console.log("Error decoding webp txt: " + e);
@@ -8159,15 +8168,15 @@ Current version indicated by LITEVER below.
 					}
 
 					// 1. Try Tavern PNG
-					let result = convertTavernPng(arr);
+					let result = convertTavernPng(arr, selectedFile.name);
 					if (result) {
 						load_tavern_obj(result);
 						setImgAsAvatar(data);
 						return;
 					}
 
 					// 2. Try Tavern EXIF
-					result = getTavernExifJSON(arr);
+					result = getTavernExifJSON(arr, selectedFile.name);
 					if (result) {
 						load_tavern_obj(result);
 						setImgAsAvatar(data);
@@ -23433,10 +23442,10 @@ Current version indicated by LITEVER below.
 		saveFileGeneric('world_info', fdata, 'application/json');
 	}
 
-	function importCharacterCardAsWI(data) {
+	function importCharacterCardAsWI(data, fileName) {
 		let arr = new Uint8Array(data)
 
-		let tavernData = convertTavernPng(arr)
+		let tavernData = convertTavernPng(arr, fileName)
 		return importCharacterCardAsWIInternal(tavernData)
 	}
 
@@ -23494,7 +23503,7 @@ Current version indicated by LITEVER below.
 				let wiToAdd = []
 				if (ext === ".png")
 				{
-					wiToAdd = importCharacterCardAsWI(dataArr)
+					wiToAdd = importCharacterCardAsWI(dataArr, fileName)
 				}
 				else
 				{
@@ -24191,8 +24200,15 @@ Current version indicated by LITEVER below.
 
 	function getImageForSource(source, name)
 	{
-		if (name === undefined)
+		if (name === "User")
+		{
+			name = localsettings?.chatname
+		}
+		if (name === "KoboldAI")
 		{
+			name = localsettings?.chatopponent?.split("||$||")[0]
+		}
+		if (name === undefined) {
 			return undefined;
 		}
 		let imageFromIndexDB = getImageUrlFromCharacter(name)
@@ -37421,9 +37437,21 @@ flowchart TD\n${treeToViewOutput.outputText.trim()}`
 				if (ext === ".png")
 				{
 					let arr = new Uint8Array(dataArr)
-					convertTavernPng(arr)
+					let res = convertTavernPng(arr)
+					if (!res)
+					{
+						getTavernExifJSON(arr)
+					}
 				}
-			}, [".png"], true)
+			}, [".png", ".webp"], true)
+		}).button("Delete all characters", async () => {
+			popupUtils.reset()
+			waitingToast.show()
+			waitingToast.setText(`Deleting all characters`)
+			await Promise.all(allCharacterNames.map(elem => indexeddb_save(`character_${elem.name}`, {})))
+			allCharacterNames = []
+			await updateCharacterListFromAll()
+			waitingToast.hide()
 		}).button("Close", () => popupUtils.reset()).show();
 	}
 </script>