diff options
| -rw-r--r-- | operators/command_source.zsh | 44 | ||||
| -rw-r--r-- | units/sn_auth.zsh | 12 |
2 files changed, 29 insertions, 27 deletions
diff --git a/operators/command_source.zsh b/operators/command_source.zsh index edd0d39..993e88f 100644 --- a/operators/command_source.zsh +++ b/operators/command_source.zsh @@ -12,37 +12,51 @@ do sleep 1 done +if [[ -n "${1}" ]] +then + sn_key="${1}" + source "${units}/sn_auth.zsh" + + if [[ -d "${user_config}" ]] + then + user_data=($(ls -1 "${user_config}")) + + if [[ ${#user_data} -eq 0 ]] + then + rmdir "${user_config}" + fi + fi + + rmdir "${user_config}.lock" + return +fi + if ! [[ -f "${user_config}/saucenao" ]] then + rmdir "${user_config}.lock" + user_id=0 user_config="${users}/${user_id}" +else + rmdir "${user_config}.lock" fi -rmdir "${user_config}.lock" - until mkdir "${user_config}.lock" do sleep 1 done -source "${units}/sn_auth.zsh" - -if [[ -d "${user_config}" ]] +if ! [[ -f "${user_config}/saucenao" ]] then - user_data=($(ls -1 "${user_config}")) + output_text="You must provide your SauceNAO API key before you can use SauceNAO" - if [[ ${#user_data} -eq 0 ]] - then - rmdir "${user_config}" - fi + rmdir "${user_config}.lock" + return fi -rmdir "${user_config}.lock" +sn_key="$(< "${user_config}/saucenao")" -if [[ -n "${output_text}" ]] -then - return -fi +rmdir "${user_config}.lock" source "${units}/sn_get.zsh" diff --git a/units/sn_auth.zsh b/units/sn_auth.zsh index 05e4fce..49e46fa 100644 --- a/units/sn_auth.zsh +++ b/units/sn_auth.zsh @@ -2,18 +2,6 @@ # Copyright (C) 2024-2026 Danil Lisin # SPDX-License-Identifier: Apache-2.0 -if [[ -n "${1}" ]] -then - sn_key="${1}" -elif [[ -f "${user_config}/saucenao" ]] -then - sn_key="$(< "${user_config}/saucenao")" - return -else - output_text="You must provide your SauceNAO API key before you can use SauceNAO" - return -fi - if ! mkdir -p "${user_config}" then output_text="Failed to create user config" |