Refactor speech-dispatcher restart, fix restarting in flatpak

Elleo · Nov 26, 2023 · bc3439f · bc3439f
1 parent 03205de
commit bc3439f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/appimage/AppImageBuilder.yml b/appimage/AppImageBuilder.yml
@@ -11,7 +11,7 @@ AppDir:
     id: com.mikeasoft.pied
     name: Pied
     icon: pied
-    version: 0.1.2
+    version: 0.1.11
     exec: pied
     exec_args: $@
   apt:

diff --git a/lib/voice_selector.dart b/lib/voice_selector.dart
@@ -50,6 +50,18 @@ class _VoiceSelectorState extends State<VoiceSelector> {
     });
   }
 
+  void restartSD() {
+      if (isFlatpak()) {
+          Process.runSync("flatpak-spawn", [
+              "--host",
+              "killall",
+              "speech-dispatcher"
+          ]);
+      } else {
+        Process.runSync("killall", ["speech-dispatcher"]);
+      }
+  }
+
   void getCurrentVoice() async {
     File modelConf = File(
         path.join(getHome()!, ".config/speech-dispatcher/modules/piper.conf"));
@@ -112,7 +124,7 @@ class _VoiceSelectorState extends State<VoiceSelector> {
     File sdConfig = File(path.join(confDir.path, "speechd.conf"));
     sdConfig.createSync();
     sdConfig.writeAsString(sdConfigTemplate);
-    Process.runSync("killall", ["speech-dispatcher"]);
+    restartSD();
     Timer(const Duration(seconds: 2), () {
       confirmConfigChange(originalConfigDir);
     });
@@ -128,7 +140,7 @@ class _VoiceSelectorState extends State<VoiceSelector> {
     setState(() {
       currentVoice = "";
     });
-    Process.runSync("killall", ["speech-dispatcher"]);
+    restartSD();
     Timer(const Duration(seconds: 2), () {
       showDialog<void>(
           context: context,
@@ -314,16 +326,7 @@ class _VoiceSelectorState extends State<VoiceSelector> {
                                               configString.replaceAll(
                                                   "LANGUAGE", voice.value[1]);
                                           modelConf.writeAsString(configString);
-                                          if (isFlatpak()) {
-                                            Process.runSync("flatpak-spawn", [
-                                              "--host",
-                                              "killall",
-                                              "speech-dispatcher"
-                                            ]);
-                                          } else {
-                                            Process.runSync("killall",
-                                                ["speech-dispatcher"]);
-                                          }
+                                          restartSD();
                                           setState(() {
                                             currentVoice = voice.value[3];
                                           });