diff --git a/helpers/config.sh b/helpers/config.sh index b7c9128..6336217 100644 --- a/helpers/config.sh +++ b/helpers/config.sh @@ -200,7 +200,6 @@ setup_config() { local show_notifications local save_images local default_option - local snip_sound echo -ne "${CYAN}What do you want the default option to be? (upload/save/copy): ${RESET}" read default_option @@ -245,16 +244,6 @@ setup_config() { [[ "$show_notifications" =~ ^(y|Y)$ ]] && show_notifications="true" || show_notifications="false" set_value "SHOW_NOTIFICATIONS" "$show_notifications" - echo -ne "${CYAN}Do you want to play a sound after upload? (y/n): ${RESET}" - read snip_sound - while ! [[ "$snip_sound" =~ ^(y|Y|n|N|true|false)$ ]]; do - echo -e "${RED}Invalid option. Please enter 'y' or 'n'.${RESET}" - echo -ne "${CYAN}Do you want to play a sound after upload? (y/n): ${RESET}" - read snip_sound - done - [[ "$snip_sound" =~ ^(y|Y)$ ]] && snip_sound="true" || snip_sound="false" - set_value "SNIP_SOUND" "$snip_sound" - echo -ne "${CYAN}Do you want to show capture preview? (y/n): ${RESET}" read show_capture_preview while ! [[ "$show_capture_preview" =~ ^(y|Y|n|N|true|false)$ ]]; do @@ -269,4 +258,4 @@ setup_config() { echo -e "${YELLOW}You can change the configuration later by running the script with the --config option.${RESET}" [[ "$show_capture_preview" == "true" ]] && setup_venv -} +} \ No newline at end of file diff --git a/helpers/variables.sh b/helpers/variables.sh index a08d95c..5a781df 100644 --- a/helpers/variables.sh +++ b/helpers/variables.sh @@ -13,7 +13,6 @@ declare -A ALLOWED_KEYS=( ["log_level"]="^(DEBUG|INFO|WARN|ERROR)$" ["SHOW_CAPTURE_PREVIEW"]="^(true|false)$" ["SHOW_NOTIFICATIONS"]="^(true|false)$" - ["SNIP_SOUND"]="^(true|false)$" ["SAVE_IMAGES"]="^(true|false)$" ["SAVE_DIR"]="^.+$" ["DOMAIN"]="^.+$" @@ -30,7 +29,6 @@ declare -A ALLOWED_KEYS=( REQUIRED_KEYS=( "SHOW_CAPTURE_PREVIEW" "SHOW_NOTIFICATIONS" - "SNIP_SOUND" "SAVE_IMAGES" "DEFAULT_OPTION" ) @@ -67,4 +65,4 @@ declare -A UPLOAD_JSON_KEYS=( ["ez"]="imageUrl" ["fakecrime"]="url" ["zipline"]="files[0].url" -) +) \ No newline at end of file diff --git a/main.sh b/main.sh index 9820681..f491018 100755 --- a/main.sh +++ b/main.sh @@ -65,7 +65,6 @@ while [[ $# -gt 0 ]]; do --silent) SHOW_NOTIFICATIONS=false SHOW_CAPTURE_PREVIEW=false - SNIP_SOUND=false shift ;; --*) @@ -94,9 +93,6 @@ SHOULD_UPLOAD=$(get_value "DEFAULT_OPTION") SHOW_NOTIFICATIONS=$(get_value "SHOW_NOTIFICATIONS") [[ "$SHOW_NOTIFICATIONS" == "true" ]] && SHOW_NOTIFICATIONS=true || SHOW_NOTIFICATIONS=false -SNIP_SOUND=$(get_value "SNIP_SOUND") -[[ "$SNIP_SOUND" == "true" ]] && SNIP_SOUND=true || SNIP_SOUND=false - SHOW_CAPTURE_PREVIEW=$(get_value "SHOW_CAPTURE_PREVIEW") [[ "$SHOW_CAPTURE_PREVIEW" == "true" ]] && SHOW_CAPTURE_PREVIEW=true || SHOW_CAPTURE_PREVIEW=false @@ -155,12 +151,6 @@ send_notification() { "${notify_cmd[@]}" } -play_sound() { - [[ "$SNIP_SOUND" == "false" ]] && return - - paplay /usr/share/sounds/freedesktop/stereo/camera-shutter.oga -} - SHOULD_UPLOAD=false SHOULD_SAVE="$(get_value "SAVE_IMAGES")" SHOULD_COPY=false @@ -375,21 +365,18 @@ MIME_TYPE=$(file --mime-type -b "$FILE") if [[ "$MIME_TYPE" == image/* ]]; then if [[ "$SHOW_NOTIFICATIONS" == "true" ]]; then send_notification "Uploaded to $SERVICE" "$FILE_URL" "$FILE" - play_sound fi if [[ "$SHOW_CAPTURE_PREVIEW" == "true" ]]; then "$PYTHON_EXEC" "$SCRIPT_DIR/helpers/show_image.py" "$FILE" "Uploaded to $SERVICE" - play_sound fi else if [[ "$SHOW_NOTIFICATIONS" == "true" ]]; then send_notification "Uploaded to $SERVICE" "$FILE_URL" - play_sound fi fi # delete if should not save and not a user file if [[ "$SHOULD_SAVE" != "true" && "$USER_FILE" == "" ]]; then rm -f "$FILE" -fi +fi \ No newline at end of file