Merge pull request #331 from wpferguson/fix_HDRmerge

Fix HDRmerge

ChangeLog.md

@@ -1,5 +1,14 @@
 ## Changes from most recent to oldest
 
+** 19 Mar 2021 - wpferguson - fixed crash in contrib/HDRmerge.lua**
+* Made generated filename routine gracefully handle names that
+are not in the expected format.
+
+** 15 Mar 2021 - scheckmedia - updated contrib/photils.lua**
+* refactor print method
+* add option to apply selected tags from a single image to multiple images
+* add setting parameter to enable/disable the export of an image before tag suggestion
+
 ** 25 Feb 2021 - wpferguson - added detached mode to contrib/gimp.lua**
 
 * Added run_detached checkbox to the exporter GUI.  Selecting run_detached

contrib/HDRMerge.lua

@@ -55,7 +55,7 @@ local CURR_API_STRING = dt.configuration.api_version_string
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
 local gettext = dt.gettext
-gettext.bindtextdomain('HDRMerge',dt.configuration.config_dir..'/lua/locale/')
+gettext.bindtextdomain('HDRMerge', dt.configuration.config_dir..'/lua/locale/')
 local function _(msgid)
     return gettext.dgettext('HDRMerge', msgid)
 end
@@ -69,10 +69,10 @@ local HDRM = { --HDRMerge Program Table
   arg_string = '',
   images_string = '',
   args = {
-        bps         ={text = '-b ', style = 'integer'},
-        size        ={text = '-p ', style = 'string'},
-        batch       ={text = '-B ', style = 'bool'},
-        gap         ={text = '-g ', style = 'integer'}
+    bps         = {text = '-b ', style = 'integer'},
+    size        = {text = '-p ', style = 'string'},
+    batch       = {text = '-B ', style = 'bool'},
+    gap         = {text = '-g ', style = 'integer'}
   }
 }
 local GUI = { --GUI Elements Table
@@ -160,7 +160,7 @@ local function PreCall(prog_tbl) --looks to see if this is the first call, if so
   end
   if not dt.preferences.read(mod, 'bin_exists', 'bool') then
     GUI.stack.active = 2
-        dt.print(_('please update you binary locatoin'))
+    dt.print(_('please update you binary location'))
   end
 end
 
@@ -218,8 +218,8 @@ local function main()
     local curr_image = image.path..os_path_seperator..image.filename
     HDRM.images_string = HDRM.images_string..df.sanitize_filename(curr_image)..' '
     out_path = image.path
-        _, source_name, source_id = GetFileName(image.filename)
-        source_id = tonumber(source_id)
+    _unused, source_name, source_id = GetFileName(image.filename)
+    source_id = tonumber(source_id) or 0
     if source_id < smallest_id then 
       smallest_id = source_id
       smallest_name = source_name