From 22e6335aef8d96da3c1ee0b9e797e9b0d8ee18d6 Mon Sep 17 00:00:00 2001 From: David Singer Date: Fri, 1 Mar 2024 11:44:11 -0800 Subject: [PATCH 1/3] Update task.rb --- lib/convert_api/task.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/convert_api/task.rb b/lib/convert_api/task.rb index 39194d4..c20e639 100644 --- a/lib/convert_api/task.rb +++ b/lib/convert_api/task.rb @@ -8,10 +8,11 @@ def initialize(from_format, to_format, params, conversion_timeout: nil) end def run - params = normalize_params(@params).merge( + params = { Timeout: @conversion_timeout, - StoreFile: true, - ) + StoreFile: false + }.merge(normalize_params(@params)) + from_format = @from_format || detect_format(params) read_timeout = @conversion_timeout + config.conversion_timeout_delta if @conversion_timeout From 20aaf448241a9cc6b4067f19534a307415d9b364 Mon Sep 17 00:00:00 2001 From: David Singer Date: Fri, 1 Mar 2024 11:52:56 -0800 Subject: [PATCH 2/3] Update task.rb --- lib/convert_api/task.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/convert_api/task.rb b/lib/convert_api/task.rb index c20e639..ac54173 100644 --- a/lib/convert_api/task.rb +++ b/lib/convert_api/task.rb @@ -8,10 +8,10 @@ def initialize(from_format, to_format, params, conversion_timeout: nil) end def run - params = { + params = normalize_params(@params).merge( Timeout: @conversion_timeout, StoreFile: false - }.merge(normalize_params(@params)) + ) from_format = @from_format || detect_format(params) From 69f84217d84963edc520a9aefc548dc9699c6595 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 1 Mar 2024 12:28:06 -0800 Subject: [PATCH 3/3] Fixing merge order --- lib/convert_api/task.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/convert_api/task.rb b/lib/convert_api/task.rb index ac54173..ecba334 100644 --- a/lib/convert_api/task.rb +++ b/lib/convert_api/task.rb @@ -8,11 +8,7 @@ def initialize(from_format, to_format, params, conversion_timeout: nil) end def run - params = normalize_params(@params).merge( - Timeout: @conversion_timeout, - StoreFile: false - ) - + params = { Timeout: @conversion_timeout, StoreFile: true }.merge(normalize_params(@params)) from_format = @from_format || detect_format(params) read_timeout = @conversion_timeout + config.conversion_timeout_delta if @conversion_timeout