From 5faf5be033953251dc88e7b5f37c5231afc3235a Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Thu, 27 Jul 2023 09:32:45 +0200 Subject: [PATCH] Fix Rubocop offenses --- app/controllers/live_streams_controller.rb | 2 +- app/models/runner.rb | 8 ++++---- app/services/service_base.rb | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/live_streams_controller.rb b/app/controllers/live_streams_controller.rb index 2bbe7994..f9669812 100644 --- a/app/controllers/live_streams_controller.rb +++ b/app/controllers/live_streams_controller.rb @@ -34,7 +34,7 @@ class LiveStreamsController < ApplicationController def send_runner_file(runner, desired_file, redirect_fallback = root_path, privileged: false) filename = File.basename(desired_file) send_stream(filename:, type: 'application/octet-stream', disposition: 'attachment') do |stream| - runner.download_file desired_file, privileged_execution: privileged do |chunk, overall_size, _content_type| + runner.download_file(desired_file, privileged_execution: privileged) do |chunk, overall_size, _content_type| unless response.committed? # Disable Rack::ETag, which would otherwise cause the response to be cached # See https://github.com/rack/rack/issues/1619#issuecomment-848460528 diff --git a/app/models/runner.rb b/app/models/runner.rb index 542e1427..2304c422 100644 --- a/app/models/runner.rb +++ b/app/models/runner.rb @@ -52,18 +52,18 @@ class Runner < ApplicationRecord @strategy.copy_files(files) end - def download_file(path, **options, &) - @strategy.download_file(path, **options, &) + def download_file(...) + @strategy.download_file(...) end - def retrieve_files(raise_exception: true, **options) + def retrieve_files(raise_exception: true, **) try = 0 begin if try.nonzero? request_new_id save end - @strategy.retrieve_files(**options) + @strategy.retrieve_files(**) rescue Runner::Error::RunnerNotFound => e Rails.logger.debug { "Retrieving files failed for the first time: #{e.message}" } try += 1 diff --git a/app/services/service_base.rb b/app/services/service_base.rb index 902944f3..2c2ce3ac 100644 --- a/app/services/service_base.rb +++ b/app/services/service_base.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class ServiceBase - def self.call(**args) - new(**args).execute + def self.call(**) + new(**).execute end end