From 1baf898c4fa51f066e413f37f80357a042bccba7 Mon Sep 17 00:00:00 2001 From: Andrew Davidson Date: Mon, 2 Jan 2023 18:43:03 -0800 Subject: [PATCH] cleanup commit --- _bin/{make_gallery.rb => gallery.rb} | 4 +- _bin/photos.rb | 23 ++++++ _includes/footer.html | 2 +- _includes/header.html | 3 +- _layouts/.DS_Store | Bin 6148 -> 0 bytes _sass/_layout.scss | 28 +++++--- albums/franks-valley-trip-2008.yaml | 103 +++++++++++++++++++++++++++ albums/mikes-new-raptor.yaml | 97 +++++++++++++++++++++++++ assets/.DS_Store | Bin 6148 -> 0 bytes 9 files changed, 247 insertions(+), 13 deletions(-) rename _bin/{make_gallery.rb => gallery.rb} (91%) create mode 100755 _bin/photos.rb delete mode 100644 _layouts/.DS_Store create mode 100644 albums/franks-valley-trip-2008.yaml create mode 100644 albums/mikes-new-raptor.yaml delete mode 100644 assets/.DS_Store diff --git a/_bin/make_gallery.rb b/_bin/gallery.rb similarity index 91% rename from _bin/make_gallery.rb rename to _bin/gallery.rb index 3456a25..bf10dd8 100755 --- a/_bin/make_gallery.rb +++ b/_bin/gallery.rb @@ -22,12 +22,14 @@ out += "gallery-date: #{Time.now.to_s}\n" @images.each_with_index do |image, i| basename = File.basename(image, '.jpg') filename = year.to_s+"-"+month.to_s+"-"+basename + exif = EXIFR::JPEG.new(image) t = " - basename: #{basename}\n" - t += " date: #{EXIFR::JPEG.new(image).date_time}\n" + t += " date: #{exif.date_time}\n" t += " thumb-src: /assets/#{filename}_t.jpg\n" t += " mid-src: /assets/#{filename}_m.jpg\n" t += " image-src: /assets/#{filename}.jpg\n" t += " mid-page: /#{gallery_slug}/#{basename}/\n" + t += " aspect: #{(exif.pixel_x_dimension.to_f / exif.pixel_y_dimension).round(2)}\n" if i == 0 then out += "gallery-key:\n" out += t diff --git a/_bin/photos.rb b/_bin/photos.rb new file mode 100755 index 0000000..108dae0 --- /dev/null +++ b/_bin/photos.rb @@ -0,0 +1,23 @@ +#!/usr/bin/env ruby + +system 'mkdir', '-p', 'out' + +require 'exifr' +require 'time' + +ARGV.each_with_index do |image, i| + basename = File.basename(image, '.jpg') + exif = EXIFR::JPEG.new(image) + filename = exif.date_time_original.year.to_s+"-"+exif.date_time_original.strftime("%m").to_s+"-"+basename + + puts "Resizing #{basename}." + thumb = "convert '#{image}' -quality 80 -resize 300x300 './out/#{filename}_t.jpg'" + `#{thumb}` + mid = "convert '#{image}' -filter Lanczos -sampling-factor 1x1 -unsharp 1.5x1+0.7+0.02 -quality 90 -resize 1300x1300 './out/#{filename}_m.jpg'" + `#{mid}` + full = "convert '#{image}' -filter Lanczos -sampling-factor 1x1 -unsharp 1.5x1+0.7+0.02 -quality 90 -resize 2500x2500 './out/#{filename}.jpg'" + `#{full}` + + paste_string = "[![basename](/assets/#{filename}_m.jpg)](/assets/#{filename}.jpg)" + puts paste_string +end diff --git a/_includes/footer.html b/_includes/footer.html index 88ba84a..4db95d6 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -17,7 +17,7 @@ diff --git a/_includes/header.html b/_includes/header.html index f0dd922..d264fe7 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -4,10 +4,11 @@ +

amdavidson.com

diff --git a/_layouts/.DS_Store b/_layouts/.DS_Store deleted file mode 100644 index c1abe7136896c0915dc62c648001f43ac3b6a6b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c!5S)b+K~SWmbV-H8A6QX9qJi74A4G(^5+Q+hCGTwP z9s4{|Y%c(rZ&qi(48W94Q8XAa?H(Q4i{yQx*c=;lc*QB!^nb(j+mEoqJsxn2uiyWK z?y~FemR-MOjtX?acJgk<2spqqIgjM}j)#o55k`-ftwsZeTzzBcI%%muDv%1K0;#}H zD!@BiZF=aKJ{3p>Qh}`kdOj33#TwWg?dYJh5`Z{iw;5x7Dl4Z1*1+b-5t=xa=v0Xk zL!8e35_vVSIXWE@#fQYopT&#V>YTq=I;1+LPX$teT?MrErOovIKj&X&w8*!Vbg4ip z@Lv^>$>Mr3=kDTe9qd!@+QN3jrlxsK0~+IH1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0