aaron/www
1
0
Fork 0
Code Releases Activity

Be smart about thumbnailing and uploading benches

Browse Source
This commit is contained in:
Aaron Gutierrez
2018-11-13 08:46:44 -08:00
parent 9babb7f435
commit 1e5f2a631b
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bench.sh
View File

@@ -4,14 +4,17 @@ set -e
set +x set +x
for FILE in img/bench/webp-src/*.jpg; do for FILE in img/bench/webp-src/*.jpg; do
OUT="${FILE%.*}.webp" FULLNAME=$(basename -- ${FILE})
OUT2X="${FILE%.*}@2x.webp" NAME=${FULLNAME%.*}
if [ ! -f ../$OUT ]; then OUT="img/bench/${NAME}.webp"
cwebp -mt -resize 160 0 -q 40 $FILE -o $OUT 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 fi
if [ ! -f ../$OUT2X ]; then if [ ! -f "${OUT2X}" ]; then
cwebp -mt -q 40 $FILE -o $OUT2X echo "Would thumbnail@2x ${OUT2X}"
cwebp -mt -q 40 ${FILE} -o ${OUT2X}
fi fi
done done
mv img/bench/webp-src/*.webp img/bench/

1
bench/5.html
View File

@@ -22,6 +22,7 @@
<a href="/img/bench/065.jpg"><picture><source type="image/webp" srcset="/img/bench/065.thumb.webp, /img/bench/065.thumb@2x.webp 2x"><img src="/img/bench/065.thumb.jpg"></picture></a> <a href="/img/bench/065.jpg"><picture><source type="image/webp" srcset="/img/bench/065.thumb.webp, /img/bench/065.thumb@2x.webp 2x"><img src="/img/bench/065.thumb.jpg"></picture></a>
<a href="/img/bench/066.jpg"><picture><source type="image/webp" srcset="/img/bench/066.thumb.webp, /img/bench/066.thumb@2x.webp 2x"><img src="/img/bench/066.thumb.jpg"></picture></a> <a href="/img/bench/066.jpg"><picture><source type="image/webp" srcset="/img/bench/066.thumb.webp, /img/bench/066.thumb@2x.webp 2x"><img src="/img/bench/066.thumb.jpg"></picture></a>
<a href="/img/bench/067.jpg"><picture><source type="image/webp" srcset="/img/bench/067.thumb.webp, /img/bench/067.thumb@2x.webp 2x"><img src="/img/bench/067.thumb.jpg"></picture></a> <a href="/img/bench/067.jpg"><picture><source type="image/webp" srcset="/img/bench/067.thumb.webp, /img/bench/067.thumb@2x.webp 2x"><img src="/img/bench/067.thumb.jpg"></picture></a>
<a href="/img/bench/068.jpg"><picture><source type="image/webp" srcset="/img/bench/068.thumb.webp, /img/bench/068.thumb@2x.webp 2x"><img src="/img/bench/068.thumb.jpg"></picture></a>
</div> </div>
<div class="nav"> <div class="nav">

2
index.html
View File

@@ -17,7 +17,7 @@
<img id="aaron" alt="Aaron" src="img/aaron.jpg" <img id="aaron" alt="Aaron" src="img/aaron.jpg"
srcset="img/aaron.jpg, img/aaron@2x.jpg 2x,img/aaron@3x.jpg 3x"> srcset="img/aaron.jpg, img/aaron@2x.jpg 2x,img/aaron@3x.jpg 3x">
<p> <p>
Integrations Engineer @ <a href="https://asana.com">Asana</a><br> Platform Engineer @ <a href="https://asana.com">Asana</a><br>
Carnegie Mellon University, SCS 2017 Carnegie Mellon University, SCS 2017
</p> </p>
</header> </header>

12
pub.py
View File

@@ -26,10 +26,18 @@ TYPE_MAP = {
'webp': 'image/webp', 'webp': 'image/webp',
} }
def upload_file(filename): def upload_file(filename, overwrite=True):
print('Uploading {} to {}/{}'.format(filename, BUCKET, filename)) print('Uploading {} to {}/{}'.format(filename, BUCKET, filename))
ext = filename.split('.')[-1] 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={ s3.upload_file(filename, BUCKET, filename, ExtraArgs={
'ACL': 'public-read', 'ACL': 'public-read',
'ContentType': TYPE_MAP[ext] 'ContentType': TYPE_MAP[ext]
@@ -77,7 +85,7 @@ def upload_bench():
upload_file('bench/{}'.format(f)) upload_file('bench/{}'.format(f))
for f in img_files: for f in img_files:
upload_file('img/bench/{}'.format(f)) upload_file('img/bench/{}'.format(f), overwrite=False)
def upload_img(): def upload_img():
files = filter_filenames(os.listdir('img'), ['jpg', 'webp']) files = filter_filenames(os.listdir('img'), ['jpg', 'webp'])