Merge branch 'fetch-caching' of https://github.com/daisy/pipeline-ui …

…into fetch-caching
daisy · Nov 8, 2024 · 2e98dd5 · 2e98dd5
2 parents 6c34e68 + 44914f9
commit 2e98dd5
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 22 deletions.
diff --git a/engine b/engine
diff --git a/src/main/data/middlewares/pipeline.ts b/src/main/data/middlewares/pipeline.ts
@@ -443,21 +443,21 @@ export function pipelineMiddleware({ getState, dispatch }) {
                                 // dispatch to sync the properties
                                 // in the engine
                                 dispatch(setProperties(settingsTtsProperties))
-                                return pipelineAPI.fetchTtsVoices(
-                                    selectTtsConfig(getState())
-                                )(newWebservice)
-                            })
-                            .then((voices: Array<TtsVoice>) => {
-                                // console.log('TTS Voices', voices)
-                                dispatch(setTtsVoices(voices))
-                                return pipelineAPI.fetchTtsEnginesState()(
-                                    newWebservice
-                                )
-                            })
-                            .then((states) => {
-                                console.log('tts states', states)
-                                dispatch(setTtsEngineState(states))
+                                // return pipelineAPI.fetchTtsVoices(
+                                //     selectTtsConfig(getState())
+                                // )(newWebservice)
                             })
+                            // .then((voices: Array<TtsVoice>) => {
+                            //     // console.log('TTS Voices', voices)
+                            //     dispatch(setTtsVoices(voices))
+                            //     return pipelineAPI.fetchTtsEnginesState()(
+                            //         newWebservice
+                            //     )
+                            // })
+                            // .then((states) => {
+                            //     //console.log('tts states', states)
+                            //     dispatch(setTtsEngineState(states))
+                            // })
                             .catch((e) => {
                                 error('useWebservice', e, e.parsedText)
                                 if (e instanceof AbortError) {
@@ -667,9 +667,10 @@ export function pipelineMiddleware({ getState, dispatch }) {
                 )
                     //.then(() => pipelineAPI.fetchProperties()(webservice))
                     .then(() => {
-                        // If any of the properties updated is a TTS engine key
-                        // property, reload voice list
-                        if (
+                        // If voices list is not yet initialised
+                        // or any of the properties updated is a TTS engine key
+                        // property, reload voices list when properties are set
+                        if (getState().pipeline.ttsVoices == null ||
                             newProperties.find(
                                 (p) =>
                                     p.name.indexOf('.tts.') >= 0 &&
@@ -749,7 +750,7 @@ export function pipelineMiddleware({ getState, dispatch }) {
                                     )
                                 })
                                 .then((states) => {
-                                    console.log('tts states', states)
+                                    //console.log('tts states', states)
                                     dispatch(setTtsEngineState(states))
                                 })
                         }

diff --git a/src/renderer/components/TtsVoicesConfig/index.tsx b/src/renderer/components/TtsVoicesConfig/index.tsx
@@ -428,7 +428,7 @@ export function TtsVoicesConfigPane({
                                             {
                                                 pipeline.ttsEnginesStates[
                                                     v.engine
-                                                ].name
+                                                ]?.name ?? v.engine
                                             }
                                         </td>
                                         <td>{languageNames.of(v.lang)}</td>

diff --git a/src/renderer/components/TtsVoicesConfig/voiceTransliterations.ts b/src/renderer/components/TtsVoicesConfig/voiceTransliterations.ts
@@ -178,4 +178,17 @@ export const voicesTransliterations = {
     曉臻: '曉臻 (Xiaozhen)',
     雲哲: '雲哲 (Yunzhe)',
     曉雨: '曉雨 (Xiaoy)',
+    "ᓯᕿᓂᖅ": "ᓯᕿᓂᖅ (Siqinic)",
+    "ᑕᖅᑭᖅ": "ᑕᖅᑭᖅ (Taqkic)",
+    "যাশিকা": "যাশিকা (Yashika)",
+    "প্ৰিয়ম": "প্ৰিয়ম (Priyom)",
+    "आरव ": "आरव  (Arav)",
+    "अनन्या": "अनन्या (Ananya)",
+    "काव्या": "काव्या (Kavya)",
+    "कुनाल ": "कुनाल  (Kunal)",
+    "रेहान": "रेहान (Rehan)",
+    "ସୁଭାସିନୀ": "ସୁଭାସିନୀ (Subhasini)",
+    "ସୁକାନ୍ତ": "ସୁକାନ୍ତ (Sukant)",
+    "ਓਜਸ": "ਓਜਸ (Ojas)",
+    "ਵਾਨੀ": "ਵਾਨੀ (Vani)",
 }
diff --git a/src/shared/data/slices/pipeline.ts b/src/shared/data/slices/pipeline.ts
@@ -27,7 +27,7 @@ const initialState = {
     webservice: null,
     scripts: [],
     datatypes: [],
-    ttsVoices: [],
+    ttsVoices: null,
     jobs: [],
     internalJobCounter: 0,
     selectedJobId: '',
@@ -416,7 +416,7 @@ export const selectors = {
         ),
     selectScripts: (state: RootState) => state.pipeline.scripts,
     selectDatatypes: (state: RootState) => state.pipeline.datatypes,
-    selectTtsVoices: (state: RootState) => state.pipeline.ttsVoices,
+    selectTtsVoices: (state: RootState) => state.pipeline.ttsVoices ?? [],
     selectProperties: (state: RootState) => state.pipeline.properties,
     newJob: (pipeline: PipelineState) =>
         ({