Fix for uploading to directories with conflicting files

[aaronwolen]

This is a fix for #121.

We were failing to match local files with their remote counterparts when the destination was a directory because remote paths for files included the directory name (e.g., dir/file.txt) but we were passing paths relative to the target directory (i.e., ./file.txt).

I've tested a few different scenarios and the patch seems to hold but would appreciate some additional testing. @mnoetel, @timriffe, @cimentadaj, @befriendabacterium, let me know if get a chance to give it a spin.

[befriendabacterium]

Hey Aaron, thanks for looking into this. I just reinstalled from github and tried, but same error. Console output below:

osf_upload(pp_project[which(pp_project$name=='temporal'),],
'temporary/google_england.csv', conflicts='overwrite')
Error: Cannot complete action: file or folder "google_england.csv" already exists in this location
HTTP status code 409.

[aaronwolen]

Thanks, @befriendabacterium. Can you verify you're using this branch: packageVersion("osfr") should be ‘0.2.8.9001’.

If not you can install directly with:

remotes::install_github("ropensci/osfr", ref = remotes::github_pull(129))

[befriendabacterium]

Ah I see, sorry my bad! Works a treat - nice one!