aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorRobert2017-10-19 15:27:30 +0200
committerRobert2017-10-24 15:28:44 +0200
commit302ed0f642c755b6f96def25eda25e2d2dae8891 (patch)
treeac02735d6768b2da824b0be839d6fcbdf33f7a84 /app
parentefe056fb645f0380e594f57ad058409194f3becd (diff)
downloadchouette-core-302ed0f642c755b6f96def25eda25e2d2dae8891.tar.bz2
Refs: #4633@3h:
- Discussing Spec - Speced and implemented the corrupt zipfile part Next: - Spec incorrect directory structure part - Implement incorrect directory structure part
Diffstat (limited to 'app')
-rw-r--r--app/workers/workbench_import_worker.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/workers/workbench_import_worker.rb b/app/workers/workbench_import_worker.rb
index 994493944..b89ba19d8 100644
--- a/app/workers/workbench_import_worker.rb
+++ b/app/workers/workbench_import_worker.rb
@@ -14,11 +14,13 @@ class WorkbenchImportWorker
zip_service = ZipService.new(downloaded)
upload zip_service
@workbench_import.update(ended_at: Time.now)
+ rescue Zip::Error
+ handle_corrupt_zip_file
end
def download
logger.info "HTTP GET #{import_url}"
- @zipfile_data = HTTPService.get_resource(
+ HTTPService.get_resource(
host: import_host,
path: import_path,
params: {token: @workbench_import.token_download}).body
@@ -32,6 +34,10 @@ class WorkbenchImportWorker
params: params(eg_file, eg_name))
end
+ def handle_corrupt_zip_file
+ @workbench_import.messages.create(criticity: :error)
+ end
+
def upload zip_service
entry_group_streams = zip_service.subdirs
@workbench_import.update total_steps: entry_group_streams.size