Skip to content

Strip root from external S3 storage on insert #693

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

Merged
merged 6 commits into from
Nov 10, 2019
Merged

Strip root from external S3 storage on insert #693

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9e6dec
Fix leading slash issue on insert into remote storage.
guzman-raphael Nov 8, 2019
4cc72af
Add one more for safe measure.
guzman-raphael Nov 8, 2019
f21aa04
Allow external storage as file to store at root.
guzman-raphael Nov 8, 2019
a3d54de
Cleanup how test fails.
guzman-raphael Nov 8, 2019
8573ef3
Add descriptive comments.
guzman-raphael Nov 8, 2019
b5876c8
Add file storage tests.
guzman-raphael Nov 9, 2019
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
Prev Previous commit
Next Next commit
Add descriptive comments.
  • Loading branch information
@guzman-raphael
guzman-raphael committed Nov 8, 2019
commit 8573ef335cde364c197a8f265b13e6b401dcaa21
2 changes: 2 additions & 0 deletions datajoint/external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,15 @@ def s3(self):

def _make_external_filepath(self, relative_filepath):
"""resolve the complete external path based on the relative path"""
# Strip root
if self.spec['protocol'] == 's3':
posix_path = PurePosixPath(PureWindowsPath(self.spec['location']))
location_path = Path(
*posix_path.parts[1:]) if any(
case in posix_path.parts[0] for case in (
'\\', ':')) else Path(posix_path)
return PurePosixPath(location_path, relative_filepath)
# Preserve root
elif self.spec['protocol'] == 'file':
return PurePosixPath(Path(self.spec['location']), relative_filepath)
else:
Expand Down