Skip to content

Commit b82be5a

Browse files
committed
[rust] Remove optional ffmpeg version in cli parameter
1 parent e2e2bd4 commit b82be5a

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

rust/src/ffmpeg.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,8 @@ pub fn download_ffmpeg(
9191
Ok(())
9292
}
9393

94-
pub fn get_ffmpeg_version(ffmpeg_version: Option<String>) -> String {
95-
let ffmpeg_version = ffmpeg_version.unwrap_or(FFMPEG_DEFAULT_VERSION.to_string());
96-
if ffmpeg_version.is_empty() {
97-
FFMPEG_DEFAULT_VERSION.to_string()
98-
} else {
99-
ffmpeg_version
100-
}
94+
pub fn get_ffmpeg_version() -> String {
95+
FFMPEG_DEFAULT_VERSION.to_string()
10196
}
10297

10398
pub fn get_ffmpeg_path_in_cache(

rust/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -902,15 +902,15 @@ pub trait SeleniumManager {
902902
Ok(())
903903
}
904904

905-
fn record_desktop(&self, ffmpeg_version: Option<String>, record: bool) -> Result<(), Error> {
905+
fn record_desktop(&self, ffmpeg: bool, record: bool) -> Result<(), Error> {
906906
let mut ffmpeg_path: Option<PathBuf> = None;
907-
if ffmpeg_version.is_some() {
908-
ffmpeg_path = Some(self.get_or_download_ffmpeg(ffmpeg_version.clone())?);
907+
if ffmpeg {
908+
ffmpeg_path = Some(self.get_or_download_ffmpeg()?);
909909
}
910910
if record {
911911
let cache_path = self.get_cache_path()?.unwrap_or_default();
912912
record_desktop_with_ffmpeg(
913-
ffmpeg_path.unwrap_or(self.get_or_download_ffmpeg(ffmpeg_version.clone())?),
913+
ffmpeg_path.unwrap_or(self.get_or_download_ffmpeg()?),
914914
self.get_os(),
915915
self.get_logger(),
916916
cache_path,
@@ -1598,8 +1598,8 @@ pub trait SeleniumManager {
15981598
self.get_config_mut().fallback_driver_from_cache = fallback_driver_from_cache;
15991599
}
16001600

1601-
fn get_or_download_ffmpeg(&self, version: Option<String>) -> Result<PathBuf, Error> {
1602-
let ffmpeg_version = get_ffmpeg_version(version);
1601+
fn get_or_download_ffmpeg(&self) -> Result<PathBuf, Error> {
1602+
let ffmpeg_version = get_ffmpeg_version();
16031603
let cache_path = self.get_cache_path()?.unwrap_or_default();
16041604
let ffmpeg_path_in_cache =
16051605
get_ffmpeg_path_in_cache(&ffmpeg_version, self.get_os(), cache_path.clone())?;

rust/src/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ struct Cli {
156156
#[clap(long)]
157157
skip_browser_in_path: bool,
158158

159-
/// Manage FFMPEG static build. If version is not provided, release 7.1 is downloaded
160-
#[clap(long, value_parser, num_args = 0..=1, default_missing_value = "", value_name = "FFMPEG_VERSION")]
161-
ffmpeg: Option<String>,
159+
/// Manage FFMPEG static build
160+
#[clap(long)]
161+
ffmpeg: bool,
162162

163163
/// Record desktop (using FFMPEG)
164164
#[clap(long)]
@@ -172,11 +172,11 @@ fn main() {
172172

173173
let debug = cli.debug || BooleanKey("debug", false).get_value();
174174
let trace = cli.trace || BooleanKey("trace", false).get_value();
175+
let ffmpeg = cli.ffmpeg || BooleanKey("ffmpeg", false).get_value();
175176
let record = cli.record || BooleanKey("record", false).get_value();
176177
let log_level = StringKey(vec!["log-level"], &cli.log_level.unwrap_or_default()).get_value();
177178
let log = Logger::create(&cli.output, debug, trace, &log_level);
178179
let grid = cli.grid;
179-
let ffmpeg = cli.ffmpeg;
180180
let mut browser_name: String = cli.browser.unwrap_or_default();
181181
let mut driver_name: String = cli.driver.unwrap_or_default();
182182
if browser_name.is_empty() {

0 commit comments

Comments
 (0)