📦➔🦋 Store and retrieve files on the Atmosphere

rename _SKIP_* to _DISABLE_*

+38 -40
+3 -3
README.md
··· 34 34 * **Bash³:** 3.x or later 35 35 * **Packages** 36 36 * [`curl`](https://curl.se) 37 - * [ExifTool (`exiftool`)](https://exiftool.org) _(optional: set `ATFILE_SKIP_NI_EXIFTOOL=1` to ignore)_ 37 + * [ExifTool (`exiftool`)](https://exiftool.org) _(optional: set `ATFILE_DISABLE_NI_EXIFTOOL=1` to ignore)_ 38 38 * [`file`](https://www.darwinsys.com/file) _(only on *BSD, macOS, or Linux)_ 39 39 * [GnuPG (`gpg`)](https://gnupg.org) _(optional: needed for `upload-crypt`, `fetch-crypt`)_ 40 40 * [`jq`](https://jqlang.github.io/jq) 41 - * [MediaInfo (`mediainfo`)](https://mediaarea.net/en/MediaInfo) _(optional: set `ATFILE_SKIP_NI_MEDIAINFO=1` to ignore)_ 42 - * `md5sum` _(optional: set `ATFILE_SKIP_NI_MD5SUM=1` to ignore)_ 41 + * [MediaInfo (`mediainfo`)](https://mediaarea.net/en/MediaInfo) _(optional: set `ATFILE_DISABLE_NI_MEDIAINFO=1` to ignore)_ 42 + * `md5sum` _(optional: set `ATFILE_DISABLE_NI_MD5SUM=1` to ignore)_ 43 43 * Both GNU and BusyBox versions supported 44 44 * [`websocat`](https://github.com/vi/websocat) _(optional: needed for `stream`)_ 45 45 * **ATProto account**
+2 -2
src/commands/auth.sh
··· 68 68 69 69 if [[ -n $_server ]]; then 70 70 # shellcheck disable=SC2154 71 - if [[ $_skip_auth_check == 0 ]]; then 71 + if [[ $_disable_auth_check == 0 ]]; then 72 72 atfile.say.debug "Checking authentication is valid..." 73 73 74 74 session="$(com.atproto.server.getSession)" ··· 80 80 _username="$(echo "$session" | jq -r ".did")" 81 81 fi 82 82 else 83 - atfile.say.debug "Skipping checking authentication validity\n↳ ${_envvar_prefix}_SKIP_AUTH_CHECK is set ($_skip_auth_check)" 83 + atfile.say.debug "Skipping checking authentication validity\n↳ ${_envvar_prefix}_DISABLE_AUTH_CHECK is set ($_disable_auth_check)" 84 84 if [[ "$_username" != "did:"* ]]; then 85 85 atfile.die "Cannot skip authentication validation without a DID\n↳ \$${_envvar_prefix}_USERNAME currently set to '$_username' (need \"did:<type>:<key>\")" 86 86 fi
+18 -18
src/commands/help.sh
··· 123 123 ${_envvar_prefix}_FMT_OUT_FILE <string> (default: $_fmt_out_file_default) 124 124 Format for fetched filenames. Fragments: 125 125 * [key]: Record key of uploaded file 126 - * [name]: Original name of uploaded file 127 - ${_envvar_prefix}_SKIP_AUTH_CHECK <bool¹> (default: $_skip_auth_check_default) 126 + * [name]: Original name of uploaded file\n 127 + ${_envvar_prefix}_ENDPOINT_APPVIEW <url> (default: ${_endpoint_appview_default}$([[ $_endpoint_appview_default == *"zio.blue" ]] && echo "²")) 128 + Endpoint of the Bluesky (or compatible) AppView 129 + ${_envvar_prefix}_ENDPOINT_JETSTREAM <url> (default: $_endpoint_jetstream_default$([[ $_endpoint_jetstream_default == *"zio.blue" ]] && echo "²")) 130 + Endpoint of the Jetstream relay 131 + ${_envvar_prefix}_ENDPOINT_PDS <url> 132 + Endpoint of the PDS 133 + ℹ️ Your PDS is resolved from your username. Set to override it (or if 134 + resolving fails) 135 + ${_envvar_prefix}_ENDPOINT_PLC_DIRECTORY <url> (default: ${_endpoint_plc_directory_default}$([[ $_endpoint_plc_directory_default == *"zio.blue" ]] && echo "²")) 136 + Endpoint of the PLC directory 137 + ${_envvar_prefix}_ENDPOINT_SOCIAL_APP <url> (default: ${_endpoint_social_app_default}) 138 + Endpoint of the Bluesky (or compatible) social app\n 139 + ${_envvar_prefix}_DISABLE_AUTH_CHECK <bool¹> (default: $_disable_auth_check_default) 128 140 Skip session validation on startup 129 141 If you're confident your credentials are correct, and 130 142 \$${_envvar_prefix}_USERNAME is a DID (*not* a handle), this will 131 143 drastically improve performance! 132 - ${_envvar_prefix}_SKIP_NI_EXIFTOOL <bool¹> (default: $_skip_ni_exiftool_default) 144 + ${_envvar_prefix}_DISABLE_NI_EXIFTOOL <bool¹> (default: $_disable_ni_exiftool_default) 133 145 Do not check if ExifTool is installed 134 146 ⚠️ If Exiftool is not installed, the relevant metadata records will 135 147 not be created: 136 148 * image/*: $_nsid_meta#photo 137 - ${_envvar_prefix}_SKIP_NI_MD5SUM <bool¹> (default: $_skip_ni_md5sum_default) 149 + ${_envvar_prefix}_DISABLE_NI_MD5SUM <bool¹> (default: $_disable_ni_md5sum_default) 138 150 Do not check if MD5Sum is installed 139 - ${_envvar_prefix}_SKIP_NI_MEDIAINFO <bool¹> (default: $_skip_ni_mediainfo_default) 151 + ${_envvar_prefix}_DISABLE_NI_MEDIAINFO <bool¹> (default: $_disable_ni_mediainfo_default) 140 152 Do not check if MediaInfo is installed 141 153 ⚠️ If MediaInfo is not installed, the relevant metadata records will 142 154 not be created: 143 155 * audio/*: $_nsid_meta#audio 144 - * video/*: $_nsid_meta#video\n 145 - ${_envvar_prefix}_ENDPOINT_APPVIEW <url> (default: ${_endpoint_appview_default}$([[ $_endpoint_appview_default == *"zio.blue" ]] && echo "²")) 146 - Endpoint of the Bluesky (or compatible) AppView 147 - ${_envvar_prefix}_ENDPOINT_JETSTREAM <url> (default: $_endpoint_jetstream_default$([[ $_endpoint_jetstream_default == *"zio.blue" ]] && echo "²")) 148 - Endpoint of the Jetstream relay 149 - ${_envvar_prefix}_ENDPOINT_PDS <url> 150 - Endpoint of the PDS 151 - ℹ️ Your PDS is resolved from your username. Set to override it (or if 152 - resolving fails) 153 - ${_envvar_prefix}_ENDPOINT_PLC_DIRECTORY <url> (default: ${_endpoint_plc_directory_default}$([[ $_endpoint_plc_directory_default == *"zio.blue" ]] && echo "²")) 154 - Endpoint of the PLC directory 155 - ${_envvar_prefix}_ENDPOINT_SOCIAL_APP <url> (default: ${_endpoint_social_app_default}) 156 - Endpoint of the Bluesky (or compatible) social app\n 156 + * video/*: $_nsid_meta#video 157 157 ${_envvar_prefix}_DISABLE_SETUP_DIR_CREATION <bool¹> (default: $_disable_setup_dir_creation) 158 158 Disable directory creation during setup 159 159 ${_envvar_prefix}_DISABLE_UNSUPPORTED_OS_WARN <bool¹> (default: $_disable_unsupported_os_warn)
+4 -4
src/commands/something_broke.sh
··· 73 73 $(for s in "${ATFILE_DEVEL_INCLUDES[@]}"; do echo " ↳ $s"; done) 74 74 $(atfile.something_broke.print_envvar "DEVEL_SOURCE") 75 75 $(atfile.something_broke.print_envvar "DEVEL_PUBLISH" "$_devel_publish_default") 76 + $(atfile.something_broke.print_envvar "DISABLE_AUTH_CHECK" "$_disable_auth_check_default") 77 + $(atfile.something_broke.print_envvar "DISABLE_NI_EXIFTOOL" "$_disable_ni_exiftool_default") 78 + $(atfile.something_broke.print_envvar "DISABLE_NI_MD5SUM" "$_disable_ni_md5sum_default") 79 + $(atfile.something_broke.print_envvar "DISABLE_NI_MEDIAINFO" "$_disable_ni_mediainfo_default") 76 80 $(atfile.something_broke.print_envvar "DISABLE_SETUP_DIR_CREATION" "$_disable_setup_dir_creation_default") 77 81 $(atfile.something_broke.print_envvar "DISABLE_UNSUPPORTED_OS_WARN" "$_disable_unsupported_os_warn") 78 82 $(atfile.something_broke.print_envvar "DISABLE_UPDATE_CHECKING" "$_disable_update_checking_default") ··· 98 102 $(atfile.something_broke.print_envvar "MAX_LIST" "$_max_list_default") 99 103 $(atfile.something_broke.print_envvar "OUTPUT_JSON" "$_output_json_default") 100 104 $(atfile.something_broke.print_envvar "PATH_CONF" "$_path_envvar") 101 - $(atfile.something_broke.print_envvar "SKIP_AUTH_CHECK" "$_skip_auth_check_default") 102 - $(atfile.something_broke.print_envvar "SKIP_NI_EXIFTOOL" "$_skip_ni_exiftool_default") 103 - $(atfile.something_broke.print_envvar "SKIP_NI_MD5SUM" "$_skip_ni_md5sum_default") 104 - $(atfile.something_broke.print_envvar "SKIP_NI_MEDIAINFO" "$_skip_ni_mediainfo_default") 105 105 ↳ ${_envvar_prefix}_PASSWORD: $([[ -n $(atfile.util.get_envvar "${_envvar_prefix}_PASSWORD") ]] && echo "(Set)") 106 106 $(atfile.something_broke.print_envvar "USERNAME") 107 107 Paths
+9 -11
src/entry.sh
··· 137 137 ### Defaults 138 138 139 139 _devel_publish_default=0 140 - _disable_pbc_fallback_default=0 140 + _disable_auth_check_default=0 141 + _disable_ni_exiftool_default=0 142 + _disable_ni_md5sum_default=0 143 + _disable_ni_mediainfo_default=0 141 144 _disable_setup_dir_creation_default=0 142 145 _disable_unsupported_os_warn_default=0 143 146 _disable_update_checking_default=0 ··· 157 160 _max_list_buffer=6 158 161 _max_list_default=$(( $(atfile.util.get_term_rows) - _max_list_buffer )) 159 162 _output_json_default=0 160 - _skip_auth_check_default=0 161 - _skip_ni_exiftool_default=0 162 - _skip_ni_md5sum_default=0 163 - _skip_ni_mediainfo_default=0 164 163 165 164 ### Set 166 165 167 166 _devel_publish="$(atfile.util.get_envvar "${_envvar_prefix}_DEVEL_PUBLISH" $_devel_publish_default)" 168 - _disable_pbc_fallback="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_PBC_FALLBACK" $_disable_pbc_fallback_default)" 167 + _disable_auth_check="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_AUTH_CHECK" "$_disable_auth_check_default")" 168 + _disable_ni_exiftool="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_NI_EXIFTOOL" "$_disable_ni_exiftool_default")" 169 + _disable_ni_md5sum="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_NI_MD5SUM" "$_disable_ni_md5sum_default")" 170 + _disable_ni_mediainfo="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_NI_MEDIAINFO" "$_disable_ni_mediainfo_default")" 169 171 _disable_setup_dir_creation="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_SETUP_DIR_CREATION" "$_disable_setup_dir_creation_default")" 170 172 _disable_unsupported_os_warn="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_UNSUPPORTED_OS_WARN" "$_disable_unsupported_os_warn_default")" 171 173 _disable_update_checking="$(atfile.util.get_envvar "${_envvar_prefix}_DISABLE_UPDATE_CHECKING" $_disable_update_checking_default)" ··· 189 191 _max_list="$(atfile.util.get_envvar "${_envvar_prefix}_MAX_LIST" "$_max_list_default")" 190 192 _output_json="$(atfile.util.get_envvar "${_envvar_prefix}_OUTPUT_JSON" "$_output_json_default")" 191 193 _server="$(atfile.util.get_envvar "${_envvar_prefix}_ENDPOINT_PDS")" 192 - _skip_auth_check="$(atfile.util.get_envvar "${_envvar_prefix}_SKIP_AUTH_CHECK" "$_skip_auth_check_default")" 193 - _skip_ni_exiftool="$(atfile.util.get_envvar "${_envvar_prefix}_SKIP_NI_EXIFTOOL" "$_skip_ni_exiftool_default")" 194 - _skip_ni_md5sum="$(atfile.util.get_envvar "${_envvar_prefix}_SKIP_NI_MD5SUM" "$_skip_ni_md5sum_default")" 195 - _skip_ni_mediainfo="$(atfile.util.get_envvar "${_envvar_prefix}_SKIP_NI_MEDIAINFO" "$_skip_ni_mediainfo_default")" 196 194 _password="$(atfile.util.get_envvar "${_envvar_prefix}_PASSWORD")" 197 195 _test_desktop_uas="Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0" 198 196 _username="$(atfile.util.get_envvar "${_envvar_prefix}_USERNAME")" ··· 282 280 atfile.util.check_prog "curl" "https://curl.se" 283 281 [[ $_os != "haiku" && $_os != "solaris" ]] && atfile.util.check_prog "file" "https://www.darwinsys.com/file" 284 282 atfile.util.check_prog "jq" "$_prog_hint_jq" 285 - [[ $_skip_ni_md5sum == 0 ]] && atfile.util.check_prog "md5sum" "" "${_envvar_prefix}_SKIP_NI_MD5SUM" 283 + [[ $_disable_ni_md5sum == 0 ]] && atfile.util.check_prog "md5sum" "" "${_envvar_prefix}_DISABLE_NI_MD5SUM" 286 284 #[[ $_os == "haiku" ]] && atfile.util.check_prog "perl" 287 285 288 286 # Main
+2 -2
src/shared/util.sh
··· 64 64 65 65 function atfile.util.check_prog_optional_metadata() { 66 66 # shellcheck disable=SC2154 67 - [[ $_skip_ni_exiftool == 0 ]] && atfile.util.check_prog "exiftool" "https://exiftool.org" "${_envvar_prefix}_SKIP_NI_EXIFTOOL" 67 + [[ $_disable_ni_exiftool == 0 ]] && atfile.util.check_prog "exiftool" "https://exiftool.org" "${_envvar_prefix}_DISABLE_NI_EXIFTOOL" 68 68 # shellcheck disable=SC2154 69 - [[ $_skip_ni_mediainfo == 0 ]] && atfile.util.check_prog "mediainfo" "https://mediaarea.net/en/MediaInfo" "${_envvar_prefix}_SKIP_NI_MEDIAINFO" 69 + [[ $_disable_ni_mediainfo == 0 ]] && atfile.util.check_prog "mediainfo" "https://mediaarea.net/en/MediaInfo" "${_envvar_prefix}_DISABLE_NI_MEDIAINFO" 70 70 } 71 71 72 72 function atfile.util.create_dir() {