VERSION 1.0.0.beta.14

moonmaster9000 · Feb 17, 2012 · a80e90f · a80e90f
1 parent e09cf73
commit a80e90f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v1.0.0.beta.14
+  -- rescueing when attempting to safe-unlink images during XMP metadata extraction
+
 v1.0.0.beta.13
   -- files created during the extraction of xmp metadata are removed upon
 	completion

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    couch_photo (1.0.0.beta.11)
+    couch_photo (1.0.0.beta.13)
       activesupport (~> 3.0.0)
       couchrest (= 1.0.1)
       couchrest_model (~> 1.0.0)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0.beta.13
+1.0.0.beta.14
diff --git a/lib/couch_photo/variation_metadata.rb b/lib/couch_photo/variation_metadata.rb
@@ -53,10 +53,10 @@ def xmp_metadata
       tmp_xmp_file_name = "/tmp/#{tmp_image_uuid}.xmp" 
       mini_magick.write tmp_image_file_name 
       `convert #{tmp_image_file_name} #{tmp_xmp_file_name} 2> /dev/null`
-      meta_data = Hash.from_xml File.read(tmp_xmp_file_name)
+      meta_data = Hash.from_xml File.read(tmp_xmp_file_name) rescue {}
 
-      File.safe_unlink(tmp_image_file_name)
-      File.safe_unlink(tmp_xmp_file_name)
+      File.safe_unlink(tmp_image_file_name) rescue nil
+      File.safe_unlink(tmp_xmp_file_name) rescue nil
       meta_data
     end