fbt/ufw-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix README

Browse Source 
* Create the album ourselves.

Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2016-03-06 07:35:25 +03:00
parent 634b11c3b4
commit e610dce293
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ufw
View File

@ -22,25 +22,28 @@ usage() {
_cat <<- EOF _cat <<- EOF
Usage: ufw [-RsF] [-D num] [file/url]" Usage: ufw [-RsF] [-D num] [file/url]"
Flags: Flags:
-R # Remove the file after uploading. -R|--remove-file # Remove the file after uploading.
-s # Make a screenshot and upload it instead of a file. -s|--screenshot # 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|--fullscreen # Make a fullscreen shot instead of prompting for a window/area. Implies -s.
-d # Supply a dexcription. -d|--description # Supply a description.
-D <num> # Delay the shot by <num> seconds. -D|--screenshot-delay <num> # Delay the shot by <num> seconds.
-p # Make the file public. -p|--public # Make the file public.
-u # Generate a shortlink from URL. -u|--short # Generate a shortlink from URL.
-m # Maximum filesize (takes K, M and G suffixes). -m|--max-filesize # Maximum filesize (takes K, M and G suffixes).
-a # Add the file to an album. -a|--album-id # Add the file to an album.
-A # API response format. -A|--album-name # Add the file to an album by name. The album will be crated, if necessary.
-M|--api-format # API response format.
Config options (~/.config/ufw): Config options (~/.config/ufw):
secret # Your personal token. Get it at https://zfh.so/settings_form secret # Your personal token. Get it at https://zfh.so/settings_form
cfg_screenshot_ext # Screenshot file type, used by scrot. cfg_screenshot_ext # Screenshot file type, used by scrot.
cfg_max_filesize # Maximum filesize in megabytes. cfg_max_filesize # Maximum filesize (takes K, M and G suffixes).
cfg_api_format # Set the api response format. Supports json or plain (default).
# Others are self-explanatory: # Others are self-explanatory:
cfg_url_regex cfg_url_regex
cfg_tmp_dir cfg_tmp_dir
cfg_service_url cfg_service_url
cfg_api_path
EOF EOF
} }
@ -111,6 +114,14 @@ upload() {
get_file_hash "$file" get_file_hash "$file"
if [[ "$album_name" ]]; then
if album_id=$( curl -fsL "$cfg_service_url/$cfg_api_path/album?a=new&name=$album_name&format=plain&secret=$secret" ); then
misc_curl_args+=( -F album_id="$album_id" )
else
return 1
fi
fi
curl -sL \ curl -sL \
-F file="@$file" \ -F file="@$file" \
-F api_format="$cfg_api_format" \ -F api_format="$cfg_api_format" \
@ -256,7 +267,7 @@ main() {
while [[ "$1" ]]; do while [[ "$1" ]]; do
case "$1" in case "$1" in
-p|--private) flag_private='false';; -p|--public) flag_private='false';;
-R|--remove-file) flag_rm='1';; -R|--remove-file) flag_rm='1';;
-s|--screenshot) flag_scrot='1';; -s|--screenshot) flag_scrot='1';;
@ -266,7 +277,9 @@ main() {
flag_scrot_fullscreen='1' flag_scrot_fullscreen='1'
;; ;;
-A|--api-format) cfg_api_format=$2; shift;; -m|--max-filesize) cfg_max_filesize=$2; shift;;
-M|--api-format) cfg_api_format=$2; shift;;
-i|--my-ip) action='getmyip';; -i|--my-ip) action='getmyip';;
@ -278,10 +291,7 @@ main() {
shift shift
;; ;;
-A|--album-name) -A|--album-name) album_name=$2; shift;;
misc_curl_args+=( -F "album_name=$2" )
shift
;;
-d|--description) -d|--description)
misc_curl_args+=( -F "description=$2" ) misc_curl_args+=( -F "description=$2" )