Skip to content

Commit 2965484

Browse files
Wurielleactions-user
Wurielle
authored and
actions-user
committed
style: prettier formatting
1 parent 5ea794e commit 2965484

File tree

3 files changed

+141
-128
lines changed

3 files changed

+141
-128
lines changed

‎apps/app/src/plugins/speech-engines/google-cloud/NvSettings.vue

Lines changed: 76 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,122 @@
11
<template>
22
<NvAccessBlocker
3-
:allowed="
4-
(speechStore.hasUniversalApiCredentials && !getProperty('useLocalCredentials')) ||
3+
:allowed="
4+
(speechStore.hasUniversalApiCredentials &&
5+
!getProperty('useLocalCredentials')) ||
56
!!getProperty('apiKey', true)
67
"
7-
reason="Credentials required"
8+
reason="Credentials required"
89
>
910
<NvStack spacing="5">
1011
<NvFormItem label="Voice">
11-
<NvVoiceSelect/>
12+
<NvVoiceSelect />
1213
</NvFormItem>
13-
<NvDivider direction="horizontal"/>
14+
<NvDivider direction="horizontal" />
1415
<NvFormItem label="Speaking Rate">
1516
<NvGroup>
1617
<NvRangeInput
17-
:max="4"
18-
:min="0.25"
19-
:step=".01"
20-
class="!grow"
21-
v-bind="{
22-
modelValue: getProperty('speakingRate'),
23-
'onUpdate:modelValue': (value) => setProperty('speakingRate', value),
24-
}"
18+
:max="4"
19+
:min="0.25"
20+
:step="0.01"
21+
class="!grow"
22+
v-bind="{
23+
modelValue: getProperty('speakingRate'),
24+
'onUpdate:modelValue': (value) =>
25+
setProperty('speakingRate', value),
26+
}"
2527
/>
2628
<NvNumberInput
27-
:max="4"
28-
:min="0.25"
29-
:step=".01"
30-
v-bind="{
31-
modelValue: getProperty('speakingRate'),
32-
'onUpdate:modelValue': (value) => setProperty('speakingRate', value),
33-
}"
29+
:max="4"
30+
:min="0.25"
31+
:step="0.01"
32+
v-bind="{
33+
modelValue: getProperty('speakingRate'),
34+
'onUpdate:modelValue': (value) =>
35+
setProperty('speakingRate', value),
36+
}"
3437
/>
3538
</NvGroup>
3639
</NvFormItem>
37-
<NvDivider direction="horizontal"/>
40+
<NvDivider direction="horizontal" />
3841
<NvFormItem label="Pitch">
3942
<NvGroup>
4043
<NvRangeInput
41-
:max="20"
42-
:min="-20"
43-
:step=".1"
44-
class="!grow"
45-
v-bind="{
46-
modelValue: getProperty('pitch'),
47-
'onUpdate:modelValue': (value) => setProperty('pitch', value),
48-
}"
44+
:max="20"
45+
:min="-20"
46+
:step="0.1"
47+
class="!grow"
48+
v-bind="{
49+
modelValue: getProperty('pitch'),
50+
'onUpdate:modelValue': (value) => setProperty('pitch', value),
51+
}"
4952
/>
5053
<NvNumberInput
51-
:max="20"
52-
:min="-20"
53-
:step=".1"
54-
v-bind="{
55-
modelValue: getProperty('pitch'),
56-
'onUpdate:modelValue': (value) => setProperty('pitch', value),
57-
}"
54+
:max="20"
55+
:min="-20"
56+
:step="0.1"
57+
v-bind="{
58+
modelValue: getProperty('pitch'),
59+
'onUpdate:modelValue': (value) => setProperty('pitch', value),
60+
}"
5861
/>
5962
</NvGroup>
6063
</NvFormItem>
61-
<NvDivider direction="horizontal"/>
64+
<NvDivider direction="horizontal" />
6265
<NvFormItem label="Volume Gain (Db)">
6366
<NvGroup>
6467
<NvRangeInput
65-
:max="16"
66-
:min="-96"
67-
:step=".1"
68-
class="!grow"
69-
v-bind="{
70-
modelValue: getProperty('volumeGainDb'),
71-
'onUpdate:modelValue': (value) => setProperty('volumeGainDb', value),
72-
}"
68+
:max="16"
69+
:min="-96"
70+
:step="0.1"
71+
class="!grow"
72+
v-bind="{
73+
modelValue: getProperty('volumeGainDb'),
74+
'onUpdate:modelValue': (value) =>
75+
setProperty('volumeGainDb', value),
76+
}"
7377
/>
7478
<NvNumberInput
75-
:max="20"
76-
:min="-20"
77-
:step=".1"
78-
v-bind="{
79-
modelValue: getProperty('volumeGainDb'),
80-
'onUpdate:modelValue': (value) => setProperty('volumeGainDb', value),
81-
}"
79+
:max="20"
80+
:min="-20"
81+
:step="0.1"
82+
v-bind="{
83+
modelValue: getProperty('volumeGainDb'),
84+
'onUpdate:modelValue': (value) =>
85+
setProperty('volumeGainDb', value),
86+
}"
8287
/>
8388
</NvGroup>
8489
</NvFormItem>
8590
</NvStack>
8691
</NvAccessBlocker>
8792
<template v-if="speechStore.hasUniversalApiCredentials">
88-
<NvDivider direction="horizontal"/>
93+
<NvDivider direction="horizontal" />
8994
<NvGroup justify="apart" no-wrap spacing="5">
9095
<NvStack>
9196
<NvText type="label">Use my own credentials</NvText>
9297
</NvStack>
9398
<NvSwitch
94-
:modelValue="getProperty('useLocalCredentials')"
95-
@update:modelValue="(value) => setProperty('useLocalCredentials', value)"
99+
:modelValue="getProperty('useLocalCredentials')"
100+
@update:modelValue="
101+
(value) => setProperty('useLocalCredentials', value)
102+
"
96103
/>
97104
</NvGroup>
98105
</template>
99-
<template v-if="getProperty('useLocalCredentials') || !speechStore.hasUniversalApiCredentials">
100-
<NvDivider direction="horizontal"/>
106+
<template
107+
v-if="
108+
getProperty('useLocalCredentials') ||
109+
!speechStore.hasUniversalApiCredentials
110+
"
111+
>
112+
<NvDivider direction="horizontal" />
101113
<NvStack spacing="5">
102114
<NvFormItem label="API Key">
103115
<NvInput
104-
:modelValue="getProperty('apiKey', true)"
105-
show-password
106-
type="password"
107-
@update:modelValue="(value) => setProperty('apiKey', value, true)"
116+
:modelValue="getProperty('apiKey', true)"
117+
show-password
118+
type="password"
119+
@update:modelValue="(value) => setProperty('apiKey', value, true)"
108120
/>
109121
</NvFormItem>
110122
</NvStack>
@@ -116,7 +128,9 @@ import {
116128
NvDivider,
117129
NvFormItem,
118130
NvGroup,
119-
NvInput, NvNumberInput, NvRangeInput,
131+
NvInput,
132+
NvNumberInput,
133+
NvRangeInput,
120134
NvStack,
121135
NvSwitch,
122136
NvText,

‎apps/app/src/plugins/speech-engines/google-cloud/register.ts

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -8,63 +8,62 @@ import { ENGINE_ID, ENGINE_NAME, getVoiceName } from './shared'
88
import { getProperty, setProperty } from './store'
99

1010
const getCredentials = () => ({
11-
apiKey: getProperty('apiKey', true),
11+
apiKey: getProperty('apiKey', true),
1212
})
1313

1414
const getSelectedVoice = () => getProperty('selectedVoice')
1515
registerEngine({
16-
id: ENGINE_ID,
17-
name: ENGINE_NAME,
18-
category: 'cloud',
19-
getSelectedVoice,
20-
getVoiceName,
21-
getCredentials,
22-
hasCredentials() {
23-
const speechStore = useSpeechStore()
24-
return (
25-
speechStore.hasUniversalApiCredentials ||
26-
Object.values(getCredentials()).every(Boolean)
27-
)
28-
},
29-
getPayload({ text, translatedText, voice: v }) {
30-
const selectedVoice = getSelectedVoice()
31-
const voice: any = pick(v || selectedVoice, [
32-
'name',
33-
'ssmlGender',
34-
'languageCode',
35-
])
36-
// eslint-disable-next-line prefer-destructuring
37-
voice.languageCode = selectedVoice.languageCodes[0]
38-
return {
39-
input: {
40-
text: translatedText || text,
41-
},
42-
voice,
43-
audioConfig: {
44-
audioEncoding: 'LINEAR16',
45-
speakingRate: Number(getProperty('speakingRate')),
46-
pitch: Number(getProperty('pitch')),
47-
volumeGainDb: Number(getProperty('volumeGainDb')),
48-
49-
},
50-
}
51-
},
52-
getLanguageCode(voice) {
53-
return (voice || getSelectedVoice()).languageCodes[0]
54-
},
55-
synthesizeSpeech({ credentials, payload }) {
56-
return api(
57-
getProperty('useLocalCredentials') ? 'local' : 'remote',
58-
).post<Blob>(
59-
'/tts/google-cloud/synthesize-speech',
60-
{
61-
credentials,
62-
payload,
63-
},
64-
{ responseType: 'blob' },
65-
)
66-
},
67-
voiceSelectComponent: NvVoiceSelect,
68-
settingsComponent: NvSettings,
69-
store: { setProperty, getProperty },
16+
id: ENGINE_ID,
17+
name: ENGINE_NAME,
18+
category: 'cloud',
19+
getSelectedVoice,
20+
getVoiceName,
21+
getCredentials,
22+
hasCredentials() {
23+
const speechStore = useSpeechStore()
24+
return (
25+
speechStore.hasUniversalApiCredentials ||
26+
Object.values(getCredentials()).every(Boolean)
27+
)
28+
},
29+
getPayload({ text, translatedText, voice: v }) {
30+
const selectedVoice = getSelectedVoice()
31+
const voice: any = pick(v || selectedVoice, [
32+
'name',
33+
'ssmlGender',
34+
'languageCode',
35+
])
36+
// eslint-disable-next-line prefer-destructuring
37+
voice.languageCode = selectedVoice.languageCodes[0]
38+
return {
39+
input: {
40+
text: translatedText || text,
41+
},
42+
voice,
43+
audioConfig: {
44+
audioEncoding: 'LINEAR16',
45+
speakingRate: Number(getProperty('speakingRate')),
46+
pitch: Number(getProperty('pitch')),
47+
volumeGainDb: Number(getProperty('volumeGainDb')),
48+
},
49+
}
50+
},
51+
getLanguageCode(voice) {
52+
return (voice || getSelectedVoice()).languageCodes[0]
53+
},
54+
synthesizeSpeech({ credentials, payload }) {
55+
return api(
56+
getProperty('useLocalCredentials') ? 'local' : 'remote',
57+
).post<Blob>(
58+
'/tts/google-cloud/synthesize-speech',
59+
{
60+
credentials,
61+
payload,
62+
},
63+
{ responseType: 'blob' },
64+
)
65+
},
66+
voiceSelectComponent: NvVoiceSelect,
67+
settingsComponent: NvSettings,
68+
store: { setProperty, getProperty },
7069
})

‎apps/app/src/plugins/speech-engines/google-cloud/store.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import { definePluginStore } from '@/store'
22
import { ENGINE_ID } from './shared'
33

44
export const { setProperty, getProperty } = definePluginStore(ENGINE_ID, {
5-
apiKey: '',
6-
selectedVoice: {
7-
languageCodes: ['en-GB'],
8-
ssmlGender: 'FEMALE',
9-
name: 'en-GB-Wavenet-A',
10-
},
11-
useLocalCredentials: false,
12-
favoriteVoiceIds: [],
13-
speakingRate: 1,
14-
pitch: 0,
15-
volumeGainDb: 0,
5+
apiKey: '',
6+
selectedVoice: {
7+
languageCodes: ['en-GB'],
8+
ssmlGender: 'FEMALE',
9+
name: 'en-GB-Wavenet-A',
10+
},
11+
useLocalCredentials: false,
12+
favoriteVoiceIds: [],
13+
speakingRate: 1,
14+
pitch: 0,
15+
volumeGainDb: 0,
1616
})

0 commit comments

Comments
 (0)