From 5504f2b232cbc4184a58aa1c119c9fbdecde34b3 Mon Sep 17 00:00:00 2001
From: Till Theato <theato@ttill.de>
Date: Wed, 18 Feb 2015 21:38:42 +0100
Subject: [PATCH] cr2hdr: Make call to "cr2hdr" non-blocking.

---
 contrib/cr2hdr.lua | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/contrib/cr2hdr.lua b/contrib/cr2hdr.lua
index 8f133dc..b2d2328 100644
--- a/contrib/cr2hdr.lua
+++ b/contrib/cr2hdr.lua
@@ -51,20 +51,10 @@ function stop_conversion(job)
     job.valid = false
 end
 
--- Source: http://lua-users.org/wiki/SplitJoin
-function lines(str)
-  local t = {}
-  local function helper(line) table.insert(t, line) return "" end
-  helper((str:gsub("(.-)\r?\n", helper)))
-  return t
-end
-
 function convert_image(image)
     if string.sub(image.filename, -3) == "CR2" then
         local filename = image.path .. "/" .. image.filename
-        local handle = io.popen("cr2hdr " .. filename)
-        local result = handle:read("*a")
-        handle:close()
+        local result = coroutine.yield("RUN_COMMAND", "cr2hdr " .. filename)
         local out_filename = string.gsub(filename, ".CR2", ".DNG")
         local file = io.open(out_filename)
         if file then
@@ -72,8 +62,7 @@ function convert_image(image)
             processed_files[out_filename] = true
             darktable.database.import(out_filename)
         else
-            result = lines(result)
-            darktable.print_error(image.filename .. ": cr2hdr failed: " .. result[#result-1])
+            darktable.print_error(filename .. ": cr2hdr failed.")
         end
     else
         darktable.print_error(image.filename .. " is not a Canon RAW.")