-
-
Notifications
You must be signed in to change notification settings - Fork 430
Add files.copy operation #1446
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.
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
EricDriussi
wants to merge
3
commits into
pyinfra-dev:3.x
Choose a base branch
from
EricDriussi:3.x
base: 3.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add files.copy operation #1446
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": false | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": true, | ||
|
||
"path=/tmp/src_dir": null, | ||
"path=/tmp/dest_dir/src_dir": null, | ||
"path=/tmp/dest_dir/src_dir/file": null | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/src_dir": true, | ||
"path=/tmp/dest_dir": true | ||
} | ||
}, | ||
"commands": ["cp -r /tmp/src_dir /tmp/dest_dir"] | ||
} |
21 changes: 21 additions & 0 deletions
21
tests/operations/files.copy/copies_directory_overwriting.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": true | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": true, | ||
|
||
"path=/tmp/src_dir": null, | ||
"path=/tmp/dest_dir/src_dir": null, | ||
"path=/tmp/dest_dir/src_dir/file": null | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/src_dir": true, | ||
"path=/tmp/dest_dir": true | ||
} | ||
}, | ||
"commands": ["cp -r -f /tmp/src_dir /tmp/dest_dir"] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir/file", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": false | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": true, | ||
"path=/tmp/dest_dir/file": null | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/dest_dir": true, | ||
"path=/tmp/src_dir/file": null | ||
} | ||
}, | ||
"commands": ["cp -r /tmp/src_dir/file /tmp/dest_dir"] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir/file", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": true | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": true, | ||
"path=/tmp/dest_dir/file": true | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/dest_dir": true, | ||
"path=/tmp/src_dir/file": null | ||
} | ||
}, | ||
"commands": ["cp -r -f /tmp/src_dir/file /tmp/dest_dir"] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir/file", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": false | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": true, | ||
"path=/tmp/dest_dir/file": null | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/dest_dir": null, | ||
"path=/tmp/src_dir/file": null | ||
} | ||
}, | ||
"exception": { | ||
"name": "OperationError", | ||
"message": "dest /tmp/dest_dir is not an existing directory" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir/file", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": false | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": true, | ||
"path=/tmp/dest_dir/file": true | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/dest_dir": true, | ||
"path=/tmp/src_dir/file": null | ||
} | ||
}, | ||
"exception": { | ||
"name": "OperationError", | ||
"message": "dest /tmp/dest_dir/file already exists and `overwrite` is unset" | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"kwargs": { | ||
"src": "/tmp/src_dir/file", | ||
"dest": "/tmp/dest_dir", | ||
"overwrite": false | ||
}, | ||
"facts": { | ||
"files.File": { | ||
"path=/tmp/src_dir/file": null, | ||
"path=/tmp/dest_dir/file": null | ||
}, | ||
"files.Directory": { | ||
"path=/tmp/dest_dir": true, | ||
"path=/tmp/src_dir/file": null | ||
} | ||
}, | ||
"exception": { | ||
"name": "OperationError", | ||
"message": "src /tmp/src_dir/file does not exist" | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why should this raise an
OperationError
. Forcopy()
to be idempotent, the destination file existing, should just be a noop right? Alternatively, you could compare hashes to see if the src file has changed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed a noop would be a better fit here, although I still feel that an error should be raised in case
dest_file_path
already exists and is different fromsrc
. So maybe something like this?Or maybe there's a better way to handle that case?
Also, in the snippet I use the
_file_equal
function, but that seems to be intended for local-remote hash comparisons.Are you aware of any functions that might better fit this use case? Should I just create a new internal function based on this one for remote-remote hash comparison (what could be a nice name for it?)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with you that the noop should only happen when the existing file at destination is the same.
I don't know if the
_file_equal
function can be used for remote-remote hash comparisons. @Fizzadar do you know?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed
_file_equal
is for local <> remote, a new function seems best here, basically fact x2 and compare.