From 67044b362c7e4fced9e1516df02bc2e9fb88e6dc Mon Sep 17 00:00:00 2001
From: Webifi <john@webifi.com>
Date: Mon, 26 Jun 2023 18:07:37 -0500
Subject: [PATCH] Better names for cloned chats and profiles

---
 src/lib/ChatSettingsModal.svelte | 15 +--------------
 src/lib/Storage.svelte           | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/lib/ChatSettingsModal.svelte b/src/lib/ChatSettingsModal.svelte
index 1b54349..99eb213 100644
--- a/src/lib/ChatSettingsModal.svelte
+++ b/src/lib/ChatSettingsModal.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { applyProfile, getDefaultProfileKey, getProfile, getProfileSelect, setSystemPrompt } from './Profiles.svelte'
+  import { applyProfile, getDefaultProfileKey, getProfile, getProfileSelect, newNameForProfile, setSystemPrompt } from './Profiles.svelte'
   import { getChatDefaults, getChatSettingList, getChatSettingObjectByKey, getExcludeFromProfile } from './Settings.svelte'
   import {
     saveChatStore,
@@ -225,19 +225,6 @@
     }
   }
 
-  const newNameForProfile = (name:string):string => {
-    const profiles = getProfileSelect()
-    const nameMap = profiles.reduce((a, p) => { a[p.text] = p; return a }, {})
-    if (!nameMap[name]) return name
-    let i:number = 1
-    let cname = name + `-${i}`
-    while (nameMap[cname]) {
-      i++
-      cname = name + `-${i}`
-    }
-    return cname
-  }
-
   const startNewChat = () => {
     const differentProfile = originalSettings.profile !== chatSettings.profile
     // start new
diff --git a/src/lib/Storage.svelte b/src/lib/Storage.svelte
index 0e23da4..fa08d21 100644
--- a/src/lib/Storage.svelte
+++ b/src/lib/Storage.svelte
@@ -43,11 +43,12 @@
     const chatId = newChatID()
 
     profile = JSON.parse(JSON.stringify(profile || getProfile(''))) as ChatSettings
+    const nameMap = chats.reduce((a, chat) => { a[chat.name] = chat; return a }, {})
 
     // Add a new chat
     chats.push({
       id: chatId,
-      name: `Chat ${chatId}`,
+      name: newName(`Chat ${chatId}`, nameMap),
       settings: profile,
       messages: [],
       usage: {} as Record<Model, Usage>,
@@ -387,12 +388,7 @@
     const chats = get(chatsStorage)
     const chat = chats.find((chat) => chat.id === chatId) as Chat
     const nameMap = chats.reduce((a, chat) => { a[chat.name] = chat; return a }, {})
-    let i:number = 1
-    let cname = chat.name + `-${i}`
-    while (nameMap[cname]) {
-      i++
-      cname = chat.name + `-${i}`
-    }
+    const cname = newName(chat.name, nameMap)
     const chatCopy = JSON.parse(JSON.stringify(chat))
 
     // Set the ID
@@ -557,11 +553,18 @@
 
   export const newName = (name:string, nameMap:Record<string, any>):string => {
     if (!nameMap[name]) return name
+    const nm = name.match(/^(.*[^0-9]+)([- ])*([0-9]+)$/)
     let i:number = 1
-    let cname = name + `-${i}`
+    let s = ' '
+    if (nm) {
+      name = nm[1]
+      s = nm[2] || ''
+      i = parseInt(nm[3])
+    }
+    let cname = `${name}${s}${i}`
     while (nameMap[cname]) {
       i++
-      cname = name + `-${i}`
+      cname = `${name}${s}${i}`
     }
     return cname
   }