Merge pull request #204 from robotmay/master

Bugfixes for image processing issues

Gemfile.lock

@@ -232,7 +232,7 @@ GEM
     metaclass (0.0.1)
     method_source (0.8.1)
     mime-types (1.25)
-    mini_exiftool (1.6.0)
+    mini_exiftool (2.3.0)
     mini_exiftool_vendored (8.9.7.v2)
       mini_exiftool (>= 1.6.0)
     minitest (4.7.5)

app/models/metadata.rb

@@ -220,6 +220,8 @@ def fetch_from_exif(exif, keys = [])
     return_hash = {}
 
     exif.to_hash.each do |key, value|
+      next if key.nil?
+
       key = key.underscore.to_sym
       if keys.include?(key)
         return_hash[key] = value

app/models/photograph.rb

@@ -157,7 +157,7 @@ def visible?
 
   def exif
     Photograph.benchmark "Parsing image for EXIF" do
-      MiniExiftool.new(image.file.path)
+      MiniExiftool.new(image.file.path, replace_invalid_chars: '')
     end
   end
 

app/workers/photo_expansion_worker.rb

@@ -6,16 +6,24 @@ class MetadataRecordMissing < StandardError; end
   sidekiq_options queue: :photos
 
   def perform(photograph_id)
-    timeout(300) do
-      @photo = Photograph.find(photograph_id)
+    begin
+      timeout(300) do
+        @photo = Photograph.find(photograph_id)
 
-      # Extract the metadata and save it
-      extract_metadata
+        # Extract the metadata and save it
+        extract_metadata
 
-      # Generate all the other image sizes
-      generate_images
+        # Generate all the other image sizes
+        generate_images
 
-      @photo.save!
+        @photo.save!
+      end
+    rescue Exception => ex
+      if @photo.present?
+        @photo.logs << [ex.message, "\n", ex.backtrace.take(5).join("\n")]
+      end
+
+      raise ex
     end
   end
 
@@ -38,7 +46,11 @@ def extract_metadata
       metadata.extract_from_photograph
 
       @photo.logs << "Saving metadata record"
-      metadata.save!
+      if metadata.save!
+        @photo.logs << "Metadata record saved"
+      else
+        @photo.logs << "Metadata didn't save successfully"
+      end
     end
   end
 

config/environments/production.rb

@@ -5,7 +5,10 @@
   config.cache_classes = true
 
   # Other caching configuration
-  config.cache_store = :dalli_store
+  config.cache_store = :dalli_store, {
+    value_max_bytes: 10.megabytes,
+    compress: true
+  }
   config.action_controller.perform_caching = true
   config.action_dispatch.rack_cache = {
     metastore: Dalli::Client.new,

spec/models/metadata_spec.rb

@@ -136,6 +136,17 @@
           wibble_pt: 100
         })
       end
+
+      context "nil keys" do
+        let(:exif) { { nil => nil, "test" => 100 } }
+
+        it "returns an underscore-keyed array without the nil keys" do
+          hash = metadata.send(:fetch_from_exif, exif, [:test])
+          hash.should eq({
+            test: 100
+          })
+        end
+      end
     end
 
     describe "#rotate?" do