Merge pull request darktable-org#1 from darktable-org/master

Merge with master

Author: supertobi

contrib/autostyle.lua

@@ -0,0 +1,144 @@
+--[[
+Autostyle
+Automatically apply a given style when an exif tag is present in the file. This tagged is checked with exiftool, in order to be able to match very exotic tags.
+I wrote this initially to be able to apply a style to compensate for Auto-DR from my Fujifilm camera
+
+AUTHOR
+Marc Cousin ([email protected])
+
+INSTALATION
+* copy this file in $CONFIGDIR/lua/ where CONFIGDIR
+is your darktable configuration directory
+* add the following line in the file $CONFIGDIR/luarc
+  require "autostyle"
+
+USAGE
+* set the exif configuration string in your lua configuration
+  mine, for instance, is AutoDynamicRange=200%=>DR200"
+  meaning that I automatically want to apply my DR200 style on all
+  images where exiftool returns '200%' for the AutoDynamicRange tag
+* if you want to be able to apply it manually to already imported
+  images, define a shortcut (lua shortcuts). As I couldn't find an event for
+  when a development is removed, so the autostyle won't be applied again, 
+  this shortcut is also helpful then
+* import your images, or use the shortcut on your already imported images
+* To determine which tag you want, list all tags with exiftool:
+  exiftool -j XE021351.RAF, and find the one you want to use
+  you can check it with 
+  > exiftool -AutoDynamicRange XE021351.RAF
+  Auto Dynamic Range              : 200%
+
+
+LICENSE
+GPLv2
+
+]]
+
+local darktable = require "darktable"
+
+
+-- Forward declare the functions
+local autostyle_apply_one_image,autostyle_apply_one_image_event,autostyle_apply,exiftool_attribute,capture
+
+-- Tested it with darktable 1.6.1 and darktable git from 2014-01-25
+darktable.configuration.check_version(...,{2,0,2},{2,1,0})
+
+-- Receive the event triggered
+function autostyle_apply_one_image_event(event,image)
+  autostyle_apply_one_image(image)
+end
+
+-- Apply the style to an image, if it matches the tag condition
+function autostyle_apply_one_image (image)
+  -- We need the tag, the value and the style_name provided from the configuration string
+  local tag,value,style_name=string.match(darktable.preferences.read("autostyle","exif_tag","string"),"(%g+)%s*=%s*(%g+)%s*=>%s*(%g+)")
+
+  -- check they all exist (correct syntax)
+  if (not tag) then
+	  darktable.print("EXIF TAG not found in " .. darktable.preferences.read("autostyle","exif_tag","string"))
+	  return
+  end
+  if (not value) then
+	  darktable.print("value to match not found in " .. darktable.preferences.read("autostyle","exif_tag","string"))
+	  return
+  end
+  if (not style_name) then
+	  darktable.print("style name not found in " .. darktable.preferences.read("autostyle","exif_tag","string"))
+	  return
+  end
+
+  -- First find the style (we have its name)
+  local styles= darktable.styles
+  local style
+  for _,s in ipairs(styles) do
+	  if s.name == style_name then
+		  style=s
+	  end
+  end
+  if (not style) then
+	  darktable.print("style not found for autostyle: " .. style_name)
+  end
+
+  -- Apply the style to image, if it is tagged
+  local ok,auto_dr_attr= pcall(exiftool_attribute,image.path .. '/' .. image.filename,tag)
+  -- If the lookup fails, stop here
+  if (not ok) then
+    return
+  end
+  if auto_dr_attr==value then
+--	  darktable.print("Image " .. image.filename .. ": autostyle automatically applied " .. darktable.preferences.read("autostyle","exif_tag","string") )
+	  darktable.styles.apply(style,image)
+--  else
+--	  darktable.print("Image " .. image.filename .. ": autostyle not applied, exif tag " .. darktable.preferences.read("autostyle","exif_tag","string")  .. " not matched: " .. auto_dr_attr)
+  end
+end 
+
+
+function autostyle_apply( shortcut)
+  local images = darktable.gui.action_images
+  for _,image in pairs(images) do
+    autostyle_apply_one_image(image)
+  end
+end
+
+-- Retrieve the attribute through exiftool
+function exiftool_attribute(path,attr)
+  local cmd="exiftool -" .. attr .. " '" ..path.. "'";
+  local exifresult=get_stdout(cmd)
+  local attribute=string.match(exifresult,": (.*)")
+  if (attribute == nil) then
+    darktable.print( "Could not find the attribute " .. attr .. " using the command: <" .. cmd .. ">")
+    -- Raise an error to the caller
+    error( "Could not find the attribute " .. attr .. " using the command: <" .. cmd .. ">");
+  end
+  return attribute
+end
+
+-- run command and retrieve stdout
+function get_stdout(cmd)
+  -- Open the command, for reading
+  local fd = assert(io.popen(cmd, 'r'))
+  -- yield to other lua threads until data is ready to be read
+  coroutine.yield("FILE_READABLE",fd)
+  -- slurp the whole file
+  local data = assert(fd:read('*a'))
+
+  fd:close()
+  -- Replace carriage returns and linefeeds with spaces
+  data = string.gsub(data, '[\n\r]+', ' ')
+  -- Remove spaces at the beginning
+  data = string.gsub(data, '^%s+', '')
+  -- Remove spaces at the end
+  data = string.gsub(data, '%s+$', '')
+  return data
+end
+
+-- Registering events
+darktable.register_event("shortcut",autostyle_apply,
+       "Apply your chosen style from exiftool tags")
+
+darktable.preferences.register("autostyle","exif_tag","string","Autostyle: EXIF_tag=value=>style","apply a style automatically if an EXIF_tag matches value. Find the tag with exiftool","")
+
+darktable.register_event("post-import-image",autostyle_apply_one_image_event)
+
+

