feat: load multiple translations

Author: rafael-vasconcellos

modules/gowebview/xlsx.ts

@@ -1,10 +1,10 @@
-export async function QueryTranslation(data: ITextDTO): Promise<ITextDTO> { 
+export async function QueryTranslation(data: ITextDTO) { 
     if ('QueryTranslation' in window) { 
-        const response = await window.QueryTranslation<ITextDTO[]>(data)
+        const response = await window.QueryTranslation<ITextResponseDTO[]>(data)
         if (response?.length) { return response[0] }
     }
 
-    return {} as ITextDTO
+    return {} as any
 }
 
 export async function SaveText(data: ISaveTextDTO) { 

modules/index.ts

@@ -13,7 +13,7 @@ interface IExternalAPI {
     OpenConfigWindow(): Promise<void>
 
     SaveText<T= { error: string } | void>(data: ISaveTextDTO): Promise<T>
-    QueryTranslation<T= ITextDTO>(data: ITextDTO): Promise<T>
+    QueryTranslation<T= ITextResponseDTO>(data: ITextDTO): Promise<T>
 }
 
 interface IPyWebview { 

modules/text.d.ts

@@ -12,3 +12,6 @@ interface ISaveTextDTO extends ITextDTO {
     src_model: string
 }
 
+interface ITextResponseDTO extends ITextDTO { 
+    translatedText: string[]
+}

readme.md

@@ -55,6 +55,7 @@ $ npm run pack
 ## todo
 
 #### finish the webview in go  
+- fix: Update DTO structure
 - add speaker name handler for go xlsx module  
 - hide cmd window for "OpenConfigDir"  
 - fix: remove fatal log from "GetConfig"  

src/components/TextBox/index.tsx

@@ -69,8 +69,8 @@ export default function TextBox( {modelName: model_name, providerKey, index}: IT
         if (global_text().untranslated !== text.untranslated) { 
             setText('untranslated', global_text().untranslated) 
             let translated = global_text().translated
-            if (translated) { 
-                if (index===0) { setText('translated', translated) }
+            if (translated?.length) { 
+                if (index < translated.length) { setText('translated', translated[index]) }
                 else { setText('translated', "") }
 
             } else if (auto_fetch()) { await translate({ save: true }) }

src/global/text.ts

@@ -7,7 +7,7 @@ import { Monitor, WsClient } from "./lib"
 
 export interface IGlobalText { 
     untranslated?: string | null
-    translated?: string | null
+    translated?: string[]
     cached?: boolean
     window_title?: string
 }
@@ -50,7 +50,7 @@ async function onTextChange( {window_title, text}: { window_title: string, text:
         else if (history_texts?.length) { history = history_texts }
 
         if(translatedText) { global_text().translated = translatedText }
-        else if (global_text().translated) { global_text().translated = null }
+        else if (global_text().translated?.length) { global_text().translated = [] }
         if (global_text().untranslated !== text) { 
             global_text().untranslated = text
             setGlobalText({ ...global_text() })

webview/pywebview/xlsx.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Tuple, Optional
+from typing import Dict, List, Tuple, Optional, Union
 import openpyxl, os
 from openpyxl import Workbook
 from openpyxl.worksheet.worksheet import Worksheet
@@ -12,7 +12,8 @@
 workbook: Optional[Workbook] = None
 
 class TextDTO:
-    history: List[str]
+    history: Optional[List[str]]
+    translatedText: Union[None, str, Tuple[str]]
     def __init__(self, DTO: Dict[str, str]):
         self.window_title = DTO["window_title"]
         self.originalText = DTO["originalText"]
@@ -71,8 +72,7 @@ def QueryTranslation(self, textDTO: Dict[str, str]) -> TextDTO:
         entry = queryEntry(textDTO)
         if entry is not None: 
             textDTO.history = get_history(entry)
-            cell = worksheet().cell(row= entry, column=2)
-            textDTO.translatedText = cell.value
+            textDTO.translatedText = list(worksheet()[entry][1:]).reverse()
         elif worksheet() is not None: textDTO.history = get_history(worksheet().max_row+1)
 
         return textDTO.__dict__
@@ -82,7 +82,8 @@ def SaveText(self, textDTO: Dict[str, str]):
         textDTO: TextDTO = TextDTO(textDTO)
         entry = queryEntry(textDTO)
         if entry is not None and worksheet() is not None: 
-            cell = worksheet().cell(row= entry, column=2)
+            row = worksheet()[entry]
+            cell = worksheet().cell(row= entry, column= len(row)-1)
             cell.value = textDTO.translatedText
             cell.comment = Comment(textDTO.speakerName, textDTO.src_model)