diff --git a/grpoppro b/grpoppro index aa37cc8..8fecc06 100755 --- a/grpoppro +++ b/grpoppro @@ -7,6 +7,7 @@ GRPOPPRO_PLAYLIST_FILE="$GRPOPPRO_DATA_DIR/lastPlaylistPlayed" GRPOPPRO_COOKIE_FILE="$GRPOPPRO_DATA_DIR/cookies.txt" GRPOPPRO_HISTORY_FILE="$GRPOPPRO_DATA_DIR/history" INTERACTIVE="on" +DEBUG="on" menu="fuzzel -d -p " #menu="fzf -i --prompt=" apiurl="https://coverapi.store" @@ -66,64 +67,73 @@ function curlRequest { # Dynamically shift the total number of times needed shift $((shifts - 1)) - # response="$(curl -s -L \ - # -c "$GRPOPPRO_COOKIE_FILE" \ - # -b "$GRPOPPRO_COOKIE_FILE" \ - # "$url" \ - # --compressed \ - # -X "$custom_method" \ - # -A "$USER_AGENT" \ - # -H "$custom_accept" \ - # -H "$ACCEPT_LANGUAGE" \ - # -H "$CONNECTION" \ - # -H "$UP_IN_REQ" \ - # "$@" - # )" + if [[ "$DEBUG" == "off" ]]; then - LOG_FILE="/tmp/grpoppro_curl_commands.log" + response="$(curl -s -L \ + -c "$GRPOPPRO_COOKIE_FILE" \ + -b "$GRPOPPRO_COOKIE_FILE" \ + "$url" \ + --compressed \ + -X "$custom_method" \ + -A "$USER_AGENT" \ + -H "$custom_accept" \ + -H "$ACCEPT_LANGUAGE" \ + -H "$CONNECTION" \ + -H "$UP_IN_REQ" \ + "$@" + )" - local curl_command=( - "curl" - "-s" - "-L" - "-c $GRPOPPRO_COOKIE_FILE" - "-b $GRPOPPRO_COOKIE_FILE" - "$url" - "--compressed" - "-X" - "$custom_method" - "-A $USER_AGENT" - "-H $custom_accept" - "-H $ACCEPT_LANGUAGE" - "-H $CONNECTION" - "$@" - ) - # "-H $UP_IN_REQ" + else - # log_string=$(printf "curl -s -L \n -c %s \n -b %s \n %s \n --compressed \n -X %s \n -A %s \n -H %s \n -H %s \n -H %s \n -H %s \n %s \n" \ - # "$GRPOPPRO_COOKIE_FILE" \ - # "$GRPOPPRO_COOKIE_FILE" \ - # "$url" \ - # "$custom_method" \ - # "$USER_AGENT" \ - # "$custom_accept" \ - # "$ACCEPT_LANGUAGE" \ - # "$CONNECTION" \ - # "$UP_IN_REQ" \ - # "$@") + if [[ "$OSTYPE" == "linux-gnu" ]]; then + LOG_FILE="/tmp/grpoppro_curl_commands.log" + else + LOG_FILE="$GRPOPPRO_DATA_DIR/grpoppro_curl_commands.log" + fi - { - echo -e "<===========================\n" - echo "Called by: ${FUNCNAME[1]}" - echo "" - echo -e "$(date '+%d-%m-%Y %H:%M:%S') -> ${curl_command[5]}\n" - # echo -e "$log_string" - printf "%s\n" "${curl_command[@]}" - echo "" - echo -e "===========================>\n" - } >> "$LOG_FILE" + local curl_command=( + "curl" + "-s" + "-L" + "-c $GRPOPPRO_COOKIE_FILE" + "-b $GRPOPPRO_COOKIE_FILE" + "$url" + "--compressed" + "-X" + "$custom_method" + "-A $USER_AGENT" + "-H $custom_accept" + "-H $ACCEPT_LANGUAGE" + "-H $CONNECTION" + "$@" + ) + # "-H $UP_IN_REQ" - response=$("${curl_command[@]}") + # log_string=$(printf "curl -s -L \n -c %s \n -b %s \n %s \n --compressed \n -X %s \n -A %s \n -H %s \n -H %s \n -H %s \n -H %s \n %s \n" \ + # "$GRPOPPRO_COOKIE_FILE" \ + # "$GRPOPPRO_COOKIE_FILE" \ + # "$url" \ + # "$custom_method" \ + # "$USER_AGENT" \ + # "$custom_accept" \ + # "$ACCEPT_LANGUAGE" \ + # "$CONNECTION" \ + # "$UP_IN_REQ" \ + # "$@") + + { + echo -e "<===========================\n" + echo "Called by: ${FUNCNAME[1]}" + echo "" + echo -e "$(date '+%d-%m-%Y %H:%M:%S') -> ${curl_command[5]}\n" + # echo -e "$log_string" + printf "%s\n" "${curl_command[@]}" + echo "" + echo -e "===========================>\n" + } >> "$LOG_FILE" + + response=$("${curl_command[@]}") + fi exit_code="$?" if [[ "$exit_code" -ne 0 ]]; then