From 18534b259b835b74631fca5f19ff6da7e2652afe Mon Sep 17 00:00:00 2001 From: bytedream Date: Mon, 8 Apr 2024 14:34:50 +0200 Subject: [PATCH] Remove deprecated {resolution} output format option --- crunchy-cli-core/src/archive/command.rs | 9 --------- crunchy-cli-core/src/download/command.rs | 9 --------- crunchy-cli-core/src/utils/format.rs | 4 ---- 3 files changed, 22 deletions(-) diff --git a/crunchy-cli-core/src/archive/command.rs b/crunchy-cli-core/src/archive/command.rs index 64ad66a..234bf68 100644 --- a/crunchy-cli-core/src/archive/command.rs +++ b/crunchy-cli-core/src/archive/command.rs @@ -242,15 +242,6 @@ impl Execute for Archive { warn!("Using `--sync-start` without `--ffmpeg-preset` might produce worse sync results than with `--ffmpeg-preset` set") } - if self.output.contains("{resolution}") - || self - .output_specials - .as_ref() - .map_or(false, |os| os.contains("{resolution}")) - { - warn!("The '{{resolution}}' format option is deprecated and will be removed in a future version. Please use '{{width}}' and '{{height}}' instead") - } - self.audio = all_locale_in_locales(self.audio.clone()); self.subtitle = all_locale_in_locales(self.subtitle.clone()); diff --git a/crunchy-cli-core/src/download/command.rs b/crunchy-cli-core/src/download/command.rs index fd29030..58055bd 100644 --- a/crunchy-cli-core/src/download/command.rs +++ b/crunchy-cli-core/src/download/command.rs @@ -187,15 +187,6 @@ impl Execute for Download { } } - if self.output.contains("{resolution}") - || self - .output_specials - .as_ref() - .map_or(false, |os| os.contains("{resolution}")) - { - warn!("The '{{resolution}}' format option is deprecated and will be removed in a future version. Please use '{{width}}' and '{{height}}' instead") - } - if let Some(language_tagging) = &self.language_tagging { self.audio = resolve_locales(&[self.audio.clone()]).remove(0); self.subtitle = self diff --git a/crunchy-cli-core/src/utils/format.rs b/crunchy-cli-core/src/utils/format.rs index df79d64..17f324f 100644 --- a/crunchy-cli-core/src/utils/format.rs +++ b/crunchy-cli-core/src/utils/format.rs @@ -446,10 +446,6 @@ impl Format { universal, ), ) - .replace( - "{resolution}", - &sanitize(self.resolution.to_string(), true, universal), - ) .replace( "{width}", &sanitize(self.resolution.width.to_string(), true, universal),