3 Commits
1.4 ... 1.5.1

Author SHA1 Message Date
fbt
e3d642a730 /ip support 2015-10-12 17:59:33 +03:00
fbt
b118e40f72 rm didn't work if the file was already uploaded 2015-07-05 17:14:27 +03:00
fbt
76952ee309 description support 2015-06-23 23:25:48 +03:00

27
sup
View File

@@ -29,6 +29,7 @@ sup.usage() {
-R # Remove the file after uploading. -R # Remove the file after uploading.
-s # Make a screenshot and upload it instead of a file. -s # Make a screenshot and upload it instead of a file.
-F # Make a fullscreen shot instead of prompting for a window/area. Implies -s. -F # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
-d # Supply a dexcription.
-D <num> # Delay the shot by <num> seconds. -D <num> # Delay the shot by <num> seconds.
-p # Make the file private. Requires \$secret to be set in the config. -p # Make the file private. Requires \$secret to be set in the config.
-u # Generate a shortlink from URL. -u # Generate a shortlink from URL.
@@ -87,24 +88,26 @@ sup.upload() {
if ! (( $? )); then if ! (( $? )); then
printf '%s\n' "$file_url" printf '%s\n' "$file_url"
else else
if curl -sL \ curl -sL \
-F file="@$file" \ -F file="@$file" \
-F upload_mode='api' \ -F upload_mode='api' \
-F flag_private="$flag_private" \ -F flag_private="$flag_private" \
-F short="$flag_shortlink" \ -F short="$flag_shortlink" \
-F description="$description" \
-F secret="$secret" \ -F secret="$secret" \
-F submit="" \ -F submit="" \
-A 'zerofiles.org upload script' \ -A 'zerofiles.org upload script' \
"$cfg_service_url/upload" "$cfg_service_url/upload"
then fi
if (( $? )); then
sup.err 'Something has gone wrong with the upload.'
return 7
else
if (( flag_rm )); then if (( flag_rm )); then
sup.msg "Removing file: $file" sup.msg "Removing file: $file"
rm "$file" rm "$file"
fi fi
else
sup.err 'Something has gone wrong with the upload.'
return 7
fi
fi fi
} }
@@ -164,6 +167,14 @@ sup.mktemp() {
printf '%s\n' "${tmp_dir}/${tmp_file_name}" printf '%s\n' "${tmp_dir}/${tmp_file_name}"
} }
sup.get_my_ip() {
my_ip=$( curl -fsL https://zfh.so/ip )
if ! (( $? )); then
printf '%s\n' $my_ip
fi
}
sup.set_argv() { sup.set_argv() {
declare arg opt c declare arg opt c
declare -g argv declare -g argv
@@ -209,12 +220,15 @@ main() {
-R|--remove-file) flag_rm='1';; -R|--remove-file) flag_rm='1';;
-s|--screenshot) flag_scrot='1';; -s|--screenshot) flag_scrot='1';;
-d|--description) description="$2"; shift;;
-D|--screenshot-delay) cfg_scrot_delay="$2"; shift;; -D|--screenshot-delay) cfg_scrot_delay="$2"; shift;;
-F|--fullscreen) -F|--fullscreen)
flag_scrot='1' flag_scrot='1'
flag_scrot_fullscreen='1' flag_scrot_fullscreen='1'
;; ;;
-i|--my-ip) action='getmyip';;
-S|--short) flag_shortlink='1';; -S|--short) flag_shortlink='1';;
-u|--url) action='url';; -u|--url) action='url';;
@@ -232,6 +246,7 @@ main() {
case "${action:-upload}" in case "${action:-upload}" in
upload) sup.upload "$1";; upload) sup.upload "$1";;
url) sup.url "$1";; url) sup.url "$1";;
getmyip) sup.get_my_ip;;
esac esac
} }