Add --include and --exclude filters to the ls and rm commands
#253
Conversation
b2/_internal/_utils/uri.py
Outdated
| @@ -165,10 +165,10 @@ def list_file_versions_by_uri(self, uri, *args, **kwargs): | |||
| raise NotImplementedError(f"Unsupported URI type: {type(uri)}") | |||
|
|
|||
| @list_file_versions_by_uri.register | |||
| def _(self, uri: B2URI, *args, **kwargs): | |||
| def _(self, uri: B2URI, *args, filters=(), **kwargs): | |||
b2/_internal/console_tool.py
Outdated
| parser.add_argument('--include', dest='filters', action='append', type=Filter.include) | ||
| parser.add_argument('--exclude', dest='filters', action='append', type=Filter.exclude) |
b2/_internal/console_tool.py
Outdated
| @@ -2198,6 +2201,7 @@ def _get_ls_generator(self, args): | |||
| latest_only=not args.versions, | |||
| recursive=args.recursive, | |||
| with_wildcard=args.withWildcard, | |||
| filters=args.filters or (), | |||
There was a problem hiding this comment.
Maybe use default value in add_argument instead? Is this possible?
parser.add_argument('--include', dest='filters', action='append', type=Filter.include, default=())There was a problem hiding this comment.
That doesn't work. With action='append', argparse stores the default, copies the object with dest[:] before appending, then calls .append() on that. So tuples don't work here.
But we can have default=[] here. A quick forage through argparse code verifies that having multiple flags with with the same destination and a default won't cause any problems.
| @@ -2445,6 +2445,64 @@ def test_ls_b2id(self): | |||
| ''' | |||
| self._run_command(['ls', f'b2id://{file_version.id_}'], expected_stdout, '', 0) | |||
|
|
|||
| def test_ls_filters(self): | |||
There was a problem hiding this comment.
This checks filters working on ls command but doesn't ensure they work with rm command. I understand that it should work automatically bc of some inheritance, but still I think some very basic test would be good here. If some code changes in future, we don't want rm to misbehave with those flags.
…_Tool into ls-rm-filters
No description provided.