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

chore: update deps

Browse Source
This commit is contained in:
Thomas Heck
2024-07-25 22:22:27 +02:00
parent a10345fbbe
commit 05ad75e20d
6 changed files with 724 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

952
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

14
Cargo.toml
View File

@@ -21,22 +21,22 @@ include = [
]
[dependencies]
gstreamer-audio = { version = "0.18", features = ["v1_10"] }
gstreamer = { version = "0.18", features = ["v1_10"] }
gstreamer-base = { version = "0.18", features = ["v1_10"] }
glib = "0.15"
gstreamer = { version = "0.23", features = ["v1_16"] }
gstreamer-base = { version = "0.23", features = ["v1_16"] }
gstreamer-audio = { version = "0.23", features = ["v1_16"] }
glib = "0.20"
futures = "0.3"
num_cpus = "1"
walkdir = "2"
libc = "0.2"
anyhow = "1"
clap = { version = "3", features = ["cargo"] }
clap = { version = "4", features = ["cargo"] }
serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.8"
serde_yaml = "0.9"
regex = "1"
globset = "0.4"
derive_more = "0.99"
tui = { version = "0.17", default-features = false, features = ["crossterm"] }
tui = { version = "0.19", default-features = false, features = ["crossterm"] }
[dependencies.tokio]
version = "1"

50
src/config.rs
View File

