Skip to content

Commit a078d6b

Browse files
committed
Use Net::SFTP::StatusException instead of RuntimeError
1 parent 9d4e24a commit a078d6b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/net/sftp/operations/download.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def process_next_entry
255255
# operation was successful.
256256
def on_opendir(response)
257257
entry = response.request[:entry]
258-
raise "opendir #{entry.remote}: #{response}" unless response.ok?
258+
raise StatusException.new(response, "opendir #{entry.remote}") unless response.ok?
259259
entry.handle = response[:handle]
260260
request = sftp.readdir(response[:handle], &method(:on_readdir))
261261
request[:parent] = entry
@@ -270,7 +270,7 @@ def on_readdir(response)
270270
request = sftp.close(entry.handle, &method(:on_closedir))
271271
request[:parent] = entry
272272
elsif !response.ok?
273-
raise "readdir #{entry.remote}: #{response}"
273+
raise StatusException.new(response, "readdir #{entry.remote}")
274274
else
275275
response[:names].each do |item|
276276
next if item.name == "." || item.name == ".."
@@ -296,15 +296,15 @@ def open_file(entry)
296296
def on_closedir(response)
297297
@active -= 1
298298
entry = response.request[:parent]
299-
raise "close #{entry.remote}: #{response}" unless response.ok?
299+
raise StatusException.new(response, "close #{entry.remote}") unless response.ok?
300300
process_next_entry
301301
end
302302

303303
# Called when a file has been opened. This will call #download_next_chunk
304304
# to initiate the data transfer.
305305
def on_open(response)
306306
entry = response.request[:entry]
307-
raise "open #{entry.remote}: #{response}" unless response.ok?
307+
raise StatusException.new(response, "open #{entry.remote}") unless response.ok?
308308

309309
entry.handle = response[:handle]
310310
entry.sink = entry.local.respond_to?(:write) ? entry.local : ::File.open(entry.local, "wb")
@@ -332,7 +332,7 @@ def on_read(response)
332332
request = sftp.close(entry.handle, &method(:on_close))
333333
request[:entry] = entry
334334
elsif !response.ok?
335-
raise "read #{entry.remote}: #{response}"
335+
raise StatusException.new(response, "read #{entry.remote}")
336336
else
337337
entry.offset += response[:data].bytesize
338338
update_progress(:get, entry, response.request[:offset], response[:data])
@@ -345,7 +345,7 @@ def on_read(response)
345345
def on_close(response)
346346
@active -= 1
347347
entry = response.request[:entry]
348-
raise "close #{entry.remote}: #{response}" unless response.ok?
348+
raise StatusException.new(response, "close #{entry.remote}") unless response.ok?
349349
process_next_entry
350350
end
351351

0 commit comments

Comments
 (0)