diff --git a/bench.sh b/bench.sh
index 0e65d71..c24a7dd 100755
--- a/bench.sh
+++ b/bench.sh
@@ -4,14 +4,17 @@ set -e
set +x
for FILE in img/bench/webp-src/*.jpg; do
- OUT="${FILE%.*}.webp"
- OUT2X="${FILE%.*}@2x.webp"
- if [ ! -f ../$OUT ]; then
- cwebp -mt -resize 160 0 -q 40 $FILE -o $OUT
+ FULLNAME=$(basename -- ${FILE})
+ NAME=${FULLNAME%.*}
+ OUT="img/bench/${NAME}.webp"
+ OUT2X="img/bench/${NAME}@2x.webp"
+ echo "Checking for \"${OUT}\"..."
+ if [ ! -f "${OUT}" ]; then
+ echo "Would thumbnail ${OUT}"
+ cwebp -mt -resize 160 0 -q 40 ${FILE} -o ${OUT}
fi
- if [ ! -f ../$OUT2X ]; then
- cwebp -mt -q 40 $FILE -o $OUT2X
+ if [ ! -f "${OUT2X}" ]; then
+ echo "Would thumbnail@2x ${OUT2X}"
+ cwebp -mt -q 40 ${FILE} -o ${OUT2X}
fi
done
-
-mv img/bench/webp-src/*.webp img/bench/
diff --git a/bench/5.html b/bench/5.html
index fa31daa..fb16ed5 100644
--- a/bench/5.html
+++ b/bench/5.html
@@ -22,6 +22,7 @@
+
diff --git a/index.html b/index.html
index 2c59ce6..be93c18 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
- Integrations Engineer @ Asana
+ Platform Engineer @ Asana
Carnegie Mellon University, SCS 2017
diff --git a/pub.py b/pub.py
index 6d9030a..a6b28da 100755
--- a/pub.py
+++ b/pub.py
@@ -26,10 +26,18 @@ TYPE_MAP = {
'webp': 'image/webp',
}
-def upload_file(filename):
+def upload_file(filename, overwrite=True):
print('Uploading {} to {}/{}'.format(filename, BUCKET, filename))
ext = filename.split('.')[-1]
+ if not overwrite:
+ try:
+ existing = s3.get_object(Bucket=BUCKET, Key=filename)
+ print('\tSkipping existing key ', filename)
+ return
+ except:
+ pass
+
s3.upload_file(filename, BUCKET, filename, ExtraArgs={
'ACL': 'public-read',
'ContentType': TYPE_MAP[ext]
@@ -77,7 +85,7 @@ def upload_bench():
upload_file('bench/{}'.format(f))
for f in img_files:
- upload_file('img/bench/{}'.format(f))
+ upload_file('img/bench/{}'.format(f), overwrite=False)
def upload_img():
files = filter_filenames(os.listdir('img'), ['jpg', 'webp'])