Skip to content
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

add some blacklist code to allow exclude collections from syncronization #184 #1025

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

add some blacklist code to allow exclude collections from syncronization #184 #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19be72a
add some blacklist code
c-schwamborn Dec 31, 2022
54084be
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 31, 2022
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
8 changes: 7 additions & 1 deletion vdirsyncer/cli/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def _validate_collections_param(collections):
raise ValueError("`collections` parameter must be a list or `null`.")

collection_names = set()
collection_blacklist = set()

for i, collection in enumerate(collections):
try:
Expand Down Expand Up @@ -87,9 +88,14 @@ def _validate_collections_param(collections):
if collection_name in collection_names:
raise ValueError("Duplicate value.")
collection_names.add(collection_name)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a name starts with !, you're also adding it to the collection_names list here. You probably want to move this line to an else block after if collection[0] == "!":.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I saw that, but does it matter at this point, as collection_names is temporary here and as I understand only used to weed out duplicate values from the collections list. When I leave the excludes within the collection_names I don't have to bother further with that. Or did I missed something there and collection_names is used for anything else?

I replaced blacklist with excludes, comes in the next push


if collection[0] == "!":
collection_blacklist.add(collection_name[1:])
except ValueError as e:
raise ValueError(f"`collections` parameter, position {i}: {str(e)}")

return collection_blacklist


class _ConfigReader:
def __init__(self, f):
Expand Down Expand Up @@ -233,7 +239,7 @@ def __init__(self, full_config, name, options):
"Set `collections = null` explicitly in your pair config."
)
else:
_validate_collections_param(self.collections)
self.blacklist = _validate_collections_param(self.collections)

if options:
raise ValueError("Unknown options: {}".format(", ".join(options)))
Expand Down
6 changes: 6 additions & 0 deletions vdirsyncer/cli/discover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ async def collections_for_pair(
rv = await aiostream.stream.list(
expand_collections(
shortcuts=pair.collections,
blacklist=pair.blacklist,
config_a=pair.config_a,
config_b=pair.config_b,
get_a_discovered=a_discovered.get_self,
Expand Down Expand Up @@ -194,6 +195,7 @@ async def _discover(self):

async def expand_collections(
shortcuts,
blacklist,
config_a,
config_b,
get_a_discovered,
Expand Down Expand Up @@ -221,6 +223,10 @@ async def expand_collections(

if collection in handled_collections:
continue
elif collection[0] == "!":
continue
elif collection in blacklist:
continue
handled_collections.add(collection)

a_args = await _collection_from_discovered(
Expand Down