From e76ea68bfcf22f2524f271c20c9658a50cf22ea5 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 30 Dec 2024 13:38:54 -0700
Subject: [PATCH] Improve plugin install logic

---
 src/main.rs | 52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index dc6a2b2..a9b3763 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -558,38 +558,50 @@ impl Application for App {
                         tokio::task::spawn_blocking(move || {
                             match gst_pbutils::MissingPluginMessage::parse(&element) {
                                 Ok(missing_plugin) => {
-                                    // Wait for any prior installations to finish
-                                    while gst_pbutils::missing_plugins::install_plugins_installation_in_progress() {
-                                        thread::sleep(Duration::from_millis(250));
-                                    }
-
                                     let mut install_ctx = gst_pbutils::InstallPluginsContext::new();
                                     install_ctx
                                         .set_desktop_id(&format!("{}.desktop", Self::APP_ID));
                                     let install_detail = missing_plugin.installer_detail();
-                                    println!("installing plugins: {}", install_detail);
-                                    let status = gst_pbutils::missing_plugins::install_plugins_sync(
-                                        &[&install_detail],
-                                        Some(&install_ctx),
-                                    );
-                                    //TODO: why does the sync function return with install-in-progress?
-                                    log::info!("plugin install status: {}", status);
+                                    loop {
+                                        // Wait for any prior installations to finish
+                                        while gst_pbutils::missing_plugins::install_plugins_installation_in_progress() {
+                                            thread::sleep(Duration::from_millis(250));
+                                        }
 
-                                    // Wait for installation to finish
-                                    while gst_pbutils::missing_plugins::install_plugins_installation_in_progress() {
-                                        thread::sleep(Duration::from_millis(250));
+                                        println!("installing plugins: {}", install_detail);
+                                        let status = gst_pbutils::missing_plugins::install_plugins_sync(
+                                            &[&install_detail],
+                                            Some(&install_ctx),
+                                        );
+                                        //TODO: why does the sync function return with install-in-progress?
+                                        log::info!("plugin install status: {}", status);
+
+                                        match status {
+                                            gst_pbutils::InstallPluginsReturn::InstallInProgress => {
+                                                // Try again until completed
+                                                continue;
+                                            },
+                                            gst_pbutils::InstallPluginsReturn::Success => {
+                                                // Update registry and reload video
+                                                log::info!(
+                                                    "gstreamer registry update: {:?}",
+                                                    gst::Registry::update()
+                                                );
+                                                return message::app(Message::Reload);
+                                            },
+                                            _ => {
+                                                log::warn!("failed to install plugins: {status}");
+                                                break;
+                                            }
+                                        }
                                     }
 
-                                    log::info!(
-                                        "gstreamer registry update: {:?}",
-                                        gst::Registry::update()
-                                    );
                                 }
                                 Err(err) => {
                                     log::warn!("failed to parse missing plugin message: {err}");
                                 }
                             }
-                            message::app(Message::Reload)
+                            message::none()
                         })
                         .await
                         .unwrap()