diff --git a/.gitignore b/.gitignore index 3d981c6..f418d8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ *~ \#* .\#* -*.swp -*.vcf diff --git a/README.md b/README.md deleted file mode 100644 index e4e6a59..0000000 --- a/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# VCF Compressor - -A simple bash script that compress images inside a vCard 3.0. - - -## Requirements - -* bash -* imagemagick - - -## Further reading - -* [vCard on Wikipedia](https://en.wikipedia.org/wiki/VCard) -* vCard 3.0: [RFC 2425](https://tools.ietf.org/html/rfc2425) and [RFC 2426](https://tools.ietf.org/html/rfc2426) -* vCard 4.0: [RFC 6350](https://tools.ietf.org/html/rfc6350) -* CardDAV: [RFC 6352](https://tools.ietf.org/html/rfc6352) diff --git a/vcf_compressor.sh b/vcf_compressor.sh index 99ff3ae..3ddc164 100755 --- a/vcf_compressor.sh +++ b/vcf_compressor.sh @@ -1,16 +1,16 @@ #!/bin/bash ## Copyright (c) 2015 Rodolphe Breard -## +## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. -## +## ## This program is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -## +## ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . ## @@ -29,46 +29,21 @@ usage () { echo "" echo "Options:" echo " -o, --output" - echo " --version" + echo " -v, --verbose" + echo " -V, --version" echo " -h, --help" exit "$exit_status" } -raw_img () { - line="$1" - - echo "$line" | cut -d ":" -f2 | base64 -d -} - -compress_photo () { - line="$1" - max_width="300" - max_height="300" - - prefix=$(echo "$line" | cut -d ":" -f1) - width=$(raw_img "$line" | identify -format '%w' -) - height=$(raw_img "$line" | identify -format '%h' -) - if [ "$width" -gt "$max_width" ] || [ "$height" -gt "$max_height" ] ; then - picture=$(raw_img "$line" | convert "-" -quality 50 -resize "${max_width}x${max_height}>" "-" | base64 -w0) - echo "$prefix:$picture" - else - echo "$line" - fi -} - -process_line () { - line="$1" - - echo "$line" | egrep "^PHOTO;" | grep ";ENCODING=b;" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - compress_photo "$line" - else - echo "$line" +echo_verbose () { + if [ $verbose -gt 0 ]; then + echo "$@" fi } input_file="" output_file="" +verbose=0 while :; do test $# -gt 0 || break @@ -82,7 +57,11 @@ while :; do usage fi ;; - --version) + -v|--verbose) + verbose=1 + shift + ;; + -V|--version) version ;; -h|--help) @@ -100,19 +79,12 @@ while :; do esac done test -z "$input_file" && usage -if [ ! -f "$input_file" ]; then - echo "$input_file: file not found" - exit 1 -fi if [ -z "$output_file" ]; then dir=$(dirname "$input_file") name=$(basename "$input_file" ".vcf") output_file="$dir/$name.new.vcf" fi -echo -n > "$output_file" - -while IFS='' read -r line || [[ -n "$line" ]]; do - line=$(process_line "$line") - echo "$line" >> "$output_file" -done < "$input_file" +echo "in: $input_file" +echo "out: $output_file" +echo_verbose "verbose mode on"