Radiquum/furaffinity-dl
1
0
Fork 0
mirror of https://github.com/Radiquum/furaffinity-dl.git synced 2025-04-06 00:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix output filename can not begin with '-'

Browse source
This commit is contained in:
thdaemon 2020-02-16 14:31:39 +08:00
parent adf98b25af
commit 25698c9ac3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
furaffinity-dl
View file

@ -79,11 +79,11 @@ if [ -z "$(command -v exiftool)" ]; then
fi fi
cleanup() { cleanup() {
rm "$tempfile" rm -f "$tempfile"
} }
# Attempt to create the output directory # Attempt to create the output directory
mkdir -p "$outdir" mkdir -p -- "$outdir"
# Setup temporarily file with 600 perms # Setup temporarily file with 600 perms
tempfile="$(umask u=rwx,g=,o= && mktemp --suffix=_fa-dl)" tempfile="$(umask u=rwx,g=,o= && mktemp --suffix=_fa-dl)"
@ -176,7 +176,7 @@ https://github.com/Xerbo/furaffinity-dl/issues" >&2
echo "File already exists, skipping. Use -w to skip this check" echo "File already exists, skipping. Use -w to skip this check"
fi fi
mime_type="$(file "$file")" mime_type="$(file -- "$file")"
if [ $textmeta = true ]; then if [ $textmeta = true ]; then
echo -ne "Title: $title\nURL: $page\nFilename: $file_name\nDescription: $description" > "$file.meta" echo -ne "Title: $title\nURL: $page\nFilename: $file_name\nDescription: $description" > "$file.meta"
@ -187,16 +187,16 @@ https://github.com/Xerbo/furaffinity-dl/issues" >&2
# Use eyeD3 for injecting metadata into audio files (if it's installed) # Use eyeD3 for injecting metadata into audio files (if it's installed)
if [ $eyed3 = true ] && [ $metadata = true ]; then if [ $eyed3 = true ] && [ $metadata = true ]; then
if [ -z "$description" ]; then if [ -z "$description" ]; then
eyeD3 -t "$title" "$file" || true eyeD3 -t "$title" -- "$file" || true
else else
# HACK: eyeD3 throws an error if a description containing a ":" # HACK: eyeD3 throws an error if a description containing a ":"
eyeD3 -t "$title" --add-comment "${description//:/\\:}" "$file" || true eyeD3 -t "$title" --add-comment "${description//:/\\:}" -- "$file" || true
fi fi
fi fi
elif [[ $mime_type == *"image"* ]]; then elif [[ $mime_type == *"image"* ]]; then
# Use exiftool for injecting metadata into pictures (if it's installed) # Use exiftool for injecting metadata into pictures (if it's installed)
if [ $exiftool = true ] && [ $metadata = true ]; then if [ $exiftool = true ] && [ $metadata = true ]; then
exiftool "$file" -description="$description" -title="$title" -overwrite_original || true cat -- "$file" | exiftool -description="$description" -title="$title" -overwrite_original - > "$tempfile" && mv -- "$tempfile" "$file" || true
fi fi
fi fi