@@ -1,4 +1,5 @@
use anyhow::{Context, Error, Result};
use clap::{builder::ValueParser, ArgAction};
use globset::GlobBuilder;
use regex::bytes::{Regex, RegexBuilder};
use serde::Deserialize;
@@ -103,6 +104,8 @@ struct ConfigFile {
#[serde(default)]
matches: Vec<TranscodeMatchFile>,
jobs: Option<usize>,
}
#[derive(Debug, Deserialize)]
@@ -126,27 +129,27 @@ pub fn config() -> Result<Config> {
Arg::new("config")
.short('c')
.long("config")
.allow_invalid_utf8(true)
.required(false)
.takes_value(true)
.value_parser(ValueParser::path_buf())
.action(ArgAction::Set)
.help("Path to an audio-conv config file, defaults to \"audio-conv.yaml\""),
)
.arg(
Arg::new("from")
.short('f')
.long("from")
.allow_invalid_utf8(true)
.required(false)
.takes_value(true)
.value_parser(ValueParser::path_buf())
.action(ArgAction::Set)
.help("\"from\" directory path"),
)
.arg(
Arg::new("to")
.short('t')
.long("to")
.allow_invalid_utf8(true)
.required(false)
.takes_value(true)
.value_parser(ValueParser::path_buf())
.action(ArgAction::Set)
.help("\"to\" directory path"),
)
.arg(
@@ -154,7 +157,8 @@ pub fn config() -> Result<Config> {
.short('j')
.long("jobs")
.required(false)
.takes_value(true)
.value_parser(clap::value_parser!(usize))
.action(ArgAction::Set)
.help("Allow N jobs/transcodes at once. Defaults to number of logical cores"),
)
.subcommand(Command::new("init").about("writes an example config"))
@@ -162,8 +166,8 @@ pub fn config() -> Result<Config> {
let current_dir = std::env::current_dir().context("Could not get current directory")?;
let config_path = arg_matches.value_of_os("config");
let force_load = config_path.is_some();
let config_path = arg_matches.get_one::<PathBuf>("config");
let enforce_config_load = config_path.is_some();
let config_path = config_path
.map(AsRef::<Path>::as_ref)
.unwrap_or_else(|| AsRef::<Path>::as_ref("audio-conv.yaml"));
@@ -187,7 +191,7 @@ pub fn config() -> Result<Config> {
let config_file = load_config_file(&config_path)
.with_context(|| format!("Failed loading config file {}", config_path.display()))?;
if force_load && config_file.is_none() {
if enforce_config_load && config_file.is_none() {
return Err(Error::msg(format!(
"could not find config file \"{}\"",
config_path.display()
@@ -263,7 +267,7 @@ pub fn config() -> Result<Config> {
Ok(Config {
from: {
arg_matches
.value_of_os("from")
.get_one::<PathBuf>("from")
.map(|p| current_dir.join(p))
.or_else(|| {
config_file
@@ -277,7 +281,7 @@ pub fn config() -> Result<Config> {
.context("Could not canonicalize \"from\" path")?
},
to: arg_matches
.value_of_os("to")
.get_one::<PathBuf>("to")
.map(|p| current_dir.join(p))
.or_else(|| {
config_file
@@ -291,16 +295,18 @@ pub fn config() -> Result<Config> {
.context("Could not canonicalize \"to\" path")?,
matches: transcode_matches,
jobs: arg_matches
.value_of("jobs")
.map(|jobs_str| {
jobs_str.parse().with_context(|| {
format!(
"Could not parse \"jobs\" argument \"{}\" to a number",
&jobs_str
)
})
})
.transpose()?,
.get_one("jobs")
.copied()
.or_else(|| config_file.as_ref().map(|c| c.jobs).flatten()),
// .map(|jobs_str| {
// jobs_str.parse().with_context(|| {
// format!(
// "Could not parse \"jobs\" argument \"{}\" to a number",
// &jobs_str
// )
// })
// })
// .transpose()?,
})
}

109
src/main.rs
View File

@@ -5,13 +5,13 @@ mod ui;
use crate::config::{Config, Transcode};
use anyhow::{Context, Error, Result};
use futures::{pin_mut, prelude::*};
use glib::{Boxed, GString};
use glib::Boxed;
use gstreamer::{element_error, prelude::*, Element};
use gstreamer_base::prelude::*;
use std::{
borrow::Cow,
error::Error as StdError,
ffi, fmt,
fmt,
fmt::Write as FmtWrite,
path::{Path, PathBuf},
result::Result as StdResult,
@@ -51,8 +51,15 @@ struct GErrorMessage {
source: glib::Error,
}
fn gmake<T: IsA<Element>>(factory_name: &str) -> Result<T> {
let res = gstreamer::ElementFactory::make(factory_name, None)
fn gmake<T: IsA<Element>>(factory_name: &str, properties: &[(&str, &dyn ToValue)]) -> Result<T> {
let builder = gstreamer::ElementFactory::make(factory_name);
let builder = properties
.into_iter()
.fold(builder, |builder, (name, value)| {
builder.property(name, value.to_value())
});
let res = builder
.build()
.with_context(|| format!("Could not make gstreamer Element \"{}\"", factory_name))?
.downcast()
.ok()
@@ -328,14 +335,13 @@ async fn transcode_gstreamer(
task_id: usize,
queue: &ui::MsgQueue,
) -> Result<()> {
let file_src: Element = gmake("filesrc")?;
file_src.try_set_property("location", &path_to_gstring(&from_path))?;
let file_src: Element = gmake("filesrc", &[("location", &from_path)])?;
let decodebin: Element = gmake("decodebin")?;
let decodebin: Element = gmake("decodebin", &[])?;
let src_elems: &[&Element] = &[&file_src, &decodebin];
let pipeline = gstreamer::Pipeline::new(None);
let pipeline = gstreamer::Pipeline::new();
pipeline.add_many(src_elems)?;
Element::link_many(src_elems)?;
@@ -374,14 +380,18 @@ async fn transcode_gstreamer(
Some(true) => {}
}
let resample: Element = gmake("audioresample")?;
// quality from 0 to 10
resample.try_set_property("quality", &10i32)?;
let resample: Element = gmake(
"audioresample",
&[
// quality from 0 to 10
("quality", &10i32),
],
)?;
let mut dest_elems = vec![
resample,
// `audioconvert` converts audio format, bitdepth, ...
gmake("audioconvert")?,
gmake("audioconvert", &[])?,
];
match &transcode {
@@ -389,28 +399,32 @@ async fn transcode_gstreamer(
bitrate,
bitrate_type,
} => {
let encoder: Element = gmake("opusenc")?;
encoder.try_set_property(
"bitrate",
&i32::from(*bitrate)
.checked_mul(1_000)
.context("Bitrate overflowed")?,
let encoder: Element = gmake(
"opusenc",
&[
(
"bitrate",
&i32::from(*bitrate)
.checked_mul(1_000)
.context("Bitrate overflowed")?,
),
(
"bitrate-type",
match bitrate_type {
config::BitrateType::Vbr => &"1",
config::BitrateType::Cbr => &"0",
},
),
],
)?;
encoder.set_property_from_str(
"bitrate-type",
match bitrate_type {
config::BitrateType::Vbr => "1",
config::BitrateType::Cbr => "0",
},
);
dest_elems.push(encoder);
dest_elems.push(gmake("oggmux")?);
dest_elems.push(gmake("oggmux", &[])?);
}
Transcode::Flac { compression } => {
let encoder: Element = gmake("flacenc")?;
encoder.set_property_from_str("quality", &compression.to_string());
let encoder: Element =
gmake("flacenc", &[("quality", &compression.to_string())])?;
dest_elems.push(encoder);
}
@@ -418,20 +432,24 @@ async fn transcode_gstreamer(
bitrate,
bitrate_type,
} => {
let encoder: Element = gmake("lamemp3enc")?;
// target: "1" = "bitrate"
encoder.set_property_from_str("target", "1");
encoder.try_set_property("bitrate", &i32::from(*bitrate))?;
encoder.try_set_property(
"cbr",
match bitrate_type {
config::BitrateType::Vbr => &false,
config::BitrateType::Cbr => &true,
},
let encoder: Element = gmake(
"lamemp3enc",
&[
// target: "1" = "bitrate"
("target", &"1"),
("bitrate", &i32::from(*bitrate)),
(
"cbr",
match bitrate_type {
config::BitrateType::Vbr => &false,
config::BitrateType::Cbr => &true,
},
),
],
)?;
dest_elems.push(encoder);
dest_elems.push(gmake("id3v2mux")?);
dest_elems.push(gmake("id3v2mux", &[])?);
}
Transcode::Copy => {
@@ -440,8 +458,8 @@ async fn transcode_gstreamer(
}
};
let file_dest: gstreamer_base::BaseSink = gmake("filesink")?;
file_dest.try_set_property("location", &path_to_gstring(&to_path_clone))?;
let file_dest: gstreamer_base::BaseSink =
gmake("filesink", &[("location", &to_path_clone)])?;
file_dest.set_sync(false);
dest_elems.push(file_dest.upcast());
@@ -521,7 +539,7 @@ async fn transcode_gstreamer(
.map(|s| String::from(s.path_string()))
.unwrap_or_else(|| String::from("None")),
error: err.error().to_string(),
debug: err.debug(),
debug: err.debug().map(|gstring| gstring.into()),
source: err.error(),
}
.into()
@@ -641,10 +659,3 @@ fn path_to_bytes(path: &Path) -> Cow<'_, [u8]> {
Cow::Owned(buf)
}
}
fn path_to_gstring(path: &Path) -> GString {
let buf = path_to_bytes(path);
ffi::CString::new(buf)
.expect("Path contained null byte")
.into()
}

20
src/tag.rs
View File

@@ -1,4 +1,4 @@
use glib::Value;
use glib::{gstr, GStr, Value};
use gstreamer::{
tags::{merge_strings_with_comma, CustomTag},
Tag, TagFlag,
@@ -8,16 +8,13 @@ pub struct MbArtistId;
impl<'a> Tag<'a> for MbArtistId {
type TagType = &'a str;
fn tag_name<'b>() -> &'b str {
"musicbrainz-artistid"
}
const TAG_NAME: &'static GStr = gstr!("musicbrainz-artistid");
}
impl CustomTag<'_> for MbArtistId {
const FLAG: TagFlag = TagFlag::Meta;
const NICK: &'static str = "artist ID";
const DESCRIPTION: &'static str = "MusicBrainz artist ID";
const NICK: &'static GStr = gstr!("artist ID");
const DESCRIPTION: &'static GStr = gstr!("MusicBrainz artist ID");
fn merge_func(src: &Value) -> Value {
merge_strings_with_comma(src)
@@ -28,16 +25,13 @@ pub struct MbAlbumArtistId;
impl<'a> Tag<'a> for MbAlbumArtistId {
type TagType = &'a str;
fn tag_name<'b>() -> &'b str {
"musicbrainz-albumartistid"
}
const TAG_NAME: &'static GStr = gstr!("musicbrainz-albumartistid");
}
impl CustomTag<'_> for MbAlbumArtistId {
const FLAG: TagFlag = TagFlag::Meta;
const NICK: &'static str = "album artist ID";
const DESCRIPTION: &'static str = "MusicBrainz album artist ID";
const NICK: &'static GStr = gstr!("album artist ID");
const DESCRIPTION: &'static GStr = gstr!("MusicBrainz album artist ID");
fn merge_func(src: &Value) -> Value {
merge_strings_with_comma(src)

2
src/ui.rs
View File

@@ -92,7 +92,7 @@ impl State {
self.ended_tasks += 1;
}
Msg::TaskProgress { id, ratio } => {
let mut task = self
let task = self
.running_tasks
.get_mut(&id)
.context("Unable to update task progress; could't find task")?;