From decdccbfc3aba177b336d407e23ef0871f0ad9c8 Mon Sep 17 00:00:00 2001 From: m0squ Date: Sat, 8 Feb 2025 23:17:36 +0100 Subject: [PATCH 1/7] Add possibility to pass -normal-window option to rofi --- ani-cli | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ani-cli b/ani-cli index d926caf7..fade1947 100755 --- a/ani-cli +++ b/ani-cli @@ -5,13 +5,13 @@ version_number="4.9.7" # UI external_menu() { - rofi "$1" -sort -dmenu -i -width 1500 -p "$2" + rofi "$1" -sort -dmenu -i -width 1500 -p "$2" "$3" } launcher() { [ "$use_external_menu" = "0" ] && [ -z "$1" ] && set -- "+m" "$2" [ "$use_external_menu" = "0" ] && fzf "$1" --reverse --cycle --prompt "$2" - [ "$use_external_menu" = "1" ] && external_menu "$1" "$2" + [ "$use_external_menu" = "1" ] && external_menu "$1" "$2" "$external_menu_args" } nth() { @@ -65,6 +65,8 @@ help_info() { Play dubbed version --rofi Use rofi instead of fzf for the interactive menu + --normal-window + Make rofi menus appear as windows (effective only when --rofi is used) --skip Use ani-skip to skip the intro of the episode (mpv only) --no-detach @@ -358,6 +360,7 @@ esac no_detach="${ANI_CLI_NO_DETACH:-0}" exit_after_play="${ANI_CLI_EXIT_AFTER_PLAY:-0}" use_external_menu="${ANI_CLI_EXTERNAL_MENU:-0}" +external_menu_normal_window="${ANI_CLI_EXTERNAL_MENU_NORMAL_WINDOW:-0}" skip_intro="${ANI_CLI_SKIP_INTRO:-0}" # shellcheck disable=SC2154 skip_title="$ANI_CLI_SKIP_TITLE" @@ -424,6 +427,7 @@ while [ $# -gt 0 ]; do --no-detach) no_detach=1 ;; --exit-after-play) exit_after_play=1 ;; --rofi) use_external_menu=1 ;; + --normal-window) external_menu_normal_window=1 ;; --skip) skip_intro=1 ;; --skip-title) [ $# -lt 2 ] && die "missing argument!" @@ -438,6 +442,11 @@ while [ $# -gt 0 ]; do done [ "$use_external_menu" = "0" ] && multi_selection_flag="${ANI_CLI_MULTI_SELECTION:-"-m"}" [ "$use_external_menu" = "1" ] && multi_selection_flag="${ANI_CLI_MULTI_SELECTION:-"-multi-select"}" +if [ "$external_menu_normal_window" = "1" ]; then + external_menu_args="-normal-window" +else + external_menu_args="" +fi printf "\33[2K\r\033[1;34mChecking dependencies...\033[0m\n" dep_ch "curl" "sed" "grep" || true [ "$skip_intro" = 1 ] && (dep_ch "ani-skip" || true) @@ -472,7 +481,8 @@ case "$search" in printf "\33[2K\r\033[1;36mSearch anime: \033[0m" && read -r query done else - [ -z "$query" ] && query=$(printf "" | external_menu "" "Search anime: ") + echo $external_menu_args + [ -z "$query" ] && query=$(printf "" | external_menu "" "Search anime: " "$external_menu_args") [ -z "$query" ] && exit 1 fi # for checking new releases by specifying anime name From b8bdbd2086b9c84acb5228d8ad6eac94e2f576d3 Mon Sep 17 00:00:00 2001 From: m0squ Date: Sat, 8 Feb 2025 23:29:22 +0100 Subject: [PATCH 2/7] Bump version --- ani-cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ani-cli b/ani-cli index fade1947..3bb4202b 100755 --- a/ani-cli +++ b/ani-cli @@ -1,6 +1,6 @@ #!/bin/sh -version_number="4.9.7" +version_number="4.10.0" # UI From b7bcc745d23ba3794326ce2109e5fd5c1659c9d7 Mon Sep 17 00:00:00 2001 From: m0squ Date: Sat, 8 Feb 2025 23:38:14 +0100 Subject: [PATCH 3/7] Update man page --- ani-cli | 2 +- ani-cli.1 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ani-cli b/ani-cli index 3bb4202b..a85d137a 100755 --- a/ani-cli +++ b/ani-cli @@ -66,7 +66,7 @@ help_info() { --rofi Use rofi instead of fzf for the interactive menu --normal-window - Make rofi menus appear as windows (effective only when --rofi is used) + Make rofi menus appear as windows (only effective when --rofi is used) --skip Use ani-skip to skip the intro of the episode (mpv only) --no-detach diff --git a/ani-cli.1 b/ani-cli.1 index 7c66cc23..029d5f91 100644 --- a/ani-cli.1 +++ b/ani-cli.1 @@ -58,6 +58,9 @@ Play the dubbed version. Without this flag, it'll always play the subbed version \fB\--rofi\fR Use rofi instead of fzf for the interactive menu .TP +\fB\--normal-window\fR +Make rofi menus appear as windows (only effective when --rofi is used) +.TP \fB\--skip\fR Use ani-skip to skip the intro of the episode (mpv only) .TP @@ -89,6 +92,9 @@ Sets the player ani-cli uses. Can be debug (print links), download (equivalent t \fBANI_CLI_EXTERNAL_MENU\fR Controls the frontend of ani-cli. Can be 0 (uses fzf) or 1 (uses rofi dmenu). Default is 0. .TP +\fBANI_CLI_EXTERNAL_MENU_NORMAL_WINDOW\fR +Controls the way rofi displays the window. Can be 0 (no additional arguments passed to rofi) or 1 (the menu is displayed as a normal window, -normal-window argument is passed to rofi). Default is 0. +.TP \fBANI_CLI_LOG_EPISODE\fR Controls the logging feature for playback. Can be 1(logs) or 0(doesn't log). Default is 1. .TP From c1d7968c70d8aad2798ab229f208ab4ce284e5f4 Mon Sep 17 00:00:00 2001 From: m0squ Date: Sat, 8 Feb 2025 23:45:30 +0100 Subject: [PATCH 4/7] Remove debug echo --- ani-cli | 1 - 1 file changed, 1 deletion(-) diff --git a/ani-cli b/ani-cli index a85d137a..5c25c86f 100755 --- a/ani-cli +++ b/ani-cli @@ -481,7 +481,6 @@ case "$search" in printf "\33[2K\r\033[1;36mSearch anime: \033[0m" && read -r query done else - echo $external_menu_args [ -z "$query" ] && query=$(printf "" | external_menu "" "Search anime: " "$external_menu_args") [ -z "$query" ] && exit 1 fi From efd5aed2e31f379154b6ae3e61c9a212532c165d Mon Sep 17 00:00:00 2001 From: m0squ Date: Wed, 26 Feb 2025 15:35:04 +0100 Subject: [PATCH 5/7] Remove --normal-window flag, comply to shellcheck --- ani-cli | 7 ++----- ani-cli.1 | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ani-cli b/ani-cli index 5c25c86f..9fbfff8d 100755 --- a/ani-cli +++ b/ani-cli @@ -65,8 +65,6 @@ help_info() { Play dubbed version --rofi Use rofi instead of fzf for the interactive menu - --normal-window - Make rofi menus appear as windows (only effective when --rofi is used) --skip Use ani-skip to skip the intro of the episode (mpv only) --no-detach @@ -427,7 +425,6 @@ while [ $# -gt 0 ]; do --no-detach) no_detach=1 ;; --exit-after-play) exit_after_play=1 ;; --rofi) use_external_menu=1 ;; - --normal-window) external_menu_normal_window=1 ;; --skip) skip_intro=1 ;; --skip-title) [ $# -lt 2 ] && die "missing argument!" @@ -443,9 +440,9 @@ done [ "$use_external_menu" = "0" ] && multi_selection_flag="${ANI_CLI_MULTI_SELECTION:-"-m"}" [ "$use_external_menu" = "1" ] && multi_selection_flag="${ANI_CLI_MULTI_SELECTION:-"-multi-select"}" if [ "$external_menu_normal_window" = "1" ]; then - external_menu_args="-normal-window" + external_menu_args="-normal-window" else - external_menu_args="" + external_menu_args="" fi printf "\33[2K\r\033[1;34mChecking dependencies...\033[0m\n" dep_ch "curl" "sed" "grep" || true diff --git a/ani-cli.1 b/ani-cli.1 index 029d5f91..38ff530a 100644 --- a/ani-cli.1 +++ b/ani-cli.1 @@ -58,9 +58,6 @@ Play the dubbed version. Without this flag, it'll always play the subbed version \fB\--rofi\fR Use rofi instead of fzf for the interactive menu .TP -\fB\--normal-window\fR -Make rofi menus appear as windows (only effective when --rofi is used) -.TP \fB\--skip\fR Use ani-skip to skip the intro of the episode (mpv only) .TP From c17dc4c8ee201f8cb2a24aaa46f6a7c3e583ff77 Mon Sep 17 00:00:00 2001 From: Valerio Mosca <86920012+m0squdev@users.noreply.github.com> Date: Wed, 26 Feb 2025 22:39:18 +0100 Subject: [PATCH 6/7] Remove unnecessary else Co-authored-by: port19 --- ani-cli | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ani-cli b/ani-cli index 9fbfff8d..ec87750d 100755 --- a/ani-cli +++ b/ani-cli @@ -439,11 +439,7 @@ while [ $# -gt 0 ]; do done [ "$use_external_menu" = "0" ] && multi_selection_flag="${ANI_CLI_MULTI_SELECTION:-"-m"}" [ "$use_external_menu" = "1" ] && multi_selection_flag="${ANI_CLI_MULTI_SELECTION:-"-multi-select"}" -if [ "$external_menu_normal_window" = "1" ]; then - external_menu_args="-normal-window" -else - external_menu_args="" -fi +[ "$external_menu_normal_window" = "1" ] && external_menu_args="-normal-window" printf "\33[2K\r\033[1;34mChecking dependencies...\033[0m\n" dep_ch "curl" "sed" "grep" || true [ "$skip_intro" = 1 ] && (dep_ch "ani-skip" || true) From ad20ed97acd6323eae3774c962e22b7630427ac1 Mon Sep 17 00:00:00 2001 From: Valerio Mosca <86920012+m0squdev@users.noreply.github.com> Date: Wed, 26 Feb 2025 22:39:38 +0100 Subject: [PATCH 7/7] Change version number Co-authored-by: port19 --- ani-cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ani-cli b/ani-cli index ec87750d..8ee0ab83 100755 --- a/ani-cli +++ b/ani-cli @@ -1,6 +1,6 @@ #!/bin/sh -version_number="4.10.0" +version_number="4.9.9" # UI