Use B2URI in ls & rm
#248
Use B2URI in ls & rm
#248
Conversation
b2/_internal/b2v3/rm.py
Outdated
| ###################################################################### | ||
| # | ||
| # File: b2/_internal/b2v3/rm.py | ||
| # | ||
| # Copyright 2023 Backblaze Inc. All Rights Reserved. | ||
| # | ||
| # License https://www.backblaze.com/using_b2_code.html | ||
| # | ||
| ###################################################################### | ||
| from __future__ import annotations | ||
|
|
||
| from b2._internal._b2v4.registry import B2URIBucketNFolderNameArgMixin, BaseRm | ||
|
|
||
|
|
||
| # NOTE: We need to keep v3 Rm in separate file, because we need to import it in | ||
| # unit tests without registering any commands. | ||
| class Rm(B2URIBucketNFolderNameArgMixin, BaseRm): | ||
| __doc__ = BaseRm.__doc__ | ||
| # TODO: fix doc |
There was a problem hiding this comment.
it works, but feels like a stupid idea.
There was a problem hiding this comment.
I think I implemented this stupid idea first in this project, and IMO if it works and there is not clear reason not to use it then why not :P
|
Fixed the examples of |
b2/_internal/console_tool.py
Outdated
| @@ -2477,6 +2464,7 @@ def _setup_parser(cls, parser): | |||
| ) | |||
| parser.add_argument('--noProgress', action='store_true') | |||
| parser.add_argument('--failFast', action='store_true') | |||
| # TODO: --bypassGovernance | |||
There was a problem hiding this comment.
It was there to remind me to implement --bypassGovernance for rm in a future PR, but forgot to remove it. :P
changelog.d/+ls-rm-b2-uri.changed.md
Outdated
| @@ -0,0 +1 @@ | |||
| Change `ls` and `rm` commands to use the `b2://` URI scheme. | |||
There was a problem hiding this comment.
Maybe mention that this is only for the pre-release _b2v4 executable, as not to imply a breaking change?
b2/_internal/_cli/b2args.py
Outdated
| B2_URI_FILE_ARG_TYPE = wrap_with_argument_type_error(b2_file_uri) | ||
|
|
||
|
|
||
| def add_b2_uri_argument(parser: argparse.ArgumentParser, name="B2_URI"): | ||
| """ | ||
| Add a B2 URI pointing to a file as an argument to the parser. |
There was a problem hiding this comment.
The doc copied from the other func is probably inaccurate.
| B2_URI_ARG_TYPE = wrap_with_argument_type_error(b2_uri) | ||
| B2_URI_FILE_ARG_TYPE = wrap_with_argument_type_error(b2_file_uri) |
There was a problem hiding this comment.
When we have this distinction of URI vs URI_FILE, this naming is a bit misleading (at least it did mislead me a bit). That's because the real distinction here is not "file" vs "non-file" (i.e. a folder, a pattern), it's actually between file id vs any URI (b2:// vs b2id://). It might be worth renaming B2_URI_FILE_ARG_TYPE to something more explicit.
Same goes for add_b2_file_argument (-> add_b2_file_id_argument). I know this these are not your names, it's just that seeing b2_uri etc. brings this to attention. :)
There was a problem hiding this comment.
Yup, it is unclear if the names mean b2://, b2id:// or both. I'd leave them like that for now. I'll clean them up in the follow up PR adding b2id:// support to rm.
Too much inheritance is making my head spin 😵💫