From 1f25fa369061a7dd1796d2f4def7242d4cb9ca2f Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Mon, 25 May 2026 07:57:09 +0200 Subject: refactor(config): remove skip.conf deprecation path Remove the remaining skip.conf compatibility warning and related constant now that skip.conf is no longer part of the supported configuration flow. Clean up the script header and man page so configuration documentation only describes config.toml and the current [processing].skip_codecs setting. --- transcode.sh | 12 ------------ transcode.sh.1 | 9 --------- 2 files changed, 21 deletions(-) diff --git a/transcode.sh b/transcode.sh index 791da9b..5e82fa1 100755 --- a/transcode.sh +++ b/transcode.sh @@ -48,10 +48,6 @@ # Requires tomlq (https://github.com/nicowillis/tomlq) when config.toml # is present. # -# NOTE: skip.conf is deprecated. If it exists alongside config.toml the -# script will warn and ignore it. Migrate codecs to [processing] skip_codecs in -# config.toml. -# # NOTES # This script respects the NO_COLOR standard (https://no-color.org/). # @@ -173,8 +169,6 @@ TEMPORARY_FILES=() readonly PRESET_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/transcode.sh/presets" CONFIG_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/transcode.sh/config.toml" -# Kept for deprecation warning only — no longer read for codec data. -readonly SKIP_CODECS_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/transcode.sh/skip.conf" # Sentinel flags: set to 1 by the CLI option parser so that load_config() knows # which values have already been provided and must not be overridden. @@ -500,12 +494,6 @@ function _tomlq_get() { # Load configuration from config.toml, respecting CLI precedence. # Called once, after option parsing, so all _CLI_* sentinels are already set. function load_config() { - # Warn about the legacy skip.conf here (not at startup) so --quiet is - # respected; by this point the CLI has been fully parsed. - if [[ -f "$SKIP_CODECS_FILE" ]]; then - warn "skip.conf is deprecated." "Migrate codecs to [processing] skip_codecs in config.toml and remove $SKIP_CODECS_FILE" - fi - # We use -r and not -f to allow things like /dev/null if [[ ! -r "$CONFIG_FILE" ]]; then if [[ $_CLI_CONFIG_FILE -eq 1 ]]; then diff --git a/transcode.sh.1 b/transcode.sh.1 index 5d6d521..7093397 100644 --- a/transcode.sh.1 +++ b/transcode.sh.1 @@ -497,15 +497,6 @@ String. Equivalent to Defaults to .BR fatal . .RE -.TP -.IR "${XDG_CONFIG_HOME:-$HOME/.config}/transcode.sh/skip.conf" -.B Deprecated. -This file is no longer read. If it exists, a warning is printed. -Migrate its contents to -.B [processing] skip_codecs -in -.B config.toml -and delete the file. .SH EXIT STATUS .TP .B 0 -- cgit v1.3.1