sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unecessary indirection

Browse source
This commit is contained in:
Hugo Osvaldo Barrera 2021-06-17 18:57:04 +02:00
parent 623c0537e1
commit 7c9170c677
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
vdirsyncer/cli/__init__.py
View file

@ -125,13 +125,16 @@ def sync(ctx, collections, force_delete):
from .tasks import prepare_pair, sync_collection from .tasks import prepare_pair, sync_collection
for pair_name, collections in collections: for pair_name, collections in collections:
prepare_pair( for collection, config in prepare_pair(
pair_name=pair_name, pair_name=pair_name,
collections=collections, collections=collections,
config=ctx.config, config=ctx.config,
force_delete=force_delete, ):
callback=sync_collection, sync_collection(
) collection=collection,
general=config,
force_delete=force_delete,
)
@app.command() @app.command()
@ -147,12 +150,12 @@ def metasync(ctx, collections):
from .tasks import prepare_pair, metasync_collection from .tasks import prepare_pair, metasync_collection
for pair_name, collections in collections: for pair_name, collections in collections:
prepare_pair( for collection, config in prepare_pair(
pair_name=pair_name, pair_name=pair_name,
collections=collections, collections=collections,
config=ctx.config, config=ctx.config,
callback=metasync_collection, ):
) metasync_collection(collection=collection, general=config)
@app.command() @app.command()

4
vdirsyncer/cli/tasks.py
View file

@ -15,7 +15,7 @@ from .utils import manage_sync_status
from .utils import save_status from .utils import save_status
def prepare_pair(pair_name, collections, config, callback, **kwargs): def prepare_pair(pair_name, collections, config):
pair = config.get_pair(pair_name) pair = config.get_pair(pair_name)
all_collections = dict( all_collections = dict(
@ -34,7 +34,7 @@ def prepare_pair(pair_name, collections, config, callback, **kwargs):
) )
collection = CollectionConfig(pair, collection_name, config_a, config_b) collection = CollectionConfig(pair, collection_name, config_a, config_b)
callback(collection=collection, general=config.general, **kwargs) yield collection, config.general
def sync_collection(collection, general, force_delete): def sync_collection(collection, general, force_delete):