contrib/copy_attach_detach_tags.lua

@@ -1,22 +1,35 @@
 --[[
-   copyright (c) 2014 Christian Kanzian
-   LICENSE GPLv2
-  ]]
+    This file is part of darktable,
+    copyright 2014-2015 by Christian Kanzian.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+]]
 
 --[[
-(MULTI-)COPY ATTACH DETACH TAG 
-A simple script that will create three shortcuts to copy, attach and detach image tags.
+   (MULTI-)COPY ATTACH DETACH TAG 
+   A simple script that will create three shortcuts to copy, attach and detach image tags.
 
 INSTALATION
-* copy this file in $CONFIGDIR/lua/ where CONFIGDIR is your darktable configuration directory
-* add the following line in the file $CONFIGDIR/luarc require "copy_attach_detach_tags.lua"
+ * copy this file in $CONFIGDIR/lua/ where CONFIGDIR is your darktable configuration directory
+ * add the following line in the file $CONFIGDIR/luarc require "copy_attach_detach_tags"
 
 USAGE
-* set the shortcuts for copy, attach and detach in the preferences dialog
-* <your shortcut1> copy will create a list of tags from all selected images
-* <your shortcut2> attaches copied tags to selected images, whereby
-  darktable internal tags starting with 'darktable|' will not be touched
-* <your shortcut3> detach removes all expect darktable internal tags from selected images
+ * set the shortcuts for copy, attach and detach in the preferences dialog
+ * <your shortcut1> copy will create a list of tags from all selected images
+ * <your shortcut2> attaches copied tags to selected images, whereby
+   darktable internal tags starting with 'darktable|' will not be touched
+ * <your shortcut3> detach removes all expect darktable internal tags from selected images
 
 ]]
 
@@ -26,10 +39,12 @@ dt.configuration.check_version(...,{2,0,0})
 local image_tags = {}
 
 local function mcopy_tags()
-local sel_images = dt.gui.selection()
-local tag_list_tmp = {}
-local hash = {}
+  local sel_images = dt.gui.action_images
+  local tag_list_tmp = {}
+  local hash = {}
 
+  -- empty tag table before copy new tags
+  image_tags = {}
   for _,image in ipairs(sel_images) do
       local image_tags_tmp = {}
       image_tags_tmp = dt.tags.get_tags(image)
@@ -50,18 +65,18 @@ local hash = {}
          end
       end
 
-     -- dt.print("Tags copied.")
+      dt.print("Image tags copied ...")
     return(image_tags)
   end
 
 -- attach copied tags to all selected images
 local function attach_tags()
 
   if next(image_tags) == nil then
-    dt.print("No tags copied, please copy tags first.")
+    dt.print("No tags to attached, please copy tags first.")
   end
 
