src/ffmpeg.rs

@@ -57,13 +57,6 @@ impl From<String> for Codec {
     }
 }
 
-pub fn check() -> Result<()> {
-    std::process::Command::new("ffmpeg").output()?;
-    std::process::Command::new("ffprobe").output()?;
-
-    Ok(())
-}
-
 pub async fn get_video_meta(path: &Path) -> Result<VideoMeta> {
     let output = Command::new("ffprobe")
         .args([

src/main.rs

@@ -7,7 +7,7 @@ use std::{borrow::Cow, path::PathBuf, time::Duration};
 
 use color_eyre::eyre::{OptionExt, Result, bail};
 use gobject::GtkZiplineFolder;
-use relm::{Dialog, DialogInput, StandaloneDialog, Toast, ToastInput};
+use relm::{Dialog, DialogInput, Toast, ToastInput};
 use relm4::{
     Component, ComponentController, Controller, RelmApp, Sender,
     adw::{self, prelude::*},
@@ -391,6 +391,7 @@ impl AsyncComponent for Tyrolienne {
     }
 }
 
+// TODO check for ffmpeg
 // TODO app icon
 fn main() -> Result<()> {
     tracing_subscriber::fmt()
@@ -399,10 +400,11 @@ fn main() -> Result<()> {
 
     color_eyre::install()?;
 
-    match ffmpeg::check().and_then(|_| get_config()) {
+    // TODO: show dialog in case these error
-        Ok(config) => RelmApp::new("net.uku3lig.Tyrolienne").run_async::<Tyrolienne>(config),
+    let config = get_config()?;
-        Err(e) => RelmApp::new("net.uku3lig.Tyrolienne").run::<StandaloneDialog>(e.to_string()),
+
-    }
+    let app = RelmApp::new("net.uku3lig.Tyrolienne");
+    app.run_async::<Tyrolienne>(config);
 
     Ok(())
 }

src/relm.rs

@@ -148,53 +148,3 @@ impl SimpleComponent for Toast {
         }
     }
 }
-
-pub struct StandaloneDialog;
-
-impl SimpleComponent for StandaloneDialog {
-    type Init = String;
-    type Input = ();
-    type Output = ();
-    type Root = adw::ApplicationWindow;
-    type Widgets = ();
-
-    fn init_root() -> Self::Root {
-        adw::ApplicationWindow::builder()
-            .title("Tyrolienne")
-            .default_width(400)
-            .default_height(300)
-            .build()
-    }
-
-    fn init(
-        init: Self::Init,
-        root: Self::Root,
-        _sender: relm4::ComponentSender<Self>,
-    ) -> relm4::ComponentParts<Self> {
-        let dialog = adw::AlertDialog::builder()
-            .heading("Could not open Tyrolienne")
-            .body(init)
-            .close_response("close")
-            .build();
-        dialog.add_response("close", "Close");
-
-        dialog.connect_closed(clone!(
-            #[strong]
-            root,
-            move |_| root.close()
-        ));
-
-        root.connect_show(clone!(
-            #[strong]
-            dialog,
-            #[strong]
-            root,
-            move |_| dialog.present(Some(&root))
-        ));
-
-        relm4::ComponentParts {
-            model: StandaloneDialog,
-            widgets: (),
-        }
-    }
-}