t/audio-conv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Thomas Heck
2020-12-29 21:31:33 +01:00
parent 9959a26e48
commit 762064efd6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.rs
View File

@@ -3,7 +3,7 @@ mod ui;
use crate::config::Config; use crate::config::Config;
use anyhow::{Context, Error, Result}; use anyhow::{Context, Error, Result};
use futures::{future, pin_mut, prelude::*}; use futures::{pin_mut, prelude::*};
use glib::{subclass::prelude::*, GBoxed, GString}; use glib::{subclass::prelude::*, GBoxed, GString};
use gstreamer::{gst_element_error, prelude::*, Element}; use gstreamer::{gst_element_error, prelude::*, Element};
use gstreamer_base::prelude::*; use gstreamer_base::prelude::*;
@@ -540,13 +540,13 @@ async fn transcode(
.await .await
} }
async fn rm_file_on_err<F, T>(path: &Path, f: F) -> F::Output async fn rm_file_on_err<F, T>(path: &Path, f: F) -> Result<T>
where where
F: Future<Output = Result<T>>, F: Future<Output = Result<T>>,
{ {
match f.await { match f.await {
Err(err) => match fs::remove_file(path).await { Err(err) => match fs::remove_file(path).await {
Ok(..) => Err(err), Ok(()) => Err(err),
Err(fs_err) if fs_err.kind() == std::io::ErrorKind::NotFound => Err(err), Err(fs_err) if fs_err.kind() == std::io::ErrorKind::NotFound => Err(err),
Err(fs_err) => { Err(fs_err) => {
let err = err let err = err