refactor: remove references to legacy setting

The `--alpha` flag and `alpha = true/false` config file options remain
functional but references to them are removed as they are now superseded
by the output formats with alpha channels (rgba, hexa, hsla).
New users/configurations should use the relevant output formats. The
legacy flag/options remain active for backward-compatibility with older
configs/scripts.
This commit is contained in:
2026-04-27 23:58:14 -04:00
parent 8a70c79602
commit d170bd15cf
2 changed files with 85 additions and 61 deletions
+10 -8
View File
@@ -84,20 +84,22 @@ You can define your preferred defaults in `~/.config/color-tool/config.toml`. Th
```toml ```toml
[defaults] [defaults]
output = "hex" # default output format(s) # Set any option to true to enable it by default when using the terminal
output = "hex" # default output format(s): hex, rgb, hsl, rgba, hsla, hexa, all
json = false # output in JSON format json = false # output in JSON format
swatch = false # show color swatch in terminal swatch = false # show color swatch in terminal
name = false # fetch color name name = false # fetch color name from thecolorapi.com
copy = false # copy result to clipboard copy = false # copy result to clipboard
pick = false # auto-launch picker pick = false # auto-launch color picker when invoked with no arguments
notify = false # show desktop notification notify = false # show desktop notification
[desktop] [desktop]
output = "hex" # Defaults for --desktop mode (launched from the app menu; copy is always enabled by default)
json = false output = "hex" # format to copy
name = false json = false # copy JSON format instead of plain text
copy = true name = false # fetch color name (requires network)
notify = true copy = true # copy result to clipboard
notify = true # show desktop notification with the copied value
``` ```
## 🤝 Credits ## 🤝 Credits
+34 -12
View File
@@ -76,7 +76,8 @@ load_config() {
if [[ "$line" =~ ^[[:space:]]*([A-Za-z_]+)[[:space:]]*=[[:space:]]*([^[:space:]]+) ]]; then if [[ "$line" =~ ^[[:space:]]*([A-Za-z_]+)[[:space:]]*=[[:space:]]*([^[:space:]]+) ]]; then
key="${BASH_REMATCH[1]}" key="${BASH_REMATCH[1]}"
val="${BASH_REMATCH[2],,}" val="${BASH_REMATCH[2],,}"
val="${val#\"}" ; val="${val%\"}" val="${val#\"}"
val="${val%\"}"
case "$section:$key" in case "$section:$key" in
defaults:json) [[ "$val" == "true" ]] && json_mode=1 || json_mode=0 ;; defaults:json) [[ "$val" == "true" ]] && json_mode=1 || json_mode=0 ;;
defaults:alpha) [[ "$val" == "true" ]] && alpha_mode=1 || alpha_mode=0 ;; defaults:alpha) [[ "$val" == "true" ]] && alpha_mode=1 || alpha_mode=0 ;;
@@ -281,7 +282,6 @@ do_install() {
# Set any option to true to enable it by default when using the terminal # Set any option to true to enable it by default when using the terminal
output = "hex" # default output format(s): hex, rgb, hsl, rgba, hsla, hexa, all output = "hex" # default output format(s): hex, rgb, hsl, rgba, hsla, hexa, all
json = false # output in JSON format json = false # output in JSON format
alpha = false # include alpha channel (8-digit hex)
swatch = false # show color swatch in terminal swatch = false # show color swatch in terminal
name = false # fetch color name from thecolorapi.com name = false # fetch color name from thecolorapi.com
copy = false # copy result to clipboard copy = false # copy result to clipboard
@@ -292,7 +292,6 @@ notify = false # show desktop notification
# Defaults for --desktop mode (launched from the app menu; copy is always enabled by default) # Defaults for --desktop mode (launched from the app menu; copy is always enabled by default)
output = "hex" # format to copy output = "hex" # format to copy
json = false # copy JSON format instead of plain text json = false # copy JSON format instead of plain text
alpha = false # include alpha channel
name = false # fetch color name (requires network) name = false # fetch color name (requires network)
copy = true # copy result to clipboard copy = true # copy result to clipboard
notify = true # show desktop notification with the copied value notify = true # show desktop notification with the copied value
@@ -398,7 +397,10 @@ validate_output_formats() {
process_color() { process_color() {
local input="$1" local input="$1"
local formats_json local formats_json
formats_json=$(get_all_formats "$input") || { echo "Error: Invalid color: $input" >&2; return 1; } formats_json=$(get_all_formats "$input") || {
echo "Error: Invalid color: $input" >&2
return 1
}
local name="" local name=""
if [[ $name_mode -eq 1 ]]; then if [[ $name_mode -eq 1 ]]; then
@@ -436,7 +438,10 @@ process_color() {
if [[ $json_mode -eq 1 ]]; then if [[ $json_mode -eq 1 ]]; then
output_text="$json_obj" output_text="$json_obj"
else else
output_text=$(IFS=' ' ; echo "${display_parts[*]}") output_text=$(
IFS=' '
echo "${display_parts[*]}"
)
[[ -n "$name" ]] && output_text="$output_text ($name)" [[ -n "$name" ]] && output_text="$output_text ($name)"
fi fi
@@ -446,7 +451,8 @@ process_color() {
r=$(echo "$formats_json" | jq -r '._raw.r') r=$(echo "$formats_json" | jq -r '._raw.r')
g=$(echo "$formats_json" | jq -r '._raw.g') g=$(echo "$formats_json" | jq -r '._raw.g')
b=$(echo "$formats_json" | jq -r '._raw.b') b=$(echo "$formats_json" | jq -r '._raw.b')
if [[ $json_mode -eq 1 ]]; then printf "\033[48;2;${r};${g};${b}m \033[0m\n" if [[ $json_mode -eq 1 ]]; then
printf "\033[48;2;${r};${g};${b}m \033[0m\n"
else printf "\033[48;2;${r};${g};${b}m \033[0m "; fi else printf "\033[48;2;${r};${g};${b}m \033[0m "; fi
fi fi
echo -e "$output_text" echo -e "$output_text"
@@ -465,11 +471,20 @@ do_pick=0
# First pass: collect CLI overrides # First pass: collect CLI overrides
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case "$1" in case "$1" in
--help|-h) show_help; exit 0 ;; --help | -h)
--output) cli_output="$2"; shift ;; show_help
exit 0
;;
--output)
cli_output="$2"
shift
;;
--json) cli_json=1 ;; --json) cli_json=1 ;;
--no-json) cli_json=0 ;; --no-json) cli_json=0 ;;
--alpha) cli_alpha=1; cli_output="hexa" ;; --alpha)
cli_alpha=1
cli_output="hexa"
;;
--no-alpha) cli_alpha=0 ;; --no-alpha) cli_alpha=0 ;;
--name) cli_name=1 ;; --name) cli_name=1 ;;
--no-name) cli_name=0 ;; --no-name) cli_name=0 ;;
@@ -482,8 +497,14 @@ while [[ $# -gt 0 ]]; do
--pick) cli_pick=1 ;; --pick) cli_pick=1 ;;
--no-pick) cli_pick=0 ;; --no-pick) cli_pick=0 ;;
--desktop) desktop_mode=1 ;; --desktop) desktop_mode=1 ;;
--install) do_install; exit 0 ;; --install)
-*) echo "Unknown option: $1" >&2; exit 1 ;; do_install
exit 0
;;
-*)
echo "Unknown option: $1" >&2
exit 1
;;
*) args+=("$1") ;; *) args+=("$1") ;;
esac esac
shift shift
@@ -525,7 +546,8 @@ elif [[ ${#args[@]} -eq 0 ]]; then
picked="$(run_color_picker)" || exit 1 picked="$(run_color_picker)" || exit 1
[[ -n "$picked" ]] && args+=("$picked") [[ -n "$picked" ]] && args+=("$picked")
elif [[ -t 0 ]]; then elif [[ -t 0 ]]; then
show_help; exit 0 show_help
exit 0
fi fi
fi fi