Skip to content

Re-uploading existing file was failing #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ismell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Re-uploading existing file was failing #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/ruby-box/folder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ def upload_file(filename, data, overwrite=true)
# This is a workaround around:
begin
# were were given context information about this conflict?
file = RubyBox::File.new(@session, {
'id' => e['context_info']['conflicts'][0]['id']
})
rescue
# conflicts an either be an array or a hash
if (context_info = e['context_info']) && (conflicts = context_info['conflicts']) && (conflict = [conflicts].flatten(1).first) && (id = conflict['id'])
file = RubyBox::File.new(@session, {
'id' => id
})
else
# we were not given context information about this conflict.
# attempt to lookup the file.
file = files(filename, 1000).pop
Expand Down