-  local sel_images = dt.gui.selection()
+  local sel_images = dt.gui.action_images
 
   for _,image in ipairs(sel_images) do
     local present_image_tags = {}
@@ -81,13 +96,14 @@ local function attach_tags()
       end
     end
   end
+ dt.print("Tags attached ...")
 end
 
 
 
 
 local function detach_tags()
-  local sel_images = dt.gui.selection()
+  local sel_images = dt.gui.action_images
 
    for _,image in ipairs(sel_images) do
       local present_image_tags = {}
@@ -99,7 +115,8 @@ local function detach_tags()
         end
       end
    end
- end
+  dt.print("Tags removed from image(s).")
+end
 
 -- shortcut for copy
 dt.register_event("shortcut",
@@ -118,4 +135,4 @@ dt.register_event("shortcut",
 
 
 -- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua
--- kate: tab-indents: off; indent-width 2; replace-tabs on; remove-trailing-space on;
+-- kate: tab-indents: off; indent-width 2; replace-tabs on; remove-trailing-space on;

contrib/cr2hdr.lua

@@ -0,0 +1,113 @@
+--[[
+    Copyright (C) 2015 Till Theato <[email protected]>.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+]]
+--[[
+cr2hdr Magic Lantern Dual ISO processing.
+
+This script automates the steps involved to process an image created
+with the Magic Lantern Dual ISO module. Upon invoking the script with a
+shortcut "cr2hdr" provided by Magic Lantern is run on the selected
+images. The processed files are imported. They are also made group
+leaders to hide the original files.
+
+ADDITIONAL SOFTWARE NEEDED FOR THIS SCRIPT
+* cr2hdr (sources can be obtained through the Magic Lantern repository)
+
+USAGE
+* require this script from your main lua file
+* trigger conversion on selected/hovered images by shortcut (set shortcut in settings dialog)
+* it is also possible to have the script run after importing a collection (optin, since it is not that fast)
+]]
+
+local darktable = require "darktable"
+
+-- Tested with darktable 1.6.2
+darktable.configuration.check_version(...,{2,0,2})
+
+local queue = {}
+local processed_files = {}
+local job
+
+local function file_imported(event, image)
+    local filename = image.path .. "/" .. image.filename
+    if processed_files[filename] then
+        image.make_group_leader(image)
+        processed_files[filename] = false
+    else
+        if darktable.preferences.read("cr2hdr", "onimport", "bool") then
+            table.insert(queue, image)
+        end
+    end
+end
+
+local function stop_conversion(job)
+    job.valid = false
+end
+
+local function convert_image(image)
+    if string.sub(image.filename, -3) == "CR2" then
+        local filename = image.path .. "/" .. image.filename
+        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
+            file:close()
+            processed_files[out_filename] = true
+            darktable.database.import(out_filename)
+        else
+            darktable.print_error(filename .. ": cr2hdr failed.")
+        end
+    else
+        darktable.print_error(image.filename .. " is not a Canon RAW.")
+    end
+end
+
+local function convert_images()
+    if next(queue) == nil then return end
+
+    job = darktable.gui.create_job("Dual ISO conversion", true, stop_conversion)
+    for key,image in pairs(queue) do
+        if job.valid then
+            job.percent = (key-1)/#queue
+            convert_image(image)
+        else
+            break
+        end
+    end
+    local success_count = 0
+    for _ in pairs(processed_files) do success_count = success_count + 1 end
+    darktable.print("Dual ISO conversion successful on " .. success_count .. "/" .. #queue .. " images.")
+    job.valid = false
+    processed_files = {}
+    queue = {}
+end
+
+local function film_imported(event, film)
+    if darktable.preferences.read("cr2hdr", "onimport", "bool") then
+        convert_images()
+    end
+end
+
+local function convert_action_images(shortcut)
+    queue = darktable.gui.action_images
+    convert_images()
+end
+
+darktable.register_event("shortcut", convert_action_images, "Run cr2hdr (Magic Lantern DualISO converter) on selected images")
+darktable.register_event("post-import-image", file_imported)
+darktable.register_event("post-import-film", film_imported)
+
+darktable.preferences.register("cr2hdr", "onimport", "bool", "Invoke on import", "If true then cr2hdr will try to proccess every file during importing. Warning: cr2hdr is quite slow even in figuring out on whether the file is Dual ISO or not.", false)