jekyll-pig 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73810e7360f4a48d45c78d83f0653beb16da0243cfb94164a6cc049a16cbe70
-  data.tar.gz: cd92492bd2faa8766fe3b9afbed32b295cbe9deb828e30422eff3da8055fe76d
+  metadata.gz: bd6c955e443343e3d518c3b174cb1f7dc665f810c8420f5dec7c8dfccf345f2d
+  data.tar.gz: 3d3c91f6ca57ecbd9acee9dd68554f7eb8ce04500008c9fb09c827f9f2cd88c4
 SHA512:
-  metadata.gz: 342632257774fca9636fabfe4dc78866f5643075426b7c3fff2b88ffb55ca58b2f72172d98c7eb82d8e0f0b309f8cb4eac87878c7160c2b7c643dee343934ffa
-  data.tar.gz: 227ba484c11be61757766ada3c307ed79cc3333d7d6056ba31282610d308063f2cd7958af00933fbd52bee92a1b0411dbeb4c8c007dd65823545e6a2a6d25b29
+  metadata.gz: d2ab7eb1ef1d385abb3f274659435f844e0db139822da055e429e449fea15b64145c5f3082be02fb13a9b1bad2c27ef7665a965173f0e839ed2c6e7fed40bd18
+  data.tar.gz: 5b3cb6c3c98675efe89e9f31a65b59765f66768ac4ffa51318b90ad93d5d179f45710ddf890063da9c90d798164f80274593ec6dc686fcf1a742e1742baa5de0

data/lib/jekyll-pig.rb

@@ -76,10 +76,10 @@ module JekyllPig
             image_data
         end
         
-        #read images that require processing from gallery
-        def get_images(gallery_path)
-            patterns = ['*.jpg', '*.jpeg', '*.png'].map { |ext| File.join(gallery_path, ext) }
-            Dir.glob(patterns).map { |path| File.basename(path) }
+        #get a list of image file names from a given path
+        def get_images(path)
+            patterns = ['*.jpg', '*.jpeg', '*.png'].map { |ext| File.join(path, ext) }
+            Dir.glob(patterns).map { |filepath| File.basename(filepath) }
         end
         
         def get_image(gallery_path, image_name)
@@ -128,20 +128,48 @@ module JekyllPig
             image_html_url(gallery_name, image_data[index]['filename'])
         end
         
-        #create thumbnails and fullsize image assets, and create full size html page for a given image
-        def process_image(image_data, gallery_id, gallery_path, image_name)
-            #puts "jekyll-pig: processing " << image_name
+        #create thumbnails and fullsize image assets
+        def process_images(image_data, gallery_id, gallery_path, images)
             #create thumbs
-            [1024, 500, 250, 100, 20].each { |size|
+            sizes = [1024, 500, 250, 100, 20]
+            sizes.each { |size|
+                #output path for current size
                 size_out_path = File.join(@img_path, gallery_id, size.to_s)
-                resized_img_path = File.join(size_out_path, image_name)
-                if not File.exists? resized_img_path
-                    image = get_image(gallery_path, image_name)
-                    image.resize("x" + size.to_s)
-                    FileUtils.mkdir_p size_out_path unless File.exists? size_out_path
-                    image.write(resized_img_path)
-                end
+                FileUtils.mkdir_p size_out_path unless File.exists? size_out_path
+                
+                #images that have already been processed for the current size
+                done_images = get_images(size_out_path)
+                #all images in the gallery with the ones already done taken away
+                todo_images = images - done_images
+                
+                #function to get the source path to use for creating the given size thumbnail
+                #i.e. use the 500px sized images to make the 250px versions
+                source_for_size = -> (size) {
+                    index = sizes.index(size)
+                    source = gallery_path
+                    if index != nil && index != 0
+                        source = File.join(@img_path, gallery_id, sizes[index - 1].to_s)
+                    end
+                    source
+                }
+                
+                #do the processing in a batch
+                mog = MiniMagick::Tool::Mogrify.new
+                mog.resize("x#{size}")
+                mog.sampling_factor('4:2:0')
+                mog.colorspace('RGB')
+                mog.interlace('Plane')
+                mog.strip()
+                mog.quality('75')
+                mog.path(size_out_path)
+                source_path = source_for_size.call(size)
+                todo_images.each { |todo| mog << File.join(source_path, todo) }
+                mog.call
             }
+        end
+        
+        #create full size html page for a given image
+        def process_image(image_data, gallery_id, gallery_path, image_name)
             full_size_html_path = File.join(@html_path, gallery_id, image_name + ".html")
             #create full size html if it doesn't exist
             if not File.exists? full_size_html_path
@@ -231,6 +259,7 @@ module JekyllPig
                 
                 #get image data from _data
                 image_data = get_image_data(gallery.name)
+                old_image_data = image_data.clone
                 
                 #get images from gallery
                 images = get_images(gallery.path)
@@ -241,21 +270,25 @@ module JekyllPig
                 #sort image data
                 image_data = image_data.sort_by { |data| data['datetime'] }
                 
-                #process images
+                #create thumbs
+                process_images(image_data, gallery.name, gallery.path, images)
+                
                 images.each do |image_name|
-                    #create thumbs, full size, and html assets for each image
+                    #create html assets for each image
                     process_image(image_data, gallery.name, gallery.path, image_name)
                 end
                 
-                #write image_data
-                File.open(File.join(@data_path, "#{gallery.name}.json"), 'w') { |file|
-                    file.write(image_data.to_json)
-                }
-                
-                #save this gallery's includable content
-                File.open(File.join(@includes_path, "#{gallery.name}.html"), 'w') { |file|
-                    file.write(gallery_html(gallery.name, image_data))
-                }
+                if image_data != old_image_data
+                    #write image_data
+                    File.open(File.join(@data_path, "#{gallery.name}.json"), 'w') { |file|
+                        file.write(image_data.to_json)
+                    }
+                    
+                    #save this gallery's includable content
+                    File.open(File.join(@includes_path, "#{gallery.name}.html"), 'w') { |file|
+                        file.write(gallery_html(gallery.name, image_data))
+                    }
+                end
             end
         end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-pig
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Colin Holzman