jekyll-gallery-generator 0.0.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ad41b33154e2629ba3549e012db0fcc37713a6
-  data.tar.gz: 83460d8f045af954246a437b912556264b137e18
+  metadata.gz: 9fb877d9687a9a9b4c2ceb86449dbb29ff32db30
+  data.tar.gz: 3b95efbc9f1992097efae0ae0dd8a1c93cd6bd25
 SHA512:
-  metadata.gz: 9eaa08866c392af9605c4b164133ecd4f37529a0e5b3e7ba2fbde68c6b7b846e5cd0dcda60446c2d58dc729981692ec360837e9d7cc66bd3dfcb0ee8ed9c850e
-  data.tar.gz: 4596126cfcee3a39cba569e3ba968249b9a74d4407c6ced3c418cac1ce2f809a40eb9faeca0f028171bb0745894f9282f0043bebdb60cc3563e533eafad2c8fc
+  metadata.gz: 5fce10d707394b0df32939ae3fa2b4da5938d627308e16fbe0dfb417ef49e9cc543f8ff477cc6fe435a1ace94de46a90af65c7dca801552ed7c802bfe94dc43c
+  data.tar.gz: 520617fc88e4e50ca4183efd7a04889aeba93554017530350167045a42e39fadd9331ca800822a2afc3967869071d69bb71781bba2db5333fa7fda6626e04e0e

data/jekyll-gallery-generator.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |spec|
   spec.name        = "jekyll-gallery-generator"
   spec.summary     = "Generate galleries with thumbnails for your Jekyll site."
-  spec.version     = "0.0.8"
+  spec.version     = "0.9.0"
   spec.authors     = ["Geoff Greer"]
   spec.email       = "geoff@greer.fm"
   spec.homepage    = "https://github.com/ggreer/jekyll-gallery-generator"
-  spec.licenses    = ["Apache 2.0"]
+  spec.licenses    = ["Apache-2.0"]
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]

data/lib/jekyll-gallery-generator.rb

@@ -6,6 +6,17 @@ include FileUtils
 
 $image_extensions = [".png", ".jpg", ".jpeg", ".gif"]
 
+def get_exif_date_time(image_path)
+  begin
+    return EXIFR::JPEG.new(image_path).date_time.to_i
+  rescue EXIFR::MalformedJPEG
+    puts "No EXIF data in #{image_path}"
+  rescue Exception => e
+    puts "Error reading EXIF date_time for #{image_path}: #{e}"
+  end
+  return 0
+end
+
 module Jekyll
   class GalleryFile < StaticFile
     def write(dest)
@@ -122,7 +133,8 @@ module Jekyll
 
       FileUtils.mkdir_p(thumbs_dir, :mode => 0755)
       date_times = {}
-      Dir.foreach(dir) do |image|
+      entries = Dir.entries(dir)
+      entries.each_with_index do |image, i|
         next if image.chars.first == "."
         next unless image.downcase().end_with?(*$image_extensions)
         @images.push(image)
@@ -130,12 +142,7 @@ module Jekyll
         @site.static_files << GalleryFile.new(site, base, File.join(@dest_dir, "thumbs"), image)
         image_path = File.join(dir, image)
 
-        begin
-          date_times[image] = EXIFR::JPEG.new(image_path).date_time.to_i
-        rescue Exception => e
-          date_times[image] = 0
-          puts "Error getting date_time for #{image}: #{e}"
-        end
+        date_times[image] = get_exif_date_time(image_path)
 
         if symlink
           link_src = site.in_source_dir(image_path)
@@ -167,12 +174,17 @@ module Jekyll
             puts "Writing thumbnail to #{thumb_path}"
             m_image.write(thumb_path)
           rescue e
-            puts "Error generating thumbnail for #{image_path}: #{e}"
+            printf "Error generating thumbnail for #{image_path}: #{e}\r"
             puts e.backtrace
           end
-          GC.start
+          if i % 5 == 0
+            GC.start
+          end
         end
+
+        printf "#{gallery_name} #{i+1}/#{entries.length} images\r"
       end
+      puts ""
 
       begin
         @images.sort! {|a,b|
@@ -194,12 +206,7 @@ module Jekyll
       self.data["images"] = @images
       self.data["best_image"] = gallery_config["best_image"] || best_image
       best_image_path = File.join(dir.to_s, best_image.to_s)
-      begin
-        self.data["date_time"] = EXIFR::JPEG.new(best_image_path).date_time.to_i
-      rescue Exception => e
-        self.data["date_time"] = 0
-        puts "Error getting date_time for #{best_image_path}: #{e}"
-      end
+      self.data["date_time"] = get_exif_date_time(best_image_path)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gallery-generator
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Geoff Greer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exifr
@@ -85,7 +85,7 @@ files:
 - script/test
 homepage: https://github.com/ggreer/jekyll-gallery-generator
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - imagemagick, >=v6.9 (needed by RMagick)
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate galleries with thumbnails for your Jekyll site.