Compare commits

...

2 commits

Author SHA1 Message Date
uku
6f46c768ce
feat: check for ffmpeg on startup 2025-05-21 22:33:16 +02:00
uku
a19aa8206b
feat: add alert dialog for opening failures 2025-05-21 22:28:30 +02:00
3 changed files with 62 additions and 7 deletions

View file

@ -57,6 +57,13 @@ 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([

View file

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

View file

@ -148,3 +148,53 @@ 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: (),
}
